Dependencies moved to the main reactor + executable from gftest.sh on…

… jenkins Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
eclipse-ee4j · Nov 13, 2023 · 6dd4014 · 6dd4014
1 parent 969c7ad
commit 6dd4014
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/appserver/tests/appserv-tests/lib/pom.xml b/appserver/tests/appserv-tests/lib/pom.xml
@@ -3,20 +3,22 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
 >
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.glassfish.main.tests</groupId>
+        <artifactId>ant-tests</artifactId>
+        <version>7.0.10-SNAPSHOT</version>
+    </parent>
 
-    <groupId>org.glassfish.main.tests</groupId>
     <artifactId>dependency-lib-downloader</artifactId>
     <packaging>pom</packaging>
-    <version>0.0.0</version>
     <name>GlassFish Ant Dependencies</name>
     <description>
        It is more simple to copy dependencies to target dir than locating them in bash scripts.
        This pom servers just Ant tests, it should not be uploaded to any Maven repository.
     </description>
 
     <properties>
-        <!-- This is just a fake default. The version must be provided from command line -->
-        <glassfish.version>7.0.10</glassfish.version>
+        <glassfish.version>${project.version}</glassfish.version>
     </properties>
 
     <dependencies>
@@ -72,11 +74,17 @@
         <plugins>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.6.0</version>
                 <configuration>
                     <outputDirectory>${project.build.directory}</outputDirectory>
                 </configuration>
                 <executions>
+                    <execution>
+                        <id>unpack-resource</id>
+                        <goals>
+                            <goal></goal>
+                        </goals>
+                        <phase></phase>
+                    </execution>
                     <execution>
                         <id>copy-dependencies</id>
                         <goals>
@@ -91,14 +99,12 @@
             </plugin>
             <plugin>
                 <artifactId>maven-install-plugin</artifactId>
-                <version>3.1.1</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <version>3.1.1</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>

diff --git a/appserver/tests/appserv-tests/pom.xml b/appserver/tests/appserv-tests/pom.xml
@@ -37,5 +37,6 @@
         <module>connectors-ra-redeploy</module>
         <module>report-builder</module>
         <module>reporter</module>
+        <module>lib</module>
     </modules>
 </project>
diff --git a/appserver/tests/gftest.sh b/appserver/tests/gftest.sh
@@ -60,10 +60,9 @@ if [ ! -z "${JENKINS_HOME}" ] ; then
   export MVN_EXTRA="${MVN_EXTRA:=''}";
   export MVN_REPOSITORY="${MVN_REPOSITORY:=${HOME}/.m2/repository}"
   export M2_REPO="${M2_REPO:=$MVN_REPOSITORY}"
-  export GF_VERSION="$(mvn help:evaluate -Pstaging -f "${APS_HOME}/pom.xml" -Dexpression=project.version -q -DforceStdout)"
-fi
 
-echo "Preparing dependencies ..."
-mvn clean package -f ${APS_HOME}/lib/pom.xml -Dglassfish.version=${GF_VERSION}
+  echo "Preparing dependencies ..."
+  mvn clean package -f ${APS_HOME}/lib/pom.xml -Pstaging
+fi
 
 "$@"