diff --git a/arquillian/appclient/pom.xml b/arquillian/appclient/pom.xml index 06427983a..524b52408 100644 --- a/arquillian/appclient/pom.xml +++ b/arquillian/appclient/pom.xml @@ -5,7 +5,7 @@ jakarta.tck tck.arquillian.parent - 1.0.0-SNAPSHOT + 1.0.0-M9 ../pom.xml diff --git a/arquillian/common/pom.xml b/arquillian/common/pom.xml index 15bcd2146..4a925e7d4 100644 --- a/arquillian/common/pom.xml +++ b/arquillian/common/pom.xml @@ -5,7 +5,7 @@ jakarta.tck tck.arquillian.parent - 1.0.0-SNAPSHOT + 1.0.0-M9 ../pom.xml diff --git a/arquillian/javatest/pom.xml b/arquillian/javatest/pom.xml index e619808d4..3cc47052c 100644 --- a/arquillian/javatest/pom.xml +++ b/arquillian/javatest/pom.xml @@ -5,7 +5,7 @@ jakarta.tck tck.arquillian.parent - 1.0.0-SNAPSHOT + 1.0.0-M9 ../pom.xml diff --git a/arquillian/pom.xml b/arquillian/pom.xml index fb194e113..9d3103e57 100644 --- a/arquillian/pom.xml +++ b/arquillian/pom.xml @@ -14,7 +14,7 @@ jakarta.tck tck.arquillian.parent - 1.0.0-SNAPSHOT + 1.0.0-M9 pom Arquillian Jakarta TCK Parent Protocols and testenrichers for Jakarta TCKs diff --git a/arquillian/porting-lib/pom.xml b/arquillian/porting-lib/pom.xml index e646909b8..bb74ce582 100644 --- a/arquillian/porting-lib/pom.xml +++ b/arquillian/porting-lib/pom.xml @@ -5,7 +5,7 @@ jakarta.tck tck.arquillian.parent - 1.0.0-SNAPSHOT + 1.0.0-M9 ../pom.xml diff --git a/arquillian/protocol-lib/pom.xml b/arquillian/protocol-lib/pom.xml index bab6e1cc7..82037d000 100644 --- a/arquillian/protocol-lib/pom.xml +++ b/arquillian/protocol-lib/pom.xml @@ -5,7 +5,7 @@ jakarta.tck tck.arquillian.parent - 1.0.0-SNAPSHOT + 1.0.0-M9 ../pom.xml diff --git a/tools/jar2shrinkwrap/pom.xml b/tools/jar2shrinkwrap/pom.xml index a4f565ed2..391c4f0ea 100644 --- a/tools/jar2shrinkwrap/pom.xml +++ b/tools/jar2shrinkwrap/pom.xml @@ -10,7 +10,7 @@ 1.0.9 - 1.0.0-SNAPSHOT + 1.0.0-M9 jakarta.tck jar2shrinkwrap diff --git a/tools/tck-rewrite-ant/pom.xml b/tools/tck-rewrite-ant/pom.xml index 1250e6cfd..324a2f47a 100644 --- a/tools/tck-rewrite-ant/pom.xml +++ b/tools/tck-rewrite-ant/pom.xml @@ -12,7 +12,7 @@ jakarta.tck tck-rewrite-ant - 1.0.0-SNAPSHOT + 1.0.0-M9 17 @@ -208,18 +208,6 @@ slf4j-jdk14 1.7.36 - - org.dom4j - dom4j - 2.1.4 - test - - - jaxen - jaxen - 1.2.0 - test - @@ -235,4 +223,24 @@ + + + + test-with-dom4j + + + org.dom4j + dom4j + 2.1.4 + test + + + jaxen + jaxen + 1.2.0 + test + + + + diff --git a/tools/tck-rewrite-ant/src/test/java/tck/conversion/CompareTestRuns.java b/tools/tck-rewrite-ant/src/test/java/tck/conversion/CompareTestRuns.java deleted file mode 100644 index ee3e4aad8..000000000 --- a/tools/tck-rewrite-ant/src/test/java/tck/conversion/CompareTestRuns.java +++ /dev/null @@ -1,93 +0,0 @@ -package tck.conversion; - -import org.dom4j.Document; -import org.dom4j.DocumentException; -import org.dom4j.Node; -import org.dom4j.io.SAXReader; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -/** - * One off program to read in the junit xml from an EE10 module test run and compare it to the output of the EE11 - * module test run. This reads in the single xml result from the glassfish ci and the multiple xml results from the - * EE11 module test run and compares them. - */ -public class CompareTestRuns { - public static void main(String[] args) throws IOException { - if (args.length != 2) { - System.out.println("Usage: CompareTestRuns "); - System.exit(1); - } - String ee10JunitXml = args[0]; - String ee11JunitXmlDir = args[1]; - System.out.println("Comparing " + ee10JunitXml + " to " + ee11JunitXmlDir); - // EE10 - try { - List ee10Testcases = parseJunitXml(ee10JunitXml); - System.out.println("Found " + ee10Testcases.size() + " testcases in " + ee10JunitXml); - /* - for (Testcase testcase : ee10Testcases) { - System.out.println(testcase); - } - */ - // Summarize test count by test package - System.out.println("--- EE10 test count by package:"); - summarizeTestCountByPackage(ee10Testcases); - } catch (DocumentException e) { - e.printStackTrace(); - } - - // EE11 - List testXmlFiles = Files.walk(Paths.get(ee11JunitXmlDir)) - .filter(Files::isRegularFile) - .filter(path -> path.toString().endsWith(".xml")) - .toList() - ; - List ee11Testcases = new ArrayList<>(); - for (Path testXmlFile : testXmlFiles) { - try { - List testcases = parseJunitXml(testXmlFile.toString()); - ee11Testcases.addAll(testcases); - } catch (DocumentException e) { - e.printStackTrace(); - } - } - System.out.println("Found " + ee11Testcases.size() + " testcases in " + ee11JunitXmlDir); - System.out.println("--- EE11 test count by package:"); - summarizeTestCountByPackage(ee11Testcases); - } - - record Testcase(String name, String classname, int time) { - } - static List parseJunitXml(String junitXml) throws DocumentException { - SAXReader reader = new SAXReader(); - Document document = reader.read(Paths.get(junitXml).toFile()); - List list = document.selectNodes("//testcase"); - return list.stream() - .map(CompareTestRuns::parseTestcase) - .toList(); - } - static Testcase parseTestcase(Node node) { - String name = node.valueOf("@name"); - String classname = node.valueOf("@classname"); - String time = node.valueOf("@time"); - int seconds = Float.valueOf(time).intValue(); - return new Testcase(name, classname, seconds); - } - static void summarizeTestCountByPackage(List ee10Testcases) { - HashMap testCountByPackage = new HashMap<>(); - for (Testcase testcase : ee10Testcases) { - String packageName = testcase.classname().substring(0, testcase.classname().lastIndexOf('.')); - testCountByPackage.put(packageName, testCountByPackage.getOrDefault(packageName, 0) + 1); - } - for(String packageName : testCountByPackage.keySet()) { - System.out.println(packageName + ": " + testCountByPackage.get(packageName)); - } - } -} diff --git a/tools/tck-rewrite/pom.xml b/tools/tck-rewrite/pom.xml index cb36db43a..51d757a7a 100644 --- a/tools/tck-rewrite/pom.xml +++ b/tools/tck-rewrite/pom.xml @@ -13,7 +13,7 @@ jakarta.tck tck-rewrite-tools - 1.0.0-SNAPSHOT + 1.0.0-M9 17