Skip to content

Commit

Permalink
Updated TCK test maven pom (#5248)
Browse files Browse the repository at this point in the history
Signed-off-by: jansupol <[email protected]>
  • Loading branch information
jansupol authored Feb 3, 2023
1 parent 65e0c8f commit 0781850
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
4 changes: 1 addition & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2235,8 +2235,6 @@
<jackson.version>2.14.1</jackson.version>
<javassist.version>3.29.0-GA</javassist.version>
<jboss.logging.version>3.5.0.Final</jboss.logging.version>
<jersey1.version>1.19.3</jersey1.version>
<jersey1.last.final.version>${jersey1.version}</jersey1.last.final.version>
<jettison.version>1.3.7</jettison.version> <!-- TODO: 1.3.8 doesn't work; AbstractJsonTest complexBeanWithAttributes -->
<jmh.version>1.35</jmh.version>
<jmockit.version>1.49</jmockit.version>
Expand Down Expand Up @@ -2278,7 +2276,7 @@
<graalvm.version>20.3.2</graalvm.version>

<!-- do not need CQs (below this line till the end of version properties)-->
<gf.impl.version>7.0.0</gf.impl.version>
<gf.impl.version>7.0.1</gf.impl.version>
<!-- Jakartified -->
<cdi.api.version>4.0.1</cdi.api.version>
<cdi.osgi.version>jakarta.enterprise.*;version="[3.0,5)"</cdi.osgi.version>
Expand Down
14 changes: 7 additions & 7 deletions tests/jersey-tck/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -31,10 +31,10 @@
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<jersey.version>3.1.0-M3</jersey.version> <!-- the public version that pass the tck -->
<glassfish.container.version>6.2.5</glassfish.container.version>
<glassfish.home>${project.build.directory}/glassfish6</glassfish.home>
<jakarta.platform.version>10.0.0-RC1</jakarta.platform.version>
<jersey.version>3.1.1</jersey.version> <!-- the public version that pass the tck -->
<glassfish.container.version>7.0.1</glassfish.container.version>
<glassfish.home>${project.build.directory}/glassfish7</glassfish.home>
<jakarta.platform.version>10.0.0</jakarta.platform.version>
<junit.jupiter.version>5.7.2</junit.jupiter.version>
<jakarta.rest.version>3.1.0</jakarta.rest.version>
<tck.artifactId>jakarta-restful-ws-tck</tck.artifactId>
Expand Down Expand Up @@ -519,7 +519,7 @@
</activation>
<properties>
<asadmin.home>${basedir}</asadmin.home>
<asadmin>${project.build.directory}/glassfish6/glassfish/bin/asadmin</asadmin>
<asadmin>${glassfish.home}/glassfish/bin/asadmin</asadmin>
</properties>
</profile>
<profile>
Expand All @@ -537,7 +537,7 @@
<profile>
<id>jersey-tck</id>
<properties>
<jersey.version>3.1.0-SNAPSHOT</jersey.version> <!-- When running the profile, use SNAPSHOT -->
<jersey.version>3.1.99-SNAPSHOT</jersey.version> <!-- When running the profile, use SNAPSHOT -->
</properties>
</profile>
</profiles>
Expand Down
4 changes: 2 additions & 2 deletions tests/release-test/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -29,7 +29,7 @@

<groupId>org.glassfish.jersey.tests</groupId>
<artifactId>release-test</artifactId>
<version>2.37-SNAPSHOT</version>
<version>3.1.99-SNAPSHOT</version>
<packaging>jar</packaging>
<name>jersey-release-test</name>

Expand Down

0 comments on commit 0781850

Please sign in to comment.