cdi GF porting kit support for CDI TCK 4.0.

Signed-off-by: [email protected] <[email protected]>
eclipse-ee4j · Apr 8, 2022 · 1ad60a8 · 1ad60a8
1 parent f8e91fe
commit 1ad60a8
Show file tree

Hide file tree

Showing 10 changed files with 337 additions and 1,524 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -34,7 +34,7 @@ spec:
     - "localhost.localdomain"
   containers:
   - name: cdi-tck-ci
-    image: jakartaee/cts-base:0.2
+    image: jakartaee/cts-base:0.3
     command:
     - cat
     tty: true
@@ -51,7 +51,7 @@ spec:
   }
   parameters {
     string(name: 'GF_BUNDLE_URL', 
-           defaultValue: 'https://ci.eclipse.org/jakartaee-tck/job/build-glassfish/lastSuccessfulBuild/artifact/appserver/distributions/glassfish/target/glassfish.zip',
+           defaultValue: 'https://download.eclipse.org/ee4j/glassfish/glassfish-7.0.0-SNAPSHOT-nightly.zip',
            description: 'URL required for downloading GlassFish Full/Web profile bundle' )
     choice(name: 'PROFILE', choices: 'FULL\nWEB', 
            description: 'Profile to be used for running CTS either web/full' )
@@ -61,10 +61,10 @@ spec:
            defaultValue: '', 
 	         description: 'Name of bundle file to be appended to the base url' )
 	  string(name: 'CDI_TCK_BUNDLE_URL', 
-          defaultValue: 'https://jakarta.oss.sonatype.org/content/repositories/staging/jakarta/enterprise/cdi-tck-dist/3.0.2/cdi-tck-dist-3.0.2-dist.zip', 
+          defaultValue: 'https://download.eclipse.org/ee4j/cdi/4.0/cdi-tck-4.0.0-dist.zip', 
   	      description: 'CDI TCK bundle url' )
     string(name: 'CDI_TCK_VERSION', 
-          defaultValue: '3.0.1', 
+          defaultValue: '4.0.0', 
           description: 'version of bundle file' )
     string(name: 'TCK_BUNDLE_BASE_URL', 
           defaultValue: '', 

diff --git a/build.xml b/build.xml
@@ -24,7 +24,7 @@
 
 	<property name="maven.executable" value="${env.MAVEN_HOME}/bin/mvn" />
         <property name="pathsep" value="${path.separator}"/>
-        <property name="portingkit.version" value="3.0.1"/>
+        <property name="portingkit.version" value="4.0.0"/>
 	<property name="src" value="${basedir}/src" />
 	<property name="classes" value="${basedir}/classes" />
 	<property name="dist" value="${basedir}/dist" />
@@ -37,31 +37,10 @@
         <property name="javadb.port" value="1527"/>
         <!-- number of seconds to wait for the v4 admin port to be available -->
 	<property name="wait.for.v4" value="90"/> 
-
-        <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${lib}/ant-contrib.jar" />
+	<property name="sig.file" value="${porting.home}/cdi-tck-impl-sigtest.sig" />
 
-        <!-- Set the sig file to use based on the Java SE Version in use -->
-	<if>
-            <equals arg1="${java.specification.version}" arg2="1.8"/>
-            <then>
-                  <property name="sig.file" value="${porting.home}/cdi-tck-impl-sigtest-jdk8.sig" />
-            </then>
-            <else>                
-            	<property name="sig.file" value="${porting.home}/cdi-tck-impl-sigtest-jdk11.sig" />
-            </else>
-        </if>    
 
-        <condition property="java.classes.for.sig.ext" value="bundle/Classes/classes.jar"
-                                   else="lib/rt.jar">    
-            <and> 
-                <os family="mac"/> 
-                <or>
-                    <contains string="${java.version}" substring="1.6" casesensitive="false" />
-                    <contains string="${java.version}" substring="1.5" casesensitive="false" />
-                    <contains string="${java.version}" substring="1.4" casesensitive="false" />
-                </or> 
-            </and>     
-        </condition>
+        <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${lib}/ant-contrib.jar" />
 
         <condition property="max.classes.restart" value="10"
                                    else="40">    
@@ -116,6 +95,7 @@
                 </then>
                 <else>
                     <mvn.test dir="glassfish-tck-runner"/>
+                    <mvn.dependency-tree dir="glassfish-tck-runner"/>
                 </else>
             </if>
 
@@ -465,7 +445,7 @@
 	</target>
 
 
-        <presetdef name="mvn.test">
+    <presetdef name="mvn.test">
 		<exec executable="${maven.executable}">
 				<arg value="--global-settings" />
 				<arg value="${porting.home}/settings.xml"/>
@@ -475,10 +455,20 @@
                 <arg value="clean" />
                 <arg value="test" />  
                 <arg value="dependency:tree"/>                     
-                <!--<arg value="-DtckTest=MessageDrivenBeanContextTest" />-->                      
 		</exec>
 	</presetdef>
 
+
+     <presetdef name="mvn.dependency-tree">
+		<exec executable="${maven.executable}">
+				<arg value="--global-settings" />
+				<arg value="${porting.home}/settings.xml"/>
+				<arg value="-P" />
+                <arg value="glassfish-managed" />
+                <arg value="dependency:tree"/>                     
+		</exec>
+	</presetdef>
+
         <presetdef name="mvn.test.win">
 		<exec executable="cmd">
 			<arg value="/c"/>