| commit | 1954282cf66e9dd7cfd0776ed41a91cd47ca27d5 | [log] [tgz] |
|---|---|---|
| author | Maxim Nesen <maxim.nesen@oracle.com> | Mon May 04 12:27:00 2020 +0200 |
| committer | Maxim Nesen <maxim.nesen@oracle.com> | Mon May 04 13:15:34 2020 +0200 |
| tree | 5cc06af6c06ae795099fd87a56d0c93d46bbab5b | |
| parent | d07e88024cf52c7269a85bba2a945010d01c3318 [diff] |
Jakartification: jakarta.annotation, jakarta.injection, org.glassfish.hk2 Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/ext/bean-validation/pom.xml b/ext/bean-validation/pom.xml index e37518e..42caf1a 100644 --- a/ext/bean-validation/pom.xml +++ b/ext/bean-validation/pom.xml
@@ -68,8 +68,8 @@ <dependencies> <dependency> - <groupId>org.glassfish.hk2.external</groupId> - <artifactId>jakarta.inject</artifactId> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId>
diff --git a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/ValidationBinder.java b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/ValidationBinder.java index ecfe402..2bddbef 100644 --- a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/ValidationBinder.java +++ b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/ValidationBinder.java
@@ -31,8 +31,8 @@ import jakarta.ws.rs.ext.MessageBodyWriter; import jakarta.ws.rs.ext.Providers; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import javax.validation.Configuration; import javax.validation.TraversableResolver; import javax.validation.Validation;
diff --git a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/ValidationExceptionMapper.java b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/ValidationExceptionMapper.java index 37b4657..5160045 100644 --- a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/ValidationExceptionMapper.java +++ b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/ValidationExceptionMapper.java
@@ -30,7 +30,7 @@ import jakarta.ws.rs.core.Variant; import jakarta.ws.rs.ext.ExceptionMapper; -import javax.inject.Provider; +import jakarta.inject.Provider; import javax.validation.ConstraintViolationException; import javax.validation.ValidationException;