Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jakarta api integration #4240

Merged
merged 1 commit into from
Sep 5, 2019
Merged

Jakarta api integration #4240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bundles/jaxrs-ri/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions core-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@
</dependency>

<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion etc/travis/travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ PING_LOOP_PID=$!
if [ "$1" = "glassfish-copyright:copyright" ]; then
mvn glassfish-copyright:copyright
else
mvn -e -U -B clean install $1 >> $BUILD_OUTPUT 2>&1
mvn -e -U -B clean install -Pstaging $1 >> $BUILD_OUTPUT 2>&1
fi

# The build finished without returning an error so dump a tail of the output
Expand Down
4 changes: 2 additions & 2 deletions examples/extended-wadl-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<artifactId>jersey-hk2</artifactId>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public static Option[] configuration() {
mavenBundle().groupId("org.javassist").artifactId("javassist").versionAsInProject(),

// validation
mavenBundle().groupId("javax.validation").artifactId("validation-api").versionAsInProject(),
mavenBundle().groupId("jakarta.validation").artifactId("jakarta.validation-api").versionAsInProject(),

// Grizzly
systemPackage("sun.misc"), // required by grizzly-framework
Expand Down
2 changes: 1 addition & 1 deletion ...-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public List<Option> genericOsgiOptions() {
systemPackage("com.sun.source.util"),

// validation - required by jersey-container-servlet-core
mavenBundle().groupId("javax.validation").artifactId("validation-api").versionAsInProject(),
mavenBundle().groupId("jakarta.validation").artifactId("jakarta.validation-api").versionAsInProject(),
// Jersey bundles
mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-common").versionAsInProject(),
mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-server").versionAsInProject(),
Expand Down
2 changes: 1 addition & 1 deletion ...test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public List<Option> genericOsgiOptions() {
systemPackage("com.sun.source.util"),

// validation
mavenBundle().groupId("javax.validation").artifactId("validation-api").versionAsInProject(),
mavenBundle().groupId("jakarta.validation").artifactId("jakarta.validation-api").versionAsInProject(),

// Jersey bundles
mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-common").versionAsInProject(),
Expand Down
4 changes: 2 additions & 2 deletions ext/bean-validation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@
</dependency>

<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
Expand Down
28 changes: 14 additions & 14 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1866,8 +1866,8 @@
</dependency>

<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>${javax.validation.api.version}</version>
</dependency>

Expand Down Expand Up @@ -2083,17 +2083,17 @@
<jakarta.activation.version>1.2.1</jakarta.activation.version>
<javassist.version>3.25.0-GA</javassist.version>
<javax.annotation.osgi.version>javax.annotation.*;version="[1.2,3)"</javax.annotation.osgi.version>
<javax.annotation.version>1.3.4</javax.annotation.version>
<javax.el.version>3.0.2</javax.el.version>
<javax.annotation.version>1.3.5</javax.annotation.version>
<javax.el.version>3.0.3</javax.el.version>
<javax.el.impl.version>3.0.2</javax.el.impl.version>
<javax.interceptor.version>1.2.4</javax.interceptor.version>
<javax.persistence.version>2.2.2</javax.persistence.version>
<javax.validation.api.version>2.0.1.Final</javax.validation.api.version>
<jaxb.api.version>2.3.2</jaxb.api.version>
<javax.interceptor.version>1.2.5</javax.interceptor.version>
<javax.persistence.version>2.2.3</javax.persistence.version>
<javax.validation.api.version>2.0.2</javax.validation.api.version>
<jaxb.api.version>2.3.3</jaxb.api.version>
<jaxb.ri.version>2.3.2</jaxb.ri.version>
<jsonb.api.version>1.0.1</jsonb.api.version>
<jsonb.api.version>1.0.2</jsonb.api.version>
<jaxrs.api.spec.version>2.1</jaxrs.api.spec.version>
<jaxrs.api.impl.version>2.1.5</jaxrs.api.impl.version>
<jaxrs.api.impl.version>2.1.6</jaxrs.api.impl.version>
<jboss.logging.version>3.3.0.Final</jboss.logging.version>
<jersey1.version>1.19.3</jersey1.version>
<jersey1.last.final.version>${jersey1.version}</jersey1.last.final.version>
Expand All @@ -2105,9 +2105,9 @@
<jmockit.version>1.44</jmockit.version>
<jsonp.ri.version>1.1.5</jsonp.ri.version>
<jsonp.jaxrs.version>1.1.5</jsonp.jaxrs.version>
<jsp.version>2.3.5</jsp.version>
<jstl.version>1.2.4</jstl.version>
<jta.api.version>1.3.2</jta.api.version>
<jsp.version>2.3.6</jsp.version>
<jstl.version>1.2.7</jstl.version>
<jta.api.version>1.3.3</jta.api.version>
<kryo.version>4.0.1</kryo.version>
<mimepull.version>1.9.11</mimepull.version>
<mockito.version>1.10.19</mockito.version>
Expand All @@ -2125,7 +2125,7 @@
<rxjava2.version>2.0.4</rxjava2.version>
<servlet2.version>2.4</servlet2.version>
<servlet3.version>3.0.1</servlet3.version>
<servlet4.version>4.0.2</servlet4.version>
<servlet4.version>4.0.3</servlet4.version>
<simple.version>6.0.1</simple.version>
<slf4j.version>1.7.21</slf4j.version>
<spring4.version>4.3.20.RELEASE</spring4.version>
Expand Down
5 changes: 2 additions & 3 deletions tests/integration/j-376/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,9 @@
</dependency>

<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<scope>compile</scope>
<version>1.1.0.Final</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/j-59/war/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<dependency>
<groupId>jakarta.jws</groupId>
<artifactId>jakarta.jws-api</artifactId>
<version>1.1.1</version>
<version>2.1.0</version>
</dependency>
</dependencies>
</profile>
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/jersey-3670/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
Expand Down
4 changes: 2 additions & 2 deletions tests/osgi/functional/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down