Skip to content

Commit

Permalink
Update build plugins
Browse files Browse the repository at this point in the history 
Signed-off-by: Lukas Jungmann <[email protected]>
  • Loading branch information
@lukasj
lukasj committed Jul 21, 2022
1 parent c12e348 commit 92bac1e
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 38 deletions.
4 changes: 2 additions & 2 deletions jpa/eclipselink.jaxrs.test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
</execution>
</executions>
</plugin>
<!--Must be before cargo-maven2-plugin to start DB before JEE server and stop after.-->
<!--Must be before cargo-maven3-plugin to start DB before JEE server and stop after.-->
<plugin>
<groupId>org.carlspring.maven</groupId>
<artifactId>derby-maven-plugin</artifactId>
Expand Down Expand Up @@ -232,7 +232,7 @@
<!--Start selected JEE server configure there datasource and deploy test application-->
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<artifactId>cargo-maven3-plugin</artifactId>
<configuration>
<skip>${test-skip-jpa-jaxrs}</skip>
<deployables>
Expand Down
2 changes: 1 addition & 1 deletion jpa/eclipselink.jpa.nosql.test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@
<!--Start selected JEE server configure there datasource and deploy test application-->
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<artifactId>cargo-maven3-plugin</artifactId>
<configuration>
<skip>${skip-server-test-jpa}</skip>
<deployables>
Expand Down
2 changes: 1 addition & 1 deletion jpa/eclipselink.jpa.oracle.test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@
<!--Start selected JEE server configure there datasource and deploy test application-->
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<artifactId>cargo-maven3-plugin</artifactId>
<configuration>
<skip>${skip-server-test-jpa}</skip>
<container>
Expand Down
2 changes: 1 addition & 1 deletion jpa/eclipselink.jpa.test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1196,7 +1196,7 @@
<!--Start selected JEE server configure there datasource and deploy test application-->
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<artifactId>cargo-maven3-plugin</artifactId>
<configuration>
<skip>${skip-server-test-jpa}</skip>
<deployables>
Expand Down
4 changes: 2 additions & 2 deletions jpa/eclipselink.jpars.test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
</execution>
</executions>
</plugin>
<!--Must be before cargo-maven2-plugin to start DB before JEE server and stop after.-->
<!--Must be before cargo-maven3-plugin to start DB before JEE server and stop after.-->
<plugin>
<groupId>org.carlspring.maven</groupId>
<artifactId>derby-maven-plugin</artifactId>
Expand All @@ -188,7 +188,7 @@
<!--Start selected JEE server configure there datasource and deploy test application-->
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<artifactId>cargo-maven3-plugin</artifactId>
<configuration>
<skip>${test-skip-jpa-jpars-server}</skip>
<deployables>
Expand Down
61 changes: 33 additions & 28 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1045,7 +1045,7 @@
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.6.1</version>
<version>1.6.8</version>
</plugin>
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
Expand All @@ -1070,22 +1070,22 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.1</version>
<version>5.1.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<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.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -1095,42 +1095,46 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.2</version>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0-M7</version>
<configuration>
<useModulePath>false</useModulePath>
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.0.0-M1</version>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<version>3.2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>3.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.9.1</version>
<version>3.12.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -1140,30 +1144,31 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.0.0-M7</version>
<configuration>
<useModulePath>false</useModulePath>
<forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.0.0-M7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
</plugin>
<plugin>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
<version>4.5-jdk8</version>
<version>5.0-rc3</version>
</plugin>
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>1.7.7</version>
<artifactId>cargo-maven3-plugin</artifactId>
<version>1.9.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
Expand All @@ -1173,17 +1178,17 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.4</version>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -1214,7 +1219,7 @@
<plugin>
<groupId>org.reficio</groupId>
<artifactId>p2-maven-plugin</artifactId>
<version>1.5.0</version>
<version>2.0.0</version>
</plugin>
<plugin>
<groupId>org.carlspring.maven</groupId>
Expand Down Expand Up @@ -1262,7 +1267,7 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.3.0</version>
<version>4.7.1.0</version>
<dependencies>
<dependency>
<groupId>com.github.spotbugs</groupId>
Expand All @@ -1286,7 +1291,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>7.1.0</version>
<version>7.1.1</version>
<configuration>
<!-- <failBuildOnCVSS>7</failBuildOnCVSS>-->
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
Expand Down Expand Up @@ -1516,7 +1521,8 @@
<configuration>
<niceManifest>true</niceManifest>
<instructions>
<_noextraheaders>true</_noextraheaders>
<_noextraheaders>true</_noextraheaders>
<_noimportjava>true</_noimportjava>
<HK2-Bundle-Name>${project.groupId}:${project.artifactId}</HK2-Bundle-Name>
</instructions>
</configuration>
Expand All @@ -1533,7 +1539,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
<executions>
<execution>
<id>enforce-maven</id>
Expand Down Expand Up @@ -1892,7 +1897,7 @@
<plugin>
<groupId>org.glassfish.copyright</groupId>
<artifactId>glassfish-copyright-maven-plugin</artifactId>
<version>2.3</version>
<version>2.4</version>
<configuration>
<templateFile>${copyright.template}</templateFile>
<excludeFile>${copyright.exclude}</excludeFile>
Expand Down
2 changes: 1 addition & 1 deletion sdo/eclipselink.sdo.test.server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
<!--Start selected JEE server configure there datasource and deploy test application-->
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<artifactId>cargo-maven3-plugin</artifactId>
<configuration>
<skip>${skip-server-test-sdo}</skip>
<deployables>
Expand Down
2 changes: 1 addition & 1 deletion testing/server-oracle/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
</plugin>
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<artifactId>cargo-maven3-plugin</artifactId>
<configuration>
<container>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion testing/server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
</plugin>
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<artifactId>cargo-maven3-plugin</artifactId>
<configuration>
<container>
<dependencies>
Expand Down

0 comments on commit 92bac1e

Please sign in to comment.