Merge pull request #58 from scottmarlow/cleanup_coreprofilerunner

Cleanup Core Profle TCK runner
wildfly · Oct 27, 2022 · 115cec9 · 115cec9
2 parents 349ff63 + 9081079
commit 115cec9
Show file tree

Hide file tree

Showing 7 changed files with 87 additions and 51 deletions.
diff --git a/wf-core-tck-runner/cdi-langmodel-tck/pom.xml b/wf-core-tck-runner/cdi-langmodel-tck/pom.xml
@@ -84,14 +84,8 @@
         <version>3.0.0-M6</version>
         <configuration>
           <argLine>
-            --add-exports=java.desktop/sun.awt=ALL-UNNAMED
-            --add-opens=java.base/java.io=ALL-UNNAMED
-            --add-opens=java.base/java.lang=ALL-UNNAMED
-            --add-opens=java.base/java.lang.invoke=ALL-UNNAMED
-            --add-opens=java.base/java.security=ALL-UNNAMED
-            --add-opens=java.base/java.util=ALL-UNNAMED
-            --add-opens=java.management/javax.management=ALL-UNNAMED
-            --add-opens=java.naming/javax.naming=ALL-UNNAMED
+            ${addjdkexports}
+            ${addjdkopens}
           </argLine>
           <enableAssertions>true</enableAssertions>
           <forkCount>1</forkCount>

diff --git a/wf-core-tck-runner/cdi-tck/pom.xml b/wf-core-tck-runner/cdi-tck/pom.xml
@@ -121,7 +121,7 @@
     <dependency>
       <groupId>org.jboss.shrinkwrap.descriptors</groupId>
       <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
-      <version>2.0.0</version>
+      <version>${shrinkwrap.ee.descriptors.impl.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.protocol</groupId>
@@ -239,14 +239,8 @@
         <version>3.0.0-M6</version>
         <configuration>
           <argLine>
-            --add-exports=java.desktop/sun.awt=ALL-UNNAMED
-            --add-opens=java.base/java.io=ALL-UNNAMED
-            --add-opens=java.base/java.lang=ALL-UNNAMED
-            --add-opens=java.base/java.lang.invoke=ALL-UNNAMED
-            --add-opens=java.base/java.security=ALL-UNNAMED
-            --add-opens=java.base/java.util=ALL-UNNAMED
-            --add-opens=java.management/javax.management=ALL-UNNAMED
-            --add-opens=java.naming/javax.naming=ALL-UNNAMED
+            ${addjdkexports}
+            ${addjdkopens}
           </argLine>
           <properties>
             <property>
@@ -371,37 +365,37 @@
           <groupId>jakarta.annotation</groupId>
           <artifactId>jakarta.annotation-api</artifactId>
           <scope>system</scope>
-          <systemPath>${env.JBOSS_HOME}/modules/system/layers/base/jakarta/annotation/api/main/jakarta.annotation-api-2.1.1.jar</systemPath>
+          <systemPath>${env.JBOSS_HOME}/${env.ANNOTATION_API}</systemPath>
         </dependency>
         <dependency>
           <groupId>jakarta.el</groupId>
           <artifactId>jakarta.el-api</artifactId>
           <scope>system</scope>
-          <systemPath>${env.JBOSS_HOME}/modules/system/layers/base/jakarta/el/api/main/jboss-el-api_5.0_spec-4.0.0.CR1.jar</systemPath>
+          <systemPath>${env.JBOSS_HOME}/${env.EXPRESSION_LANGUAGE_API}</systemPath>
         </dependency>
         <dependency>
           <groupId>jakarta.interceptor</groupId>
           <artifactId>jakarta.interceptor-api</artifactId>
           <scope>system</scope>
-          <systemPath>${env.JBOSS_HOME}/modules/system/layers/base/jakarta/interceptor/api/main/jakarta.interceptor-api-2.1.0.jar</systemPath>
+          <systemPath>${env.JBOSS_HOME}/${env.INTERCEPTER_API}</systemPath>
         </dependency>
         <dependency>
           <groupId>jakarta.inject</groupId>
           <artifactId>jakarta.inject-api</artifactId>
           <scope>system</scope>
-          <systemPath>${env.JBOSS_HOME}/modules/system/layers/base/jakarta/inject/api/main/jakarta.inject-api-2.0.1.jar</systemPath>
+          <systemPath>${env.JBOSS_HOME}/${env.INJECT_API}</systemPath>
         </dependency>
         <dependency>
           <groupId>jakarta.enterprise</groupId>
           <artifactId>jakarta.enterprise.lang-model</artifactId>
           <scope>system</scope>
-          <systemPath>${env.JBOSS_HOME}/modules/system/layers/base/jakarta/enterprise/api/main/jakarta.enterprise.lang-model-4.0.0.jar</systemPath>
+          <systemPath>${env.JBOSS_HOME}/${env.CDI_LANG_MODEL_API}</systemPath>
         </dependency>
         <dependency>
           <groupId>jakarta.enterprise</groupId>
           <artifactId>jakarta.enterprise.cdi-api</artifactId>
           <scope>system</scope>
-          <systemPath>${env.JBOSS_HOME}/modules/system/layers/base/jakarta/enterprise/api/main/jakarta.enterprise.cdi-api-4.0.0.jar</systemPath>
+          <systemPath>${env.JBOSS_HOME}/${env.CDI_API}</systemPath>
         </dependency>
       </dependencies>
 
@@ -458,7 +452,7 @@
           <groupId>jakarta.annotation</groupId>
           <artifactId>jakarta.annotation-api</artifactId>
           <scope>system</scope>
-          <systemPath>${env.JBOSS_HOME}/modules/system/layers/base/jakarta/annotation/api/main/jakarta.annotation-api-2.1.1.jar</systemPath>
+          <systemPath>${env.JBOSS_HOME}/${env.ANNOTATION_API}</systemPath>
         </dependency>
       </dependencies>
 

diff --git a/wf-core-tck-runner/core-tck/pom.xml b/wf-core-tck-runner/core-tck/pom.xml
@@ -173,14 +173,8 @@
         <artifactId>maven-failsafe-plugin</artifactId>
         <configuration>
           <argLine>
-            --add-exports=java.desktop/sun.awt=ALL-UNNAMED
-            --add-opens=java.base/java.io=ALL-UNNAMED
-            --add-opens=java.base/java.lang=ALL-UNNAMED
-            --add-opens=java.base/java.lang.invoke=ALL-UNNAMED
-            --add-opens=java.base/java.security=ALL-UNNAMED
-            --add-opens=java.base/java.util=ALL-UNNAMED
-            --add-opens=java.management/javax.management=ALL-UNNAMED
-            --add-opens=java.naming/javax.naming=ALL-UNNAMED
+            ${addjdkexports}
+            ${addjdkopens}
           </argLine>
           <properties>
             <configurationParameters>

diff --git a/wf-core-tck-runner/jsonp-tck/pom.xml b/wf-core-tck-runner/jsonp-tck/pom.xml
@@ -132,14 +132,8 @@
           <excludedGroups>${excluded.groups}</excludedGroups>
 
           <argLine>
-            --add-exports=java.desktop/sun.awt=ALL-UNNAMED
-            --add-opens=java.base/java.io=ALL-UNNAMED
-            --add-opens=java.base/java.lang=ALL-UNNAMED
-            --add-opens=java.base/java.lang.invoke=ALL-UNNAMED
-            --add-opens=java.base/java.security=ALL-UNNAMED
-            --add-opens=java.base/java.util=ALL-UNNAMED
-            --add-opens=java.management/javax.management=ALL-UNNAMED
-            --add-opens=java.naming/javax.naming=ALL-UNNAMED
+            ${addjdkexports}
+            ${addjdkopens}
           </argLine>
           <properties>
           </properties>

diff --git a/wf-core-tck-runner/pom.xml b/wf-core-tck-runner/pom.xml
@@ -64,6 +64,10 @@
   <properties>
     <maven.compiler.release>11</maven.compiler.release>
 
+    <!-- Java workarounds -->
+    <addjdkexports>--add-exports=java.desktop/sun.awt=ALL-UNNAMED </addjdkexports>
+    <addjdkopens>--add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.management/javax.management=ALL-UNNAMED --add-opens=java.naming/javax.naming=ALL-UNNAMED </addjdkopens>
+
     <!-- Jakarta EE APIs Core -->
     <annotations.api.version>2.1.1</annotations.api.version>
     <interceptors.api.version>2.1.0</interceptors.api.version>
@@ -80,6 +84,7 @@
     <!-- Test tools/dependencies -->
     <arquillian.version>1.7.0.Alpha10</arquillian.version>
     <arquillian.container.se.api.version>1.0.1.Final</arquillian.container.se.api.version>
+    <shrinkwrap.ee.descriptors.impl.version>2.0.0</shrinkwrap.ee.descriptors.impl.version>
     <apache.httpclient.version>3.1</apache.httpclient.version>
     <glassfish.jakarta.el.version>4.0.2</glassfish.jakarta.el.version>
     <yasson.version>3.0.0-RC1</yasson.version>
@@ -97,8 +102,8 @@
     <wildfly.plugin.version>3.0.0.Final</wildfly.plugin.version>
     <!-- WildFly JSON-P/JSON-B api jars -->
     <wildfly.home>${env.JBOSS_HOME}</wildfly.home>
-    <wildfly.json-api.jar>${wildfly.home}/modules/system/layers/base/jakarta/json/api/main/jakarta.json-api-2.1.1.jar</wildfly.json-api.jar>
-    <wildfly.json-bind-api.jar>${wildfly.home}/modules/system/layers/base/jakarta/json/bind/api/main/jakarta.json.bind-api-3.0.0.jar</wildfly.json-bind-api.jar>
+    <wildfly.json-api.jar>${wildfly.home}/${env.JSONP_API}</wildfly.json-api.jar>
+    <wildfly.json-bind-api.jar>${wildfly.home}/${env.JSONB_API}</wildfly.json-bind-api.jar>
 
     <!--gc.args>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5006</gc.args-->
     <failsafe.plugin.jdk17.args/>

diff --git a/wf-core-tck-runner/rest-tck/pom.xml b/wf-core-tck-runner/rest-tck/pom.xml
@@ -200,14 +200,8 @@
           <test>ee.jakarta.tck.coreprofile.rs.CoreProfileRestTCKSuite</test>
 
           <argLine>
-            --add-exports=java.desktop/sun.awt=ALL-UNNAMED
-            --add-opens=java.base/java.io=ALL-UNNAMED
-            --add-opens=java.base/java.lang=ALL-UNNAMED
-            --add-opens=java.base/java.lang.invoke=ALL-UNNAMED
-            --add-opens=java.base/java.security=ALL-UNNAMED
-            --add-opens=java.base/java.util=ALL-UNNAMED
-            --add-opens=java.management/javax.management=ALL-UNNAMED
-            --add-opens=java.naming/javax.naming=ALL-UNNAMED
+            ${addjdkexports}
+            ${addjdkopens}
           </argLine>
           <systemPropertyVariables>
             <arquillian.launch>wildfly-core-profile</arquillian.launch>
@@ -225,7 +219,7 @@
             <porting.ts.url.class.1>ee.jakarta.tck.ws.rs.lib.implementation.sun.common.SunRIURL</porting.ts.url.class.1>
             <optional.tech.packages.to.ignore>jakarta.xml.bind</optional.tech.packages.to.ignore>
             <!--suppress UnresolvedMavenProperty -->
-            <signature.sigTestClasspath>${env.JBOSS_HOME}/modules/system/layers/base/jakarta/ws/rs/api/main/jakarta.ws.rs-api-${rest.api.version}.jar${path.separator}${env.JBOSS_HOME}/modules/system/layers/base/jakarta/xml/bind/api/main/jakarta.xml.bind-api-4.0.0.jar${path.separator}${jimage.dir}/java.base${path.separator}${jimage.dir}/java.rmi${path.separator}${jimage.dir}/java.sql${path.separator}${jimage.dir}/java.naming</signature.sigTestClasspath>
+            <signature.sigTestClasspath>${env.JBOSS_HOME}/${env.REST_API}${path.separator}${env.JBOSS_HOME}/${env.XML_BIND_API}${path.separator}${jimage.dir}/java.base${path.separator}${jimage.dir}/java.rmi${path.separator}${jimage.dir}/java.sql${path.separator}${jimage.dir}/java.naming</signature.sigTestClasspath>
 
           </systemPropertyVariables>
           <systemProperties>

diff --git a/wf-core-tck-runner/run_all.sh b/wf-core-tck-runner/run_all.sh
@@ -20,6 +20,67 @@ if [[ -z "${JBOSS_HOME}" ]]; then
   exit 1
 fi
 
+# locate SPEC API jars if not already specified
+if [[ -z "${ANNOTATION_API}" ]]; then
+  pushd ${JBOSS_HOME}
+  export ANNOTATION_API=`find * -name jakarta*annotation*api*.jar`
+  popd
+fi
+
+if [[ -z "${EXPRESSION_LANGUAGE_API}" ]]; then
+  pushd ${JBOSS_HOME}
+  export EXPRESSION_LANGUAGE_API=`find * -name *el-api*.jar`
+  popd
+fi
+
+if [[ -z "${INTERCEPTER_API}" ]]; then
+  pushd ${JBOSS_HOME}
+  export INTERCEPTER_API=`find * -name *interceptor-api*.jar`
+  popd
+fi
+
+if [[ -z "${INJECT_API}" ]]; then
+  pushd ${JBOSS_HOME}
+  export INJECT_API=`find * -name *inject-api*.jar`
+  popd
+fi
+
+if [[ -z "${CDI_API}" ]]; then
+  pushd ${JBOSS_HOME}
+  export CDI_API=`find * -name *enterprise*cdi*api*.jar`
+  popd
+fi
+
+if [[ -z "${CDI_LANG_MODEL_API}" ]]; then
+  pushd ${JBOSS_HOME}
+  export CDI_LANG_MODEL_API=`find * -name *enterprise*lang*model*.jar`
+  popd
+fi
+
+if [[ -z "${JSONP_API}" ]]; then
+  pushd ${JBOSS_HOME}
+  export JSONP_API=`find * -name *json-api*.jar`
+  popd
+fi
+
+if [[ -z "${JSONB_API}" ]]; then
+  pushd ${JBOSS_HOME}
+  export JSONB_API=`find * -name *json.bind*api*.jar`
+  popd
+fi
+
+if [[ -z "${REST_API}" ]]; then
+  pushd ${JBOSS_HOME}
+  export REST_API=`find * -name *ws.rs-api*.jar`
+  popd
+fi
+
+if [[ -z "${XML_BIND_API}" ]]; then
+  pushd ${JBOSS_HOME}
+  export XML_BIND_API=`find * -name *xml*bind*api*.jar`
+  popd
+fi
+
 echo "+++ Environment:"
 uname -a
 echo "JAVA_HOME=$JAVA_HOME"