Skip to content

Commit

Permalink
Update various versions in pom.xml files
Browse files Browse the repository at this point in the history
  • Loading branch information
@arjantijms
arjantijms committed May 7, 2024
1 parent 0fa269e commit 17a7ea5
Show file tree
Hide file tree
Showing 8 changed files with 75 additions and 76 deletions.
12 changes: 6 additions & 6 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,20 +133,20 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.1.0-M2</version>
<version>6.1.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<version>2.2.0-M1</version>
<version>2.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-client-api</artifactId>
<version>2.2.0-M1</version>
<version>2.2.0</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -174,7 +174,7 @@
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.1.0-M1</version>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -209,7 +209,7 @@
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
<version>3.2.0-M2</version>
<version>3.2.0</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Expand Down Expand Up @@ -301,7 +301,7 @@
<!-- Restricts the Java version to 17 - API remains at Java 17 for now. -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<version>3.13.0</version>
<configuration>
<release>17</release>
<compilerArgument>-Xlint:unchecked</compilerArgument>
Expand Down
10 changes: 5 additions & 5 deletions spec/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version>
<version>3.4.1</version>
<executions>
<execution>
<id>enforce-maven</id>
Expand All @@ -63,7 +63,7 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.6.0</version>
<version>3.8.6</version>
</requireMavenVersion>
</rules>
</configuration>
Expand All @@ -74,12 +74,12 @@
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>2.2.3</version>
<version>3.0.0</version>
<dependencies>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj-pdf</artifactId>
<version>2.3.7</version>
<version>2.3.15</version>
</dependency>
</dependencies>
<executions>
Expand Down Expand Up @@ -157,7 +157,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.5.0</version>
<version>3.7.1</version>
<inherited>false</inherited>
<executions>
<execution>
Expand Down
6 changes: 3 additions & 3 deletions tck-dist/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2022, 2022 Contributors to Eclipse Foundation. All rights reserved.
Copyright (c) 2022, 2024 Contributors to Eclipse Foundation. 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 All @@ -22,7 +22,7 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<version>1.0.9</version>
<relativePath/>
</parent>

Expand All @@ -49,7 +49,7 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.6.3</version>
<version>3.8.6</version>
</requireMavenVersion>
</rules>
</configuration>
Expand Down
47 changes: 12 additions & 35 deletions tck-dist/userguide/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2022, 2023 Contributors to Eclipse Foundation.
Copyright (c) 2022, 2024 Contributors to Eclipse Foundation.
Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
Expand All @@ -24,7 +24,7 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.7</version>
<version>1.0.9</version>
</parent>

<groupId>org.glassfish</groupId>
Expand Down Expand Up @@ -52,30 +52,25 @@
<defaultGoal>package</defaultGoal>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.4.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
<version>3.3.2</version>
</plugin>
<plugin>
<groupId>org.glassfish.doc</groupId>
<artifactId>glassfish-doc-maven-plugin</artifactId>
<version>1.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<version>3.1.0</version>
<version>3.7.1</version>
</plugin>
<plugin>
<groupId>org.jbake</groupId>
Expand All @@ -85,7 +80,7 @@
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj-diagram</artifactId>
<version>2.2.13</version>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
Expand All @@ -97,12 +92,12 @@
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>2.2.4</version>
<version>3.0.0</version>
<dependencies>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj-pdf</artifactId>
<version>2.3.9</version>
<version>2.3.15</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -225,24 +220,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<executions>
<execution>
<id>deploy-site</id>
<phase>deploy</phase>
<goals>
<goal>publish-scm</goal>
</goals>
<configuration>
<scmBranch>gh-pages</scmBranch>
<skipDeletedFiles>false</skipDeletedFiles>
<checkinComment>Update site</checkinComment>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
25 changes: 21 additions & 4 deletions tck/old-tck/build/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<version>1.0.9</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -52,9 +52,26 @@
</plugins>
</pluginManagement>
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<configuration>
<rules>
<requireMavenVersion>
<version>3.8.6</version>
</requireMavenVersion>
</rules>
</configuration>
<executions>
<execution>
<goals>
<goal>enforce</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>2.4.1</version>
<version>3.3.2</version>
<configuration>
<filesets>
<fileset>
Expand All @@ -71,7 +88,7 @@
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<inherited>false</inherited>
<version>1.6.7</version>
<version>1.9.0</version>
<executions>
<execution>
<id>download-ant</id>
Expand Down Expand Up @@ -124,7 +141,7 @@

<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>3.0.0-M1</version>
<version>3.1.2</version>
<executions>
<execution>
<id>install-old-tck</id>
Expand Down
33 changes: 19 additions & 14 deletions tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,34 +147,34 @@ mvn clean install -pl :old-tck-run -Dglassfish.suspend
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>6.0.0-M2</version>
<version>6.0.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.1.0-M1</version>
<version>6.1.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<version>2.2.0-M1</version>
<version>2.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-client-api</artifactId>
<version>2.2.0-M1</version>
<version>2.2.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>4.1.0-M1</version>
<version>4.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -231,7 +231,7 @@ mvn clean install -pl :old-tck-run -Dglassfish.suspend
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.1.0-M1</version>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -317,7 +317,7 @@ mvn clean install -pl :old-tck-run -Dglassfish.suspend
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20210307</version>
<version>20240303</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -348,17 +348,22 @@ mvn clean install -pl :old-tck-run -Dglassfish.suspend
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.13.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.5</version>
</plugin>
</plugins>
</pluginManagement>
Expand All @@ -368,7 +373,7 @@ mvn clean install -pl :old-tck-run -Dglassfish.suspend
<configuration>
<rules>
<requireMavenVersion>
<version>3.6.3</version>
<version>3.8.6</version>
</requireMavenVersion>
</rules>
</configuration>
Expand Down Expand Up @@ -414,7 +419,7 @@ mvn clean install -pl :old-tck-run -Dglassfish.suspend
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.5</version>
<executions>
<execution>
<phase>post-integration-test</phase>
Expand All @@ -435,7 +440,7 @@ mvn clean install -pl :old-tck-run -Dglassfish.suspend
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.5</version>
<configuration>
<skipSurefireReport>${skipSurefireReport}</skipSurefireReport>
<aggregate>true</aggregate>
Expand Down Expand Up @@ -500,7 +505,7 @@ mvn clean install -pl :old-tck-run -Dglassfish.suspend
<sigtest.api.version>${mojarra.version}</sigtest.api.version>

<!-- Verhicle used for testing the Mojarra version -->
<glassfish.version>8.0.0-M2</glassfish.version>
<glassfish.version>8.0.0-M5</glassfish.version>
<glassfish.root>${maven.multiModuleProjectDirectory}/target</glassfish.root>
<glassfish.home>${glassfish.root}/glassfish8</glassfish.home>
</properties>
Expand Down
Loading

0 comments on commit 17a7ea5

Please sign in to comment.