From e8de62cb0b646d311d021e3d195b8ce82c5f3d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= <david.matejcek@omnifish.ee>
Date: Sat, 25 Feb 2023 11:46:32 +0100
Subject: [PATCH] Updated maven plugins
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- reflected some warnings from Maven and Eclipse

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
---
 appserver/pom.xml                             |  6 +-
 appserver/tests/jakartaee/concurrency/pom.xml | 36 ++++----
 appserver/tests/tck/concurrency/pom.xml       |  4 -
 .../tests/tck/microprofile/config/pom.xml     |  4 +-
 appserver/tests/tck/microprofile/pom.xml      | 13 +--
 nucleus/parent/pom.xml                        | 91 +++++++++----------
 pom.xml                                       |  7 +-
 7 files changed, 71 insertions(+), 90 deletions(-)

diff --git a/appserver/pom.xml b/appserver/pom.xml
index c2a17901063..a3b1642b92a 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -717,13 +717,17 @@
                     <artifactId>maven-rar-plugin</artifactId>
                     <version>${maven-rar-plugin.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.glassfish.build</groupId>
+                    <artifactId>spec-version-maven-plugin</artifactId>
+                    <version>2.1</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.glassfish.build</groupId>
                 <artifactId>spec-version-maven-plugin</artifactId>
-                <version>2.1</version>
                 <configuration>
                     <dir>${stage.dir}/${install.dir.name}/glassfish/modules</dir>
                     <includes>jakarta*.jar</includes>
diff --git a/appserver/tests/jakartaee/concurrency/pom.xml b/appserver/tests/jakartaee/concurrency/pom.xml
index aae1f822322..ca3235c717c 100644
--- a/appserver/tests/jakartaee/concurrency/pom.xml
+++ b/appserver/tests/jakartaee/concurrency/pom.xml
@@ -16,13 +16,13 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <concurrency.tck-3-0.version>3.0.2</concurrency.tck-3-0.version>
-        
+
         <glassfish.version>${project.version}</glassfish.version>
         <glassfish.root>${project.build.directory}</glassfish.root>
         <glassfish.home>${glassfish.root}/glassfish7</glassfish.home>
         <suiteXmlFile>suite.xml</suiteXmlFile>
     </properties>
-    
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -34,20 +34,20 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-    
+
     <dependencies>
         <!-- Jakarta EE APIs -->
         <dependency>
             <groupId>jakarta.enterprise.concurrent</groupId>
             <artifactId>jakarta.enterprise.concurrent-api</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
-    
-    
+
+
         <!--  The TCK  -->
         <dependency>
             <groupId>jakarta.enterprise.concurrent</groupId>
@@ -55,13 +55,13 @@
             <version>${concurrency.tck-3-0.version}</version>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>jakarta.ejb</groupId>
             <artifactId>jakarta.ejb-api</artifactId>
             <scope>test</scope>
         </dependency>
-    
+
         <!-- Utility classes for TestNG and Arquillian, used in suite.xml -->
         <dependency>
             <groupId>jakarta.enterprise</groupId>
@@ -91,7 +91,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
-                  
+
         <!--
             The Arquillian connector that starts GlassFish and deploys archives to it.
         -->
@@ -100,14 +100,14 @@
             <artifactId>arquillian-glassfish-server-managed</artifactId>
             <version>1.2</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <version>7.4.0</version>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -191,22 +191,22 @@
                         </property>
                     </properties>
                     <forkMode>once</forkMode>
-                    
+
                     <!-- System Properties -->
                     <systemPropertyVariables>
                         <glassfish.home>${glassfish.root}/glassfish7</glassfish.home>
                         <glassfish.enableDerby>true</glassfish.enableDerby>
                         <glassfish.maxHeapSize>2048m</glassfish.maxHeapSize>
-                        
+
                         <!-- Remove comments for logging to file. Following logging with e.g. tail -f ConcurrentTCK00.log -->
                         <!--
                         <java.util.logging.config.file>${project.build.directory}/test-classes/logging.properties</java.util.logging.config.file>
-                        
+
                         -->
                         <glassfish.systemProperties>
                             jimage.dir=${project.build.directory}/jimage
                         </glassfish.systemProperties>
-                        
+
                         <glassfish.postBootCommands>
                             create-file-user --groups staff:mgr --passwordfile ${project.build.directory}/test-classes/j2ee.pass j2ee
                             create-file-user --groups Manager --passwordfile ${project.build.directory}/test-classes/javajoe.pass javajoe
@@ -216,9 +216,7 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>3.0.0-M7</version>
                 <executions>
                     <execution>
                         <id>generate-test-report</id>
@@ -253,5 +251,5 @@
             </properties>
         </profile>
     </profiles>
-    
-</project>
\ No newline at end of file
+
+</project>
diff --git a/appserver/tests/tck/concurrency/pom.xml b/appserver/tests/tck/concurrency/pom.xml
index f3a173dc8fc..6ed497d8dd0 100644
--- a/appserver/tests/tck/concurrency/pom.xml
+++ b/appserver/tests/tck/concurrency/pom.xml
@@ -224,8 +224,6 @@
                             <value>1</value>
                         </property>
                     </properties>
-                    <forkMode>once</forkMode>
-
                     <!-- System Properties -->
                     <systemPropertyVariables>
                         <glassfish.home>${glassfish.root}/glassfish7</glassfish.home>
@@ -250,9 +248,7 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>3.0.0-M7</version>
                 <executions>
                     <execution>
                         <id>generate-test-report</id>
diff --git a/appserver/tests/tck/microprofile/config/pom.xml b/appserver/tests/tck/microprofile/config/pom.xml
index bcda97ba64b..19c537c2ceb 100644
--- a/appserver/tests/tck/microprofile/config/pom.xml
+++ b/appserver/tests/tck/microprofile/config/pom.xml
@@ -74,11 +74,11 @@
                         <customer_name>Bob</customer_name>
                     </environmentVariables>
 
-                    <systemProperties>
+                    <systemPropertyVariables>
                         <mp.tck.prop.dummy>dummy</mp.tck.prop.dummy>
                         <customer.hobby>Tennis</customer.hobby>
                         <config_ordinal>120</config_ordinal>
-                    </systemProperties>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/appserver/tests/tck/microprofile/pom.xml b/appserver/tests/tck/microprofile/pom.xml
index d1e3186acee..e9a66941389 100644
--- a/appserver/tests/tck/microprofile/pom.xml
+++ b/appserver/tests/tck/microprofile/pom.xml
@@ -133,23 +133,14 @@
 
                 <plugin>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.22.2</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>integration-test</goal>
-                                <goal>verify</goal>
-                            </goals>
-                        </execution>
-                    </executions>
                     <configuration>
-                        <systemProperties>
+                        <systemPropertyVariables>
                             <glassfish.home>${glassfish.home}</glassfish.home>
 
                             <!-- Use the Arquillian XML from the parent in each child module -->
                             <arquillian.xml>${project.parent.basedir}/arquillian.xml</arquillian.xml>
                             <arquillian.launch>arquillian-glassfish</arquillian.launch>
-                        </systemProperties>
+                        </systemPropertyVariables>
                         <environmentVariables>
                             <GLASSFISH_HOME>${glassfish.home}</GLASSFISH_HOME>
                         </environmentVariables>
diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
index 4d1acc8938d..e2c5beddafe 100644
--- a/nucleus/parent/pom.xml
+++ b/nucleus/parent/pom.xml
@@ -132,7 +132,6 @@
         <shoal.version>3.0.1</shoal.version>
         <ha-api.version>3.1.13</ha-api.version>
         <logging-annotation-processor.version>1.9</logging-annotation-processor.version>
-        <command-security-plugin.version>1.0.16</command-security-plugin.version>
         <command.security.maven.plugin.isFailureFatal>true</command.security.maven.plugin.isFailureFatal>
 
 
@@ -750,7 +749,6 @@
                 <artifactId>logging-annotation-processor</artifactId>
                 <version>${logging-annotation-processor.version}</version>
             </dependency>
-
         </dependencies>
     </dependencyManagement>
 
@@ -791,7 +789,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-antrun-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.1.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.felix</groupId>
@@ -836,16 +834,21 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.5.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.glassfish.build</groupId>
                     <artifactId>glassfishbuild-maven-plugin</artifactId>
-                    <version>3.2.27</version>
+                    <version>3.2.28</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.4.1</version>
+                    <version>3.5.0</version>
+                    <configuration>
+                        <detectOfflineLinks>false</detectOfflineLinks>
+                        <notimestamp>false</notimestamp>
+                        <skip>${javadoc.skip}</skip>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <artifactId>maven-source-plugin</artifactId>
@@ -857,7 +860,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.0.0-M7</version>
+                    <version>3.0.0-M9</version>
                     <configuration>
                         <environmentVariables>
                             <LANG>en</LANG>
@@ -871,16 +874,16 @@
                            <exclude>**/*ITest.java</exclude>
                            <exclude>**/*IT.java</exclude>
                         </excludes>
-                        <systemProperties>
+                        <systemPropertyVariables>
                             <java.util.logging.manager>${test.logManager}</java.util.logging.manager>
                             <java.util.logging.config.useDefaults>true</java.util.logging.config.useDefaults>
                             <java.util.logging.config.defaultLevel>${test.logLevel}</java.util.logging.config.defaultLevel>
-                        </systemProperties>
+                        </systemPropertyVariables>
                     </configuration>
                 </plugin>
                 <plugin>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>3.0.0-M7</version>
+                    <version>3.0.0-M9</version>
                     <configuration>
                         <environmentVariables>
                             <LANG>en</LANG>
@@ -888,17 +891,16 @@
                         <argLine>${failsafe.argLine}</argLine>
                         <trimStackTrace>false</trimStackTrace>
                         <useSystemClassLoader>true</useSystemClassLoader>
-                        <verbose>true</verbose>
                         <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
                         <includes>
                            <include>**/*ITest.java</include>
                            <include>**/*IT.java</include>
                         </includes>
-                        <systemProperties>
+                        <systemPropertyVariables>
                             <java.util.logging.manager>${test.logManager}</java.util.logging.manager>
                             <java.util.logging.config.useDefaults>true</java.util.logging.config.useDefaults>
                             <java.util.logging.config.defaultLevel>${test.logLevel}</java.util.logging.config.defaultLevel>
-                        </systemProperties>
+                        </systemPropertyVariables>
                     </configuration>
                     <executions>
                         <execution>
@@ -915,9 +917,13 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-surefire-report-plugin</artifactId>
+                    <version>3.0.0-M9</version>
+                </plugin>
                 <plugin>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.2.1</version>
                     <configuration>
                         <configLocation>org/glassfish/qa/config/checkstyle/checkstyle.xml</configLocation>
                         <suppressionsLocation>org/glassfish/qa/config/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
@@ -968,31 +974,31 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>3.0.0-M5</version>
+                    <version>3.0.0-M7</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>4.0.0-M2</version>
+                    <version>4.0.0-M5</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.5.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>3.0.0-M2</version>
+                    <version>3.1.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-install-plugin</artifactId>
-                    <version>3.0.0-M1</version>
+                    <version>3.1.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.2</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -1001,7 +1007,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-invoker-plugin</artifactId>
-                    <version>3.2.2</version>
+                    <version>3.5.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.glassfish.copyright</groupId>
@@ -1049,11 +1055,6 @@
                         <ignoreYear>true</ignoreYear>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>com.google.code.maven-replacer-plugin</groupId>
-                    <artifactId>replacer</artifactId>
-                    <version>${replacer.plugin.version}</version>
-                </plugin>
                 <plugin>
                     <groupId>io.github.git-commit-id</groupId>
                     <artifactId>git-commit-id-maven-plugin</artifactId>
@@ -1076,11 +1077,18 @@
                         </includeOnlyProperties>
                     </configuration>
                 </plugin>
-                
+                <plugin>
+                    <groupId>org.glassfish.build</groupId>
+                    <artifactId>command-security-maven-plugin</artifactId>
+                    <version>1.0.16</version>
+                    <configuration>
+                        <isFailureFatal>${command.security.maven.plugin.isFailureFatal}</isFailureFatal>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.14.2</version>
+                    <version>2.15.0</version>
                     <executions>
                         <execution>
                             <id>default-cli</id>
@@ -1089,12 +1097,12 @@
                                 <goal>display-dependency-updates</goal>
                             </goals>
                             <configuration>
-                                <!-- 
-                                    Exclude several versions that we never want to update to since they are OLDER than 
+                                <!--
+                                    Exclude several versions that we never want to update to since they are OLDER than
                                     what we currently use.
-                                    
-                                    Note that we actually want to specify the version per artefact, but this is currently 
-                                    broken. 
+
+                                    Note that we actually want to specify the version per artefact, but this is currently
+                                    broken.
                                     See https://github.com/mojohaus/versions/issues/258#issuecomment-1438149133
                                  -->
                                 <ignoredVersions>3.2-b..,2.5.0-b..,5.0-jdk8-rc.,20030911,10.0-b..</ignoredVersions>
@@ -1116,7 +1124,7 @@
                         <configuration>
                             <rules>
                                 <requireMavenVersion>
-                                    <version>3.6.0</version>
+                                    <version>3.8.6</version>
                                 </requireMavenVersion>
                             </rules>
                         </configuration>
@@ -1316,15 +1324,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <detectOfflineLinks>false</detectOfflineLinks>
-                    <additionalparam>-Xdoclint:none</additionalparam>
-                    <skip>${javadoc.skip}</skip>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.glassfish.hk2</groupId>
                 <artifactId>osgiversion-maven-plugin</artifactId>
@@ -1383,10 +1382,6 @@
             <plugin>
                 <groupId>org.glassfish.build</groupId>
                 <artifactId>command-security-maven-plugin</artifactId>
-                <version>${command-security-plugin.version}</version>
-                <configuration>
-                    <isFailureFatal>${command.security.maven.plugin.isFailureFatal}</isFailureFatal>
-                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/pom.xml b/pom.xml
index f5ca1fb2906..415522df5cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,17 +43,14 @@
       <url>https://github.com/eclipse-ee4j/glassfish</url>
     </scm>
 
-    <!--
-        Skip deploy and install as this is an aggregator POM
-    -->
     <build>
         <defaultGoal>install</defaultGoal>
         <pluginManagement>
             <plugins>
                 <plugin>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>3.0.0-M2</version>
                     <configuration>
+                        <!-- Skip deploy as this is an aggregator POM -->
                         <skip>true</skip>
                     </configuration>
                 </plugin>
@@ -84,7 +81,7 @@
                         <configuration>
                             <rules>
                                 <requireMavenVersion>
-                                    <version>3.6.0</version>
+                                    <version>3.8.6</version>
                                 </requireMavenVersion>
                             </rules>
                         </configuration>