Skip to content

Commit

Permalink
Merge pull request #25241 from arjantijms/commons-logging_132
Browse files Browse the repository at this point in the history
Update build / test plugins, and ignore EE 11 versions
  • Loading branch information
arjantijms authored Nov 27, 2024
2 parents 5994a19 + 029895f commit 4f6825c
Show file tree
Hide file tree
Showing 7 changed files with 634 additions and 10 deletions.
2 changes: 1 addition & 1 deletion appserver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>4.0.1</version>
<version>4.0.2</version>
</dependency>
</dependencies>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/appserv-tests/lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.3.2</version>
<version>1.3.4</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/embedded/web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.2</version>
<version>3.0</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion docs/parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<properties>
<maven.site.skip>true</maven.site.skip>
<asciidoctor.maven.plugin.version>2.2.4</asciidoctor.maven.plugin.version>
<asciidoctorj.pdf.version>2.3.9</asciidoctorj.pdf.version>
<asciidoctorj.pdf.version>2.3.19</asciidoctorj.pdf.version>
<!-- status: DRAFT, BETA, etc., or blank for final -->
<status>DRAFT</status>
<productName>Eclipse GlassFish</productName>
Expand Down
632 changes: 626 additions & 6 deletions nucleus/parent/pom.xml

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
<plugins>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.3</version>
<configuration>
<!-- Skip deploy as this is an aggregator POM -->
<skip>true</skip>
Expand Down
3 changes: 3 additions & 0 deletions qa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<executions>
<execution>
<id>default-compile</id>
Expand All @@ -32,6 +33,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.2</version>
<executions>
<execution>
<id>default-test</id>
Expand All @@ -41,6 +43,7 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<executions>
<execution>
<id>default-testResources</id>
Expand Down

0 comments on commit 4f6825c

Please sign in to comment.