diff --git a/bundles/nightly/pom.xml b/bundles/nightly/pom.xml index 05898e7f6d5..273d4445c93 100644 --- a/bundles/nightly/pom.xml +++ b/bundles/nightly/pom.xml @@ -72,7 +72,7 @@ maven-antrun-plugin - process-resources + generate-resources run @@ -113,7 +113,7 @@ generate-test-summary-html-report - package + generate-resources failsafe-report-only @@ -123,7 +123,30 @@ ${project.build.directory}/jpa-test-reports/${project.build.testReports.subdirectory} ${project.build.testReports.summaryFile} - EclipseLink JPA Test - Test Summary (more details on ${env.BUILD_URL} ) + ${project.basedir}/src/site/custom/surefire-report.properties + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + prepare-nightly-build-dir-test-reports-resources + generate-resources + + run + + + + + + + + + + @@ -134,7 +157,7 @@ prepare-nightly-build-dir-test-reports - package + generate-resources copy @@ -217,7 +240,7 @@ prepare-nightly-build-dir-binaries - package + process-resources copy @@ -273,6 +296,34 @@ + + org.apache.maven.plugins + maven-antrun-plugin + + + fix-test-reports + package + + run + + + + + + + + + + + + + + + + + + + org.codehaus.gmaven groovy-maven-plugin @@ -289,9 +340,10 @@ import javax.xml.xpath.XPathFactory import javax.xml.parsers.DocumentBuilderFactory - final NO_OF_TESTS_XPATH = "/html/body/div[@id='bodyColumn']/div/section[2]/table/tr[2]/td[1]/text()" - final NO_OF_ERRORS_XPATH = "/html/body/div[@id='bodyColumn']/div/section[2]/table/tr[2]/td[2]/text()" - final NO_OF_FAILURES_XPATH = "/html/body/div[@id='bodyColumn']/div/section[2]/table/tr[2]/td[3]/text()" + final NO_OF_TESTS_XPATH = "/html/body/div[@id='bodyColumn']/div[@id='contentBox']/section[2]/table/tr[2]/td[1]/text()" + final NO_OF_ERRORS_XPATH = "/html/body/div[@id='bodyColumn']/div[@id='contentBox']/section[2]/table/tr[2]/td[2]/text()" + final NO_OF_FAILURES_XPATH = "/html/body/div[@id='bodyColumn']/div[@id='contentBox']/section[2]/table/tr[2]/td[3]/text()" + final OUTPUT_FILE = "ResultSummary.dat" def resultSummaryFile = new File(properties["nightlyTestReportsDir"] + "/" + OUTPUT_FILE) @@ -318,18 +370,21 @@ } File[] files = reportDir.listFiles() for (File file : files) { - try { - noOfTests = processXml(file.text, NO_OF_TESTS_XPATH) - noOfNewTests = noOfTests - noOfErrors = processXml(file.text, NO_OF_ERRORS_XPATH) + - processXml(file.text, NO_OF_FAILURES_XPATH) - } catch (Exception e) { - log.warn "File: " + file.getName() + " can't be parsed. Result will be marked as a failed test!" - noOfTests = 1 - noOfNewTests = 1 - noOfErrors = 1 + if (file.isFile()) { + try { + noOfTests = processXml(file.text, NO_OF_TESTS_XPATH) + noOfNewTests = noOfTests + noOfErrors = processXml(file.text, NO_OF_ERRORS_XPATH) + processXml(file.text, NO_OF_FAILURES_XPATH) + } catch (Exception e) { + log.warn "Error cause: ${e}" + log.warn "File: " + file.getName() + " can't be parsed. Result will be marked as a failed test!" + noOfTests = 1 + noOfNewTests = 1 + noOfErrors = 1 + } + resultSummaryFile.append file. + getName() + ":" + noOfTests + ":" + noOfNewTests + ":" + noOfErrors + "\n" } - resultSummaryFile.append file.getName() + ":" + noOfTests + ":" + noOfNewTests + ":" + noOfErrors + "\n" } println resultSummaryFile.text ]]> diff --git a/bundles/nightly/src/site/custom/surefire-report.properties b/bundles/nightly/src/site/custom/surefire-report.properties new file mode 100644 index 00000000000..c8e20d4c271 --- /dev/null +++ b/bundles/nightly/src/site/custom/surefire-report.properties @@ -0,0 +1,18 @@ +# +# Copyright (c) 2023 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 +# http://www.eclipse.org/legal/epl-2.0, +# or the Eclipse Distribution License v. 1.0 which is available at +# http://www.eclipse.org/org/documents/edl-v10.php. +# +# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause +# + +report.failsafe.description=EclipseLink JPA Test - Test Summary (more details on ${env.BUILD_URL} ) +report.failsafe.name=EclipseLink JPA Test - Test Summary (more details on ${env.BUILD_URL} ) +report.failsafe.title=EclipseLink JPA Test - Test Summary (more details on ${env.BUILD_URL} ) +report.surefire.description=EclipseLink JPA Test - Test Summary (more details on ${env.BUILD_URL} ) +report.surefire.name=EclipseLink JPA Test - Test Summary (more details on ${env.BUILD_URL} ) +report.surefire.title=EclipseLink JPA Test - Test Summary (more details on ${env.BUILD_URL} ) \ No newline at end of file diff --git a/foundation/org.eclipse.persistence.oracle.nosql/pom.xml b/foundation/org.eclipse.persistence.oracle.nosql/pom.xml index 81d82650771..1f5ffb4f787 100644 --- a/foundation/org.eclipse.persistence.oracle.nosql/pom.xml +++ b/foundation/org.eclipse.persistence.oracle.nosql/pom.xml @@ -166,19 +166,6 @@ - - org.apache.maven.plugins - maven-source-plugin - - - jar-test-sources - package - - test-jar-no-fork - - - - diff --git a/foundation/org.eclipse.persistence.oracle.test/pom.xml b/foundation/org.eclipse.persistence.oracle.test/pom.xml index 274b8e3684a..d58dd9bbdcb 100644 --- a/foundation/org.eclipse.persistence.oracle.test/pom.xml +++ b/foundation/org.eclipse.persistence.oracle.test/pom.xml @@ -159,19 +159,6 @@ - - org.apache.maven.plugins - maven-source-plugin - - - jar-test-sources - package - - test-jar-no-fork - - - - org.apache.maven.plugins maven-dependency-plugin diff --git a/pom.xml b/pom.xml index 30d0e08c89d..70fd0161227 100644 --- a/pom.xml +++ b/pom.xml @@ -121,6 +121,7 @@ yyyyMMddHHmm v${maven.build.timestamp} ${project.version}.${build.qualifier} + test-report-settings/surefire-report.properties test-reports test-summary ${project.build.directory}/license @@ -151,6 +152,7 @@ ${user.home}/${test.derby.properties.file} ${test.derby.properties.file} ${project.build.directory}/test-default-properties + ${project.build.directory}/test-report-properties derby false @@ -186,27 +188,27 @@ 9.5.0 9.5 - 2.1.1 - 2.0.0 + 2.1.2 + 2.0.1 2.1.1 4.0.1 4.0.1 5.0.1 5.0.0-M1 - 7.0.1 + 7.0.6 4.0.1 - 4.0.2 + 4.0.3 4.0.0 3.0.0 - 3.1.1 + 3.1.2 3.1.0 - 2.1.1 + 2.1.2 3.1.0 - 2.1.1 - 2.0.1 + 2.1.2 + 2.0.2 3.0.1 4.2.4 - 1.1.1 + 1.1.2 2.1.0 6.0.0 2.0.1 @@ -227,20 +229,20 @@ 4.13.2 1.3 - 8.0.0.Final - 10.7.0 + 8.0.1.Final + 10.12.1 - 5.2.12.Final + 5.2.16.Final 1.36 4.13.2 - 3.12.11 - 8.0.32 - 3.1.2 + 3.12.14 + 8.0.33 + 3.1.4 12.2.0.jre11 42.5.3 - 1.4.5 + 1.4.8 23.2.0.0 23.2.0.0 @@ -248,26 +250,24 @@ 18.3.10 - 5.4.8 + 5.4.11 6.0.0 - 2.0.6 + 2.0.7 5.3.25 - 5.1.0.Final + 5.1.1.Final 12.2.1-3 27.0.0.Final 1.6.3 - 2.5.7 - 2.3.4 + 2.5.8 + 2.3.7 1.5.1 - 9.2.21.0 - - + 9.3.10.0 @@ -1076,7 +1076,7 @@ com.sun.wts.tools.ant package-rename-task - 1.5.2 + 1.6.0 de.empulse.eclipselink @@ -1086,7 +1086,7 @@ org.apache.felix maven-bundle-plugin - 5.1.8 + 5.1.9 org.apache.maven.plugins @@ -1096,12 +1096,12 @@ org.apache.maven.plugins maven-assembly-plugin - 3.4.2 + 3.6.0 org.apache.maven.plugins maven-clean-plugin - 3.2.0 + 3.3.1 org.apache.maven.plugins @@ -1111,22 +1111,22 @@ org.apache.maven.plugins maven-dependency-plugin - 3.5.0 + 3.6.0 org.apache.maven.plugins maven-deploy-plugin - 3.0.0 + 3.1.1 org.apache.maven.plugins maven-enforcer-plugin - 3.2.1 + 3.3.0 org.apache.maven.plugins maven-failsafe-plugin - 3.0.0-M8 + 3.1.2 false @@ -1135,7 +1135,7 @@ org.apache.maven.plugins maven-install-plugin - 3.1.0 + 3.1.1 org.apache.maven.plugins @@ -1145,12 +1145,12 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.5.0 org.apache.maven.plugins maven-resources-plugin - 3.3.0 + 3.3.1 gar @@ -1160,17 +1160,17 @@ org.apache.maven.plugins maven-site-plugin - 4.0.0-M4 + 4.0.0-M8 org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M8 + 3.1.2 false @@ -1179,17 +1179,17 @@ org.apache.maven.plugins maven-surefire-report-plugin - 3.0.0-M8 + 3.1.2 org.apache.maven.plugins maven-war-plugin - 3.3.2 + 3.4.0 org.codehaus.cargo cargo-maven3-plugin - 1.10.4 + 1.10.8 org.codehaus.gmaven @@ -1221,12 +1221,12 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + 3.4.0 org.codehaus.mojo buildnumber-maven-plugin - 3.0.0 + 3.2.0 org.codehaus.mojo @@ -1248,7 +1248,7 @@ org.codehaus.mojo xml-maven-plugin - 1.0.2 + 1.1.0 false @@ -1359,7 +1359,7 @@ org.asciidoctor asciidoctor-maven-plugin - 2.2.2 + 2.2.4 org.jruby @@ -1386,7 +1386,7 @@ org.wildfly.plugins wildfly-maven-plugin - 4.0.0.Final + 4.1.1.Final @@ -1446,6 +1446,7 @@ src/main/assembly/common-license.xml src/main/assembly/test-defaults.xml + src/main/assembly/test-report.xml src/main/assembly/spotbugs-filter.xml @@ -1494,6 +1495,25 @@ + + unpack-test-report-properties + initialize + + unpack + + + + + ${project.groupId} + org.eclipse.persistence.parent + ${project.version} + test-report + zip + ${test.report.properties.default.directory} + + + + unpack-spotbugs-filter initialize @@ -1769,7 +1789,7 @@ ${project.build.directory}/${project.build.testReports.subdirectory} ${project.build.testReports.summaryFile} - ${project.name} - Test Summary (more details on ${env.BUILD_URL} ) + ${test.report.properties.default.directory}/surefire-report.properties @@ -2076,7 +2096,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + 0.8.10 diff --git a/src/main/assembly/test-report.xml b/src/main/assembly/test-report.xml new file mode 100644 index 00000000000..e13d6bc87a8 --- /dev/null +++ b/src/main/assembly/test-report.xml @@ -0,0 +1,33 @@ + + + + + test-report + + zip + + false + + + ${project.basedir}/src/site/custom + . + + *.properties + + + + \ No newline at end of file diff --git a/src/site/custom/surefire-report.properties b/src/site/custom/surefire-report.properties new file mode 100644 index 00000000000..5fb99d08439 --- /dev/null +++ b/src/site/custom/surefire-report.properties @@ -0,0 +1,18 @@ +# +# Copyright (c) 2023 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 +# http://www.eclipse.org/legal/epl-2.0, +# or the Eclipse Distribution License v. 1.0 which is available at +# http://www.eclipse.org/org/documents/edl-v10.php. +# +# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause +# + +report.failsafe.description=${project.name} - Test Summary (more details on ${env.BUILD_URL} ) +report.failsafe.name=${project.name} - Test Summary (more details on ${env.BUILD_URL} ) +report.failsafe.title=${project.name} - Test Summary (more details on ${env.BUILD_URL} ) +report.surefire.description=${project.name} - Test Summary (more details on ${env.BUILD_URL} ) +report.surefire.name=${project.name} - Test Summary (more details on ${env.BUILD_URL} ) +report.surefire.title=${project.name} - Test Summary (more details on ${env.BUILD_URL} ) \ No newline at end of file