Updated maven plugins

- reflected some warnings from Maven and Eclipse Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
eclipse-ee4j · Feb 27, 2023 · e8de62c · e8de62c
1 parent 8ef5403
commit e8de62c
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 90 deletions.
diff --git 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
@@ -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,34 +34,34 @@
             </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>
             <artifactId>jakarta.enterprise.concurrent-tck</artifactId>
             <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>
+
+</project>
diff --git 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
@@ -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
@@ -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>