Revert to testng 6.9.9

Bring setup-examples up to date Signed-off-by: Scott M Stark <starksm64@gmail.com>
jakartaee · Mar 4, 2020 · 23de15d · 23de15d
1 parent ad3255c
commit 23de15d
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 66 deletions.
diff --git a/pom.xml b/pom.xml
@@ -113,7 +113,7 @@
              no dependency to the RI -->
         <hibernate.validator.version>6.2.0.Final</hibernate.validator.version>
 
-        <testng.version>6.11</testng.version>
+        <testng.version>6.9.9</testng.version>
         <assertj-core.version>3.7.0</assertj-core.version>
 
         <cdi-api.version>2.0.1</cdi-api.version>

diff --git a/setup-examples/ant/build.properties b/setup-examples/ant/build.properties
@@ -8,8 +8,8 @@ validation.provider=org.hibernate.validator.HibernateValidator
 tck.suite.file=beanvalidation-tck-tests-suite.xml
 
 # define versions of used dependencies
-version.arquillian=1.4.1.Final
+version.arquillian=1.1.11.Final
 version.arquillian-glassfish=1.0.0.Final
-version.testng=6.11
+version.testng=6.9.9
 version.hv=6.0.17.Final
 version.tck=2.0.5
diff --git a/setup-examples/ant/build.xml b/setup-examples/ant/build.xml
@@ -123,16 +123,19 @@
             <jvmarg value="-Xmx1024m"/> 
 
             <!-- Uncomment for remote debugging -->
-            <!-- -->
+            <!--
             <jvmarg value="-Xnoagent"/>
             <jvmarg value="-Djava.compiler=NONE"/>
             <jvmarg value="-Xdebug"/>
             <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>
+            -->
 
             <!-- Container qualifier used in arquillian.xml -->
             <sysproperty key="arquillian.launch" value="incontainer"/>
             <!-- Specify the Jakarta Bean Validation provider under test -->
             <sysproperty key="validation.provider" value="${validation.provider}"/>
+            <!-- Uncomment to include JavaFX tests -->
+            <!-- sysproperty key="includeJavaFXTests" value="true"/> -->
 
             <!-- Uncomment to skip integration tests -->
             <!-- <sysproperty key="excludeIntegrationTests" value="true"/> -->

diff --git a/setup-examples/ant/ivy.xml b/setup-examples/ant/ivy.xml
@@ -1,67 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Jakarta Bean Validation TCK
+
+    License: Apache License, Version 2.0
+    See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+
+-->
 <ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
-  <info organisation="null"
+  <info organisation="Red Hat, Inc."
         module="beanvalidation-tck-tests"
-        revision="working@Scotts-iMacPro"
-        status="integration"
+        revision="2.0.5"
+        status="Final"
         publication="20190814202711"
   >
     <description homepage="">
       Jakarta Bean Validation TCK test suite
     </description>
-    <m:properties__jakarta.el.version>3.0.2</m:properties__jakarta.el.version>
-    <m:properties__cdi-api.version>2.0.1</m:properties__cdi-api.version>
-    <m:properties__maven.compiler.source>1.8</m:properties__maven.compiler.source>
-    <m:properties__hibernate.validator.version>6.2.0.Final</m:properties__hibernate.validator.version>
-    <m:properties__jboss.test.audit.version>1.1.3.Final</m:properties__jboss.test.audit.version>
-    <m:properties__beanvalidation-tck-parent.basedir>${project.basedir}</m:properties__beanvalidation-tck-parent.basedir>
-    <m:properties__license.file>license.txt</m:properties__license.file>
-    <m:properties__jruby.version>1.7.26</m:properties__jruby.version>
-    <m:properties__com.puppycrawl.tools.version>8.23</m:properties__com.puppycrawl.tools.version>
-    <m:properties__assertj-core.version>3.7.0</m:properties__assertj-core.version>
-    <m:properties__maven.compiler.target>1.8</m:properties__maven.compiler.target>
-    <m:properties__shrinkwrap.descriptors.version>2.0.0-alpha-10</m:properties__shrinkwrap.descriptors.version>
-    <m:properties__asciidoctorj-pdf.version>1.5.0-alpha.11</m:properties__asciidoctorj-pdf.version>
-    <m:properties__testng.version>6.11</m:properties__testng.version>
-    <m:properties__asciidoctorj.version>1.5.4.1</m:properties__asciidoctorj.version>
-    <m:properties__validation.api.version>2.0.2</m:properties__validation.api.version>
-    <m:properties__asciidoctor-maven-plugin.version>1.5.3</m:properties__asciidoctor-maven-plugin.version>
-    <m:properties__arquillian.version>1.1.11.Final</m:properties__arquillian.version>
-    <m:properties__project.build.sourceEncoding>UTF-8</m:properties__project.build.sourceEncoding>
-    <m:properties__hibernate-asciidoctor-theme.version>1.0.1.Final</m:properties__hibernate-asciidoctor-theme.version>
-    <m:dependency.management__org.testng__testng__version>6.11</m:dependency.management__org.testng__testng__version>
-    <m:dependency.management__org.assertj__assertj-core__version>3.7.0
-    </m:dependency.management__org.assertj__assertj-core__version>
-    <m:dependency.management__jakarta.validation__jakarta.validation-api__version>2.0.2
-    </m:dependency.management__jakarta.validation__jakarta.validation-api__version>
-    <m:dependency.management__org.hibernate.validator__hibernate-validator__version>6.0.17.Final
-    </m:dependency.management__org.hibernate.validator__hibernate-validator__version>
-    <m:dependency.management__org.jboss.test-audit__jboss-test-audit-api__version>1.1.3.Final
-    </m:dependency.management__org.jboss.test-audit__jboss-test-audit-api__version>
-    <m:dependency.management__org.jboss.test-audit__jboss-test-audit-impl__version>1.1.3.Final
-    </m:dependency.management__org.jboss.test-audit__jboss-test-audit-impl__version>
-    <m:dependency.management__org.jboss.arquillian.testng__arquillian-testng-container__version>1.1.11.Final
-    </m:dependency.management__org.jboss.arquillian.testng__arquillian-testng-container__version>
-    <m:dependency.management__org.jboss.shrinkwrap.descriptors__shrinkwrap-descriptors-impl-javaee__version>2.0.0-alpha-10
-    </m:dependency.management__org.jboss.shrinkwrap.descriptors__shrinkwrap-descriptors-impl-javaee__version>
-    <m:dependency.management__jakarta.enterprise__jakarta.enterprise.cdi-api__version>2.0.1
-    </m:dependency.management__jakarta.enterprise__jakarta.enterprise.cdi-api__version>
-    <m:dependency.management__jakarta.enterprise__jakarta.enterprise.cdi-api__exclusion_0>jakarta.el__jakarta.el-api
-    </m:dependency.management__jakarta.enterprise__jakarta.enterprise.cdi-api__exclusion_0>
-    <m:dependency.management__jakarta.enterprise__jakarta.enterprise.cdi-api__exclusion_1>
-      jakarta.interceptor__jakarta.interceptor-api
-    </m:dependency.management__jakarta.enterprise__jakarta.enterprise.cdi-api__exclusion_1>
-    <m:dependency.management__jakarta.interceptor__jakarta.interceptor-api__version>1.2.4
-    </m:dependency.management__jakarta.interceptor__jakarta.interceptor-api__version>
-    <m:dependency.management__jakarta.ejb__jakarta.ejb-api__version>3.2.5
-    </m:dependency.management__jakarta.ejb__jakarta.ejb-api__version>
-    <m:dependency.management__jakarta.annotation__jakarta.annotation-api__version>1.3.4
-    </m:dependency.management__jakarta.annotation__jakarta.annotation-api__version>
-    <m:dependency.management__jakarta.el__jakarta.el-api__version>3.0.2
-    </m:dependency.management__jakarta.el__jakarta.el-api__version>
-    <m:maven.plugins>
-      org.codehaus.mojo__exec-maven-plugin__null|org.codehaus.mojo__build-helper-maven-plugin__null|null__maven-compiler-plugin__null|org.bsc.maven__maven-processor-plugin__null|org.apache.maven.plugins__maven-checkstyle-plugin__null|org.apache.maven.plugins__maven-dependency-plugin__null|org.netbeans.tools__sigtest-maven-plugin__null|ch.mfrey.maven.plugin__copy-maven-plugin__null
-    </m:maven.plugins>
   </info>
   <configurations>
     <conf name="default" visibility="public"/>
@@ -70,7 +25,7 @@
   </configurations>
 
   <dependencies>
-    <dependency org="org.testng" name="testng" rev="6.11" force="true" conf="test->default(*)"/>
+    <dependency org="org.testng" name="testng" rev="6.9.9" force="true" conf="test->default(*)"/>
     <dependency org="org.assertj" name="assertj-core" rev="3.7.0" force="true" conf="test->default(*)"/>
     <dependency org="jakarta.validation" name="jakarta.validation-api" rev="2.0.2" force="true" conf="test->default(*)"/>
     <dependency org="org.jboss.test-audit" name="jboss-test-audit-api" rev="1.1.3.Final" force="true" conf="test->default(*)"/>

diff --git a/setup-examples/ant/readme.md b/setup-examples/ant/readme.md
@@ -21,8 +21,11 @@ using [Ant](https://ant.apache.org) + [Ivy](http://ant.apache.org/ivy/) as build
            <jvm-options>-Dvalidation.provider=org.hibernate.validator.HibernateValidator</jvm-options>
         </java-config>
 1. Make sure that _container.home_ in _build.properties_ points to your <container.home> directory
+1. Extract the BV TCK distribution.
+1. Edit the setup-examples/artifact-install.sh script and set the TCK_DIST to the path of the extracted BV TCK.
 1. Run once:
 
+        bash ../artifact-install.sh
         ant install-testng-jar
 1. Run the TCK tests:
 

diff --git a/setup-examples/ant/artifact-install.sh → setup-examples/artifact-install.sh b/setup-examples/ant/artifact-install.sh → setup-examples/artifact-install.sh
@@ -1,17 +1,20 @@
 #!/usr/bin/env bash
 
+# Location where the Bean Validation TCK dist has been extracted
 TCK_DIST=/tmp/BV/beanvalidation-tck-dist-2.0.5
 
 # Parent pom
 mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \
 -Dfile=${TCK_DIST}/src/pom.xml -DgroupId=org.hibernate.beanvalidation.tck \
 -DartifactId=beanvalidation-tck-parent -Dversion=2.0.5 -Dpackaging=pom
 
+# Install the tests jar
 mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \
 -Dfile=${TCK_DIST}/artifacts/beanvalidation-tck-tests-2.0.5.jar -DgroupId=org.hibernate.beanvalidation.tck \
 -DartifactId=beanvalidation-tck-tests -Dversion=2.0.5 -Dpackaging=jar
 
+# Install the test-suite.xml
 mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \
 -Dfile=${TCK_DIST}/artifacts/tck-tests.xml -DgroupId=org.hibernate.beanvalidation.tck \
--DartifactId=beanvalidation-tck-tests -Dversion=2.0.5 -Dpackaging=jar -Dclassifier=suite
+-DartifactId=beanvalidation-tck-tests -Dversion=2.0.5 -Dpackaging=xml -Dclassifier=suite
 
diff --git a/setup-examples/maven/pom.xml b/setup-examples/maven/pom.xml
@@ -11,20 +11,25 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.eclipse.ee4j</groupId>
+        <artifactId>project</artifactId>
+        <version>1.0.5</version>
+    </parent>
 
     <groupId>org.hibernate.beanvalidation.tck</groupId>
     <artifactId>tck-runner</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0.5</version>
 
     <name>Example Jakarta Bean Validation TCK Runner</name>
     <description>Aggregates dependencies and runs the Jakarta Bean Validation TCK</description>
 
     <properties>
-        <tck.version>2.0.0-SNAPSHOT</tck.version>
+        <tck.version>2.0.5</tck.version>
         <tck.suite.file>${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml</tck.suite.file>
         <arquillian.version>1.1.11.Final</arquillian.version>
 
-        <container.home>/opt/java/glassfish5</container.home>
+        <container.home>/tmp/glassfish5</container.home>
 
         <validation.provider>org.hibernate.validator.HibernateValidator</validation.provider>
     </properties>
@@ -33,7 +38,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>6.8</version>
+            <version>6.9.9</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate.beanvalidation.tck</groupId>

diff --git a/setup-examples/maven/readme.md b/setup-examples/maven/readme.md
@@ -20,6 +20,12 @@ This is an example setup to run the Jakarta Bean Validation TCK 2.0 against Ecli
            <jvm-options>-Dvalidation.provider=org.hibernate.validator.HibernateValidator</jvm-options>
         </java-config>
 1. Make sure that _container.home_ in _pom.xml_ points to your <container.home> directory
+1. Extract the BV TCK distribution.
+1. Edit the setup-examples/artifact-install.sh script and set the TCK_DIST to the path of the extracted BV TCK.
+1. Run once:
+
+        bash ../artifact-install.sh
+
 1. Run the TCK tests:
 
         mvn test