Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven-surefire for openSUSE:Factory checked in at 2024-04-10 17:50:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-surefire (Old) and /work/SRC/openSUSE:Factory/.maven-surefire.new.29460 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-surefire" Wed Apr 10 17:50:06 2024 rev:10 rq:1166656 version:3.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-surefire/maven-surefire-plugins.changes 2024-02-22 21:01:10.813007603 +0100 +++ /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-plugins.changes 2024-04-10 17:51:05.350016557 +0200 @@ -1,0 +2,100 @@ +Wed Apr 10 10:54:02 UTC 2024 - Fridrich Strba <[email protected]> + +- Upgrade to 3.2.5 + * Bug + + SUREFIRE-2223: Surefire evaluates parameter jvm before skip + + SUREFIRE-2224: StatelessXmlReporter#getTestProblems() does + not properly reflect report schema structure + + SUREFIRE-2225: Surefire ITs fail when project directory + contains space + + SUREFIRE-2229: + REGRESSION] SUREFIRE-2224 causes stack trace + to be omitted for errors and failures + + SUREFIRE-2231: JaCoCo 0.8.11 fails with old TestNG releases on + Java 17+ + * Improvement + + SUREFIRE-1345: Support flakyFailure and flakyError in + TestSuiteXmlParser + + SUREFIRE-2221: Document minimum supported Java version for + Toolchains +- Upgrade to 3.2.3 + * Bug + + SUREFIRE-2210: Additional class path ordering broken since + 3.2.0 + + SUREFIRE-2211: additionalClasspathElement with UNC path not + working with Maven Failsafe Plugin + + SUREFIRE-2212: OutOfMemoryError raised when parsing files with + huge stderr/stdout output in surefire-report-parser + + SUREFIRE-2220: + SurefireForkChannel#getForkNodeConnectionString() returns + invalid URI string if localHost resolves to IPv6 address + * Dependency upgrade + + SUREFIRE-2214: Upgrade to HtmlUnit 3.8.0 + + SUREFIRE-2215: Upgrade to Parent 41 + + SUREFIRE-2216: Upgrade plugins and components (in ITs) +- Upgrade to 3.2.2 + * Bug Fixes + + SUREFIRE-2205: Use maven-plugin-report-plugin only in plugins + modules + + SUREFIRE-2206: Downgrade plexus-xml to 3.0.0 + * Dependency updates + + SUREFIRE-2208: Bump org.codehaus.plexus:plexus-java from 1.1.2 + to 1.2.0 +- Upgrade to 3.2.1 + * New features and improvements + + SUREFIRE-1124: Support forkNumber in environment variables + + SUREFIRE-2177: Use junit-bom instead of single JUnit 5 + versions + + SUREFIRE-2179: Support adding additional Maven dependencies to + the test runtime classpath + + SUREFIRE-2178: clarify classpathDependencyExcludes + + SUREFIRE-2182: Log starter implementation on DEBUG level + * Bug Fixes + + SUREFIRE-2190: Fix module dependencies for compile only + dependencies + * Documentation updates + + Fix TestNG web site URL (#671) @sabi0 +- Upgrade to 3.1.2 + * Changes + + SUREFIRE-2166: Use ChoiceFormat to selective render percentage + and elapsed time in SurefireReportRenderer + + Simplify serialization/deserialization of elapsed time + (SUREFIRE-2164 + SUREFIRE-2167) + + SUREFIRE-2169: Potential NPE in WrappedReportEntry when + #getElapsed() is called + + MNG-6829: Replace StringUtils#isEmpty(String) and + #isNotEmpty(String) +- Upgrade to 3.1.0 + * Sub-task + + SUREFIRE-2162: Document upcoming mojo and file names change + * Bug + + SUREFIRE-2140: Cannot release Surefire on Windows + * Improvement + + SUREFIRE-2153: Replace SurefireReportGenerator with a new + SurefireReportRenderer + + SUREFIRE-2160: Replace LocalizedProperties with (Custom)I18N + approach from MPIR + * Task + + SUREFIRE-2130: Rewrite several test classes in report + plugin for upcoming Doxia 2.0.0 stack +- Upgrade to 3.0.0 + * New features and improvements + + SUREFIRE-2154: Get rid of localRepository from surefire + mojo parameter, use Resolver API + * Bug Fixes + + SUREFIRE-2119: Sanitize failIfNoSpecifiedTests prefix in + failsafe + + SUREFIRE-2143: Fix reporting of skipped parameterized test + * Documentation updates + + SUREFIRE-2156: Refresh download page +- Modifed patch: + * 0003-Port-to-TestNG-7.4.0.patch -> 0001-Port-to-TestNG-7.4.0.patch + + regenerate + * maven-surefire-bootstrap-resources.patch + + regenerate from maven build +- Removed patches: + * 0001-Maven-3.patch + * 0002-Port-to-current-doxia.patch + * 0004-Port-to-current-maven-shared-utils.patch + + not needed with this version + +------------------------------------------------------------------- maven-surefire-provider-junit5.changes: same change maven-surefire.changes: same change Old: ---- 0001-Maven-3.patch 0002-Port-to-current-doxia.patch 0003-Port-to-TestNG-7.4.0.patch 0004-Port-to-current-maven-shared-utils.patch maven-surefire-2.22.2.tar.xz New: ---- 0001-Port-to-TestNG-7.4.0.patch maven-surefire-3.2.5.tar.xz BETA DEBUG BEGIN: Old:/work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-plugins.changes-- Removed patches: /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-plugins.changes: * 0001-Maven-3.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-plugins.changes- * 0002-Port-to-current-doxia.patch -- /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-provider-junit5.changes-- Removed patches: /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-provider-junit5.changes: * 0001-Maven-3.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-provider-junit5.changes- * 0002-Port-to-current-doxia.patch -- /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire.changes-- Removed patches: /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire.changes: * 0001-Maven-3.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire.changes- * 0002-Port-to-current-doxia.patch Old:/work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-plugins.changes- * 0001-Maven-3.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-plugins.changes: * 0002-Port-to-current-doxia.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-plugins.changes- * 0004-Port-to-current-maven-shared-utils.patch -- /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-provider-junit5.changes- * 0001-Maven-3.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-provider-junit5.changes: * 0002-Port-to-current-doxia.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-provider-junit5.changes- * 0004-Port-to-current-maven-shared-utils.patch -- /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire.changes- * 0001-Maven-3.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire.changes: * 0002-Port-to-current-doxia.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire.changes- * 0004-Port-to-current-maven-shared-utils.patch Old:/work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-plugins.changes-- Modifed patch: /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-plugins.changes: * 0003-Port-to-TestNG-7.4.0.patch -> 0001-Port-to-TestNG-7.4.0.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-plugins.changes- + regenerate -- /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-provider-junit5.changes-- Modifed patch: /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-provider-junit5.changes: * 0003-Port-to-TestNG-7.4.0.patch -> 0001-Port-to-TestNG-7.4.0.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-provider-junit5.changes- + regenerate -- /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire.changes-- Modifed patch: /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire.changes: * 0003-Port-to-TestNG-7.4.0.patch -> 0001-Port-to-TestNG-7.4.0.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire.changes- + regenerate Old:/work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-plugins.changes- * 0002-Port-to-current-doxia.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-plugins.changes: * 0004-Port-to-current-maven-shared-utils.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-plugins.changes- + not needed with this version -- /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-provider-junit5.changes- * 0002-Port-to-current-doxia.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-provider-junit5.changes: * 0004-Port-to-current-maven-shared-utils.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-provider-junit5.changes- + not needed with this version -- /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire.changes- * 0002-Port-to-current-doxia.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire.changes: * 0004-Port-to-current-maven-shared-utils.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire.changes- + not needed with this version BETA DEBUG END: BETA DEBUG BEGIN: New:/work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-plugins.changes-- Modifed patch: /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-plugins.changes: * 0003-Port-to-TestNG-7.4.0.patch -> 0001-Port-to-TestNG-7.4.0.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-plugins.changes- + regenerate -- /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-provider-junit5.changes-- Modifed patch: /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-provider-junit5.changes: * 0003-Port-to-TestNG-7.4.0.patch -> 0001-Port-to-TestNG-7.4.0.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-provider-junit5.changes- + regenerate -- /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire.changes-- Modifed patch: /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire.changes: * 0003-Port-to-TestNG-7.4.0.patch -> 0001-Port-to-TestNG-7.4.0.patch /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire.changes- + regenerate BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-surefire-plugins.spec ++++++ --- /var/tmp/diff_new_pack.rekIBw/_old 2024-04-10 17:51:06.142045704 +0200 +++ /var/tmp/diff_new_pack.rekIBw/_new 2024-04-10 17:51:06.142045704 +0200 @@ -18,7 +18,7 @@ %global base_name maven-surefire Name: %{base_name}-plugins -Version: 2.22.2 +Version: 3.2.5 Release: 0 Summary: Test framework project License: Apache-2.0 AND CPL-1.0 @@ -27,31 +27,26 @@ Source0: %{base_name}-%{version}.tar.xz Source1: https://www.apache.org/licenses/LICENSE-2.0.txt Source2: https://www.eclipse.org/legal/cpl-v10.html -Patch0: 0001-Maven-3.patch -Patch1: 0002-Port-to-current-doxia.patch -Patch2: 0003-Port-to-TestNG-7.4.0.patch -Patch3: 0004-Port-to-current-maven-shared-utils.patch +Patch0: 0001-Port-to-TestNG-7.4.0.patch BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: maven-local -BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(org.apache.commons:commons-lang3) -BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) +BuildRequires: mvn(org.apache.maven.doxia:doxia-core) +BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) -BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) BuildRequires: mvn(org.apache.maven.surefire:maven-surefire-common) -BuildRequires: mvn(org.apache.maven.surefire:surefire-logger-api) BuildRequires: mvn(org.apache.maven.surefire:surefire-report-parser) +BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.codehaus.plexus:plexus-xml) BuildRequires: mvn(org.fusesource.jansi:jansi) #!BuildRequires: maven-compiler-plugin-bootstrap #!BuildRequires: maven-jar-plugin-bootstrap -#!BuildRequires: maven-javadoc-plugin-bootstrap #!BuildRequires: maven-plugin-plugin-bootstrap #!BuildRequires: maven-resources-plugin-bootstrap #!BuildRequires: maven-surefire-plugin-bootstrap @@ -107,58 +102,48 @@ cp -p %{SOURCE1} %{SOURCE2} . %patch -P 0 -p1 -%patch -P 1 -p1 -%patch -P 2 -p1 -%patch -P 3 -p1 +#patch -P 1 -p1 # Disable strict doclint sed -i /-Xdoclint:all/d pom.xml +%pom_remove_dep org.junit:junit-bom + +%pom_disable_module surefire-shadefire %pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire +# Help plugin is needed only to evaluate effective Maven settings. +# For building RPM package default settings will suffice. +%pom_remove_plugin :maven-help-plugin surefire-its + # QA plugin useful only for upstream %pom_remove_plugin -r :jacoco-maven-plugin +# Not wanted +%pom_remove_plugin -r :maven-shade-plugin + +find -name *.java -exec sed -i -e s/org.apache.maven.surefire.shared.utils/org.apache.maven.shared.utils/ -e s/org.apache.maven.surefire.shared.io/org.apache.commons.io/ -e s/org.apache.maven.surefire.shared.lang3/org.apache.commons.lang3/ -e s/org.apache.maven.surefire.shared.compress/org.apache.commons.compress/ {} \; -# Not in Fedora +# Not packaged %pom_remove_plugin -r :animal-sniffer-maven-plugin # Complains %pom_remove_plugin -r :apache-rat-plugin -%pom_remove_plugin -r :maven-enforcer-plugin # We don't need site-source %pom_remove_plugin :maven-assembly-plugin maven-surefire-plugin %pom_remove_dep -r ::::site-source -%pom_xpath_set pom:mavenVersion 3.3.3 -%pom_remove_dep :maven-project maven-surefire-report-plugin -%pom_remove_dep :maven-project maven-surefire-common -%pom_remove_dep :maven-plugin-descriptor maven-surefire-common -%pom_remove_dep :maven-toolchain maven-surefire-common - -%pom_xpath_remove -r "pom:execution[pom:id='shared-logging-generated-sources']" - -%pom_add_dep com.google.code.findbugs:jsr305 surefire-api - -%pom_remove_plugin -r :maven-shade-plugin -%pom_remove_plugin -r :build-helper-maven-plugin -find . -name dependency-reduced-pom.xml -delete - -%pom_add_dep org.apache.commons:commons-lang3::runtime maven-surefire-plugin -%pom_add_dep commons-io:commons-io::runtime maven-surefire-plugin - -%pom_xpath_inject pom:project/pom:properties " - <mavenPluginToolsVersion>3.5.2</mavenPluginToolsVersion>" - # Disable all modules besides the 3 plugins for module in \ - surefire-logger-api \ + maven-surefire-common \ surefire-api \ - surefire-shadefire \ surefire-booter \ + surefire-extensions-api \ + surefire-extensions-spi \ surefire-grouper \ + surefire-its \ + surefire-logger-api \ surefire-providers \ - maven-surefire-common \ - surefire-report-parser \ - surefire-its; do + surefire-shared-utils \ + surefire-report-parser; do %pom_disable_module ${module} done ++++++ maven-surefire-provider-junit5.spec ++++++ --- /var/tmp/diff_new_pack.rekIBw/_old 2024-04-10 17:51:06.166046587 +0200 +++ /var/tmp/diff_new_pack.rekIBw/_new 2024-04-10 17:51:06.170046735 +0200 @@ -18,7 +18,7 @@ %global base_name maven-surefire Name: %{base_name}-provider-junit5 -Version: 2.22.2 +Version: 3.2.5 Release: 0 Summary: JUnit 5 provider for Maven Surefire License: Apache-2.0 AND CPL-1.0 @@ -27,16 +27,12 @@ Source0: %{base_name}-%{version}.tar.xz Source1: https://www.apache.org/licenses/LICENSE-2.0.txt Source2: https://www.eclipse.org/legal/cpl-v10.html -Patch0: 0001-Maven-3.patch -Patch1: 0002-Port-to-current-doxia.patch -Patch2: 0003-Port-to-TestNG-7.4.0.patch -Patch3: 0004-Port-to-current-maven-shared-utils.patch +Patch0: 0001-Port-to-TestNG-7.4.0.patch BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.surefire:common-java5) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) -BuildRequires: mvn(org.apiguardian:apiguardian-api) BuildRequires: mvn(org.junit.platform:junit-platform-launcher) # PpidChecker relies on /usr/bin/ps to check process uptime Requires: procps @@ -57,47 +53,35 @@ cp -p %{SOURCE1} %{SOURCE2} . %patch -P 0 -p1 -%patch -P 1 -p1 -%patch -P 2 -p1 -%patch -P 3 -p1 +#patch -P 1 -p1 # Disable strict doclint sed -i /-Xdoclint:all/d pom.xml -%pom_disable_module surefire-shadefire - -%pom_add_dep org.apiguardian:apiguardian-api::provided surefire-providers/surefire-junit-platform +%pom_remove_dep org.junit:junit-bom +%pom_disable_module surefire-shadefire %pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire +# Help plugin is needed only to evaluate effective Maven settings. +# For building RPM package default settings will suffice. +%pom_remove_plugin :maven-help-plugin surefire-its + # QA plugin useful only for upstream %pom_remove_plugin -r :jacoco-maven-plugin +# Not wanted +%pom_remove_plugin -r :maven-shade-plugin + +find -name *.java -exec sed -i -e s/org.apache.maven.surefire.shared.utils/org.apache.maven.shared.utils/ -e s/org.apache.maven.surefire.shared.io/org.apache.commons.io/ -e s/org.apache.maven.surefire.shared.lang3/org.apache.commons.lang3/ -e s/org.apache.maven.surefire.shared.compress/org.apache.commons.compress/ {} \; -# Not in Fedora +# Not packaged %pom_remove_plugin -r :animal-sniffer-maven-plugin # Complains %pom_remove_plugin -r :apache-rat-plugin -%pom_remove_plugin -r :maven-enforcer-plugin # We don't need site-source %pom_remove_plugin :maven-assembly-plugin maven-surefire-plugin %pom_remove_dep -r ::::site-source -%pom_xpath_set pom:mavenVersion 3.3.3 -%pom_remove_dep :maven-project maven-surefire-report-plugin -%pom_remove_dep :maven-project maven-surefire-common -%pom_remove_dep :maven-plugin-descriptor maven-surefire-common -%pom_remove_dep :maven-toolchain maven-surefire-common - -%pom_xpath_remove -r "pom:execution[pom:id='shared-logging-generated-sources']" - -%pom_add_dep com.google.code.findbugs:jsr305 surefire-api - -%pom_remove_plugin -r :maven-shade-plugin -%pom_remove_plugin -r :build-helper-maven-plugin - -%pom_add_dep org.apache.commons:commons-lang3::runtime maven-surefire-plugin -%pom_add_dep commons-io:commons-io::runtime maven-surefire-plugin - %build pushd surefire-providers/surefire-junit-platform %{mvn_build} -f -- \ ++++++ maven-surefire.spec ++++++ --- /var/tmp/diff_new_pack.rekIBw/_old 2024-04-10 17:51:06.194047618 +0200 +++ /var/tmp/diff_new_pack.rekIBw/_new 2024-04-10 17:51:06.194047618 +0200 @@ -17,7 +17,7 @@ Name: maven-surefire -Version: 2.22.2 +Version: 3.2.5 Release: 0 Summary: Test framework project License: Apache-2.0 AND CPL-1.0 @@ -27,18 +27,21 @@ Source1: https://www.apache.org/licenses/LICENSE-2.0.txt Source2: https://www.eclipse.org/legal/cpl-v10.html Source10: %{name}-build.tar.xz -Patch0: 0001-Maven-3.patch -Patch1: 0002-Port-to-current-doxia.patch -Patch2: 0003-Port-to-TestNG-7.4.0.patch -Patch3: 0004-Port-to-current-maven-shared-utils.patch +Patch0: 0001-Port-to-TestNG-7.4.0.patch Patch10: %{name}-bootstrap-resources.patch BuildRequires: ant +BuildRequires: apache-commons-cli +BuildRequires: apache-commons-compress BuildRequires: apache-commons-io BuildRequires: apache-commons-lang3 +BuildRequires: atinject BuildRequires: fdupes +BuildRequires: google-guice +BuildRequires: guava BuildRequires: java-devel >= 1.8 BuildRequires: javacc BuildRequires: javapackages-local +BuildRequires: jdom BuildRequires: jsr-305 BuildRequires: junit BuildRequires: maven-common-artifact-filters @@ -50,9 +53,19 @@ BuildRequires: maven-plugin-annotations BuildRequires: maven-reporting-api BuildRequires: maven-reporting-impl +BuildRequires: maven-resolver BuildRequires: maven-shared-utils BuildRequires: objectweb-asm +BuildRequires: plexus-classworlds +BuildRequires: plexus-cli +BuildRequires: plexus-i18n +BuildRequires: plexus-interpolation BuildRequires: plexus-languages +BuildRequires: plexus-metadata-generator +BuildRequires: plexus-utils +BuildRequires: plexus-xml +BuildRequires: qdox +BuildRequires: sisu-inject BuildRequires: sisu-plexus BuildRequires: testng BuildRequires: xmvn-install @@ -133,48 +146,36 @@ cp -p %{SOURCE1} %{SOURCE2} . %patch -P 0 -p1 -%patch -P 1 -p1 -%patch -P 2 -p1 -%patch -P 3 -p1 +#patch -P 1 -p1 %patch -P 10 -p1 # Disable strict doclint sed -i /-Xdoclint:all/d pom.xml -%pom_disable_module surefire-shadefire - -%pom_disable_module surefire-junit-platform surefire-providers +%pom_remove_dep org.junit:junit-bom +%pom_disable_module surefire-shadefire %pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire +# Help plugin is needed only to evaluate effective Maven settings. +# For building RPM package default settings will suffice. +%pom_remove_plugin :maven-help-plugin surefire-its + # QA plugin useful only for upstream %pom_remove_plugin -r :jacoco-maven-plugin +# Not wanted +%pom_remove_plugin -r :maven-shade-plugin + +find -name *.java -exec sed -i -e s/org.apache.maven.surefire.shared.utils/org.apache.maven.shared.utils/ -e s/org.apache.maven.surefire.shared.io/org.apache.commons.io/ -e s/org.apache.maven.surefire.shared.lang3/org.apache.commons.lang3/ -e s/org.apache.maven.surefire.shared.compress/org.apache.commons.compress/ {} \; -# Not in Fedora +# Not packaged %pom_remove_plugin -r :animal-sniffer-maven-plugin # Complains %pom_remove_plugin -r :apache-rat-plugin -%pom_remove_plugin -r :maven-enforcer-plugin # We don't need site-source %pom_remove_plugin :maven-assembly-plugin maven-surefire-plugin %pom_remove_dep -r ::::site-source -%pom_xpath_set pom:mavenVersion 3.3.3 -%pom_remove_dep :maven-project maven-surefire-report-plugin -%pom_remove_dep :maven-project maven-surefire-common -%pom_remove_dep :maven-plugin-descriptor maven-surefire-common -%pom_remove_dep :maven-toolchain maven-surefire-common - -%pom_xpath_remove -r "pom:execution[pom:id='shared-logging-generated-sources']" - -%pom_add_dep com.google.code.findbugs:jsr305 surefire-api - -%pom_remove_plugin -r :maven-shade-plugin -%pom_remove_plugin -r :build-helper-maven-plugin - -%pom_add_dep org.apache.commons:commons-lang3::runtime maven-surefire-plugin -%pom_add_dep commons-io:commons-io::runtime maven-surefire-plugin - %build %{mvn_package} ":*tests*" __noinstall %{mvn_package} ":{surefire,surefire-providers}" __noinstall @@ -184,9 +185,15 @@ mkdir -p lib build-jar-repository -s -p lib \ + atinject \ apache-commons-lang3 \ + commons-cli \ + commons-compress \ commons-io \ + guava/guava \ + guice/google-guice \ javacc \ + jdom2/jdom2 \ jsr-305 \ junit \ maven-common-artifact-filters/maven-common-artifact-filters \ @@ -199,13 +206,26 @@ maven/maven-core \ maven/maven-model \ maven/maven-plugin-api \ + maven/maven-settings \ maven-plugin-tools/maven-plugin-annotations \ maven-reporting-api/maven-reporting-api \ maven-reporting-impl/maven-reporting-impl \ + maven-resolver/maven-resolver-api \ + maven-resolver/maven-resolver-util \ maven-shared-utils/maven-shared-utils \ objectweb-asm/asm \ org.eclipse.sisu.plexus \ + org.eclipse.sisu.inject \ + plexus-classworlds \ + plexus/cli \ + plexus-containers/plexus-component-annotations \ + plexus-i18n/plexus-i18n \ + plexus/interpolation \ plexus-languages/plexus-java \ + plexus-metadata-generator \ + plexus/utils \ + plexus/xml \ + qdox \ testng %{ant} \ @@ -222,6 +242,9 @@ surefire-api \ surefire-booter \ surefire-grouper \ + surefire-extensions-api \ + surefire-extensions-spi \ + surefire-shared-utils \ maven-surefire-common \ surefire-report-parser \ maven-surefire-plugin \ ++++++ 0003-Port-to-TestNG-7.4.0.patch -> 0001-Port-to-TestNG-7.4.0.patch ++++++ --- /work/SRC/openSUSE:Factory/maven-surefire/0003-Port-to-TestNG-7.4.0.patch 2022-04-28 23:07:42.680670710 +0200 +++ /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/0001-Port-to-TestNG-7.4.0.patch 2024-04-10 17:51:05.282014055 +0200 @@ -1,34 +1,66 @@ +From 2506b32ba90ef0e336f088e7aa8c12d3273ba242 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski <[email protected]> +Date: Mon, 10 Jul 2017 10:37:50 +0200 +Subject: [PATCH 1/4] Port to TestNG 7.4.0 + +--- + pom.xml | 2 +- + surefire-providers/surefire-testng/pom.xml | 1 - + .../maven/surefire/testng/conf/AbstractDirectConfigurator.java | 2 +- + .../maven/surefire/testng/conf/TestNGMapConfigurator.java | 2 +- + 4 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/pom.xml b/pom.xml +index cb15de8f7..2f9a061e7 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -97,7 +97,7 @@ + <mavenSharedUtilsVersion>3.3.4</mavenSharedUtilsVersion> + <powermockVersion>2.0.9</powermockVersion> + <jacocoVersion>0.8.11</jacocoVersion> +- <testngVersion>5.11</testngVersion> ++ <testngVersion>7.4.0</testngVersion> + <surefire-shared-utils.version>${project.version}</surefire-shared-utils.version> + <maven.surefire.scm.devConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-surefire.git</maven.surefire.scm.devConnection> + <maven.site.path>surefire-archives/surefire-LATEST</maven.site.path> +diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml +index c7633d60c..00f22400c 100644 --- a/surefire-providers/surefire-testng/pom.xml +++ b/surefire-providers/surefire-testng/pom.xml -@@ -51,8 +51,7 @@ - <dependency> +@@ -56,7 +56,6 @@ <groupId>org.testng</groupId> <artifactId>testng</artifactId> -- <version>5.10</version> + <version>${testngVersion}</version> - <classifier>jdk15</classifier> -+ <version>7.4.0</version> <scope>provided</scope> </dependency> - </dependencies> + <dependency> +diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java +index b73b9bacd..ab187b6d5 100644 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java -@@ -63,7 +63,7 @@ public void configure( TestNG testng, Map<String, String> options ) - testng.setUseDefaultListeners( false ); - configureInstance( testng, options ); +@@ -57,7 +57,7 @@ public void configure(TestNG testng, Map<String, String> options) throws TestSet + testng.setUseDefaultListeners(false); + configureInstance(testng, options); // TODO: we should have the Profile so that we can decide if this is needed or not -- testng.setListenerClasses( loadListenerClasses( listeners ) ); -+ testng.setListenerClasses( ( List ) loadListenerClasses( listeners ) ); +- testng.setListenerClasses(loadListenerClasses(listeners)); ++ testng.setListenerClasses((List)loadListenerClasses(listeners)); } @Override +diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java +index d91e76afc..06dbd2316 100755 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java -@@ -68,7 +68,7 @@ public void configure( XmlSuite suite, Map<String, String> options ) - String parallel = options.get( PARALLEL_PROP ); - if ( parallel != null ) - { -- suite.setParallel( parallel ); -+ suite.setParallel( XmlSuite.ParallelMode.getValidParallel( parallel ) ); +@@ -71,7 +71,7 @@ protected void configureThreadCount(XmlSuite suite, Map<String, String> options) + protected void configureParallel(XmlSuite suite, Map<String, String> options) throws TestSetFailedException { + String parallel = options.get(PARALLEL_PROP); + if (parallel != null) { +- suite.setParallel(parallel); ++ suite.setParallel(XmlSuite.ParallelMode.getValidParallel(parallel)); } } +-- +2.44.0 + ++++++ _service ++++++ --- /var/tmp/diff_new_pack.rekIBw/_old 2024-04-10 17:51:06.254049826 +0200 +++ /var/tmp/diff_new_pack.rekIBw/_new 2024-04-10 17:51:06.258049973 +0200 @@ -2,7 +2,7 @@ <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/apache/maven-surefire.git</param> - <param name="revision">surefire-2.22.2</param> + <param name="revision">surefire-3.2.5</param> <param name="match-tag">surefire-*</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">surefire-(.*)</param> ++++++ maven-surefire-2.22.2.tar.xz -> maven-surefire-3.2.5.tar.xz ++++++ ++++ 196559 lines of diff (skipped) ++++++ maven-surefire-bootstrap-resources.patch ++++++ ++++ 7186 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/maven-surefire/maven-surefire-bootstrap-resources.patch ++++ and /work/SRC/openSUSE:Factory/.maven-surefire.new.29460/maven-surefire-bootstrap-resources.patch ++++++ maven-surefire-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build.xml new/build.xml --- old/build.xml 2019-04-02 08:36:24.264610250 +0200 +++ new/build.xml 2024-04-08 14:58:25.325015242 +0200 @@ -7,8 +7,11 @@ <!-- ====================================================================== --> <target name="clean" description="Clean the output directory"> + <ant antfile="build.xml" dir="surefire-shared-utils" target="clean"/> <ant antfile="build.xml" dir="surefire-logger-api" target="clean"/> <ant antfile="build.xml" dir="surefire-api" target="clean"/> + <ant antfile="build.xml" dir="surefire-extensions-api" target="clean"/> + <ant antfile="build.xml" dir="surefire-extensions-spi" target="clean"/> <ant antfile="build.xml" dir="surefire-booter" target="clean"/> <ant antfile="build.xml" dir="surefire-grouper" target="clean"/> <ant antfile="build.xml" dir="surefire-providers" target="clean"/> @@ -17,6 +20,7 @@ <ant antfile="build.xml" dir="maven-surefire-plugin" target="clean"/> <ant antfile="build.xml" dir="maven-failsafe-plugin" target="clean"/> <ant antfile="build.xml" dir="maven-surefire-report-plugin" target="clean"/> + <ant antfile="build.xml" dir="surefire-its" target="clean"/> </target> <!-- ====================================================================== --> @@ -24,8 +28,11 @@ <!-- ====================================================================== --> <target name="compile" description="Compile the code"> + <ant antfile="build.xml" dir="surefire-shared-utils" target="compile"/> <ant antfile="build.xml" dir="surefire-logger-api" target="compile"/> <ant antfile="build.xml" dir="surefire-api" target="compile"/> + <ant antfile="build.xml" dir="surefire-extensions-api" target="compile"/> + <ant antfile="build.xml" dir="surefire-extensions-spi" target="compile"/> <ant antfile="build.xml" dir="surefire-booter" target="compile"/> <ant antfile="build.xml" dir="surefire-grouper" target="compile"/> <ant antfile="build.xml" dir="surefire-providers" target="compile"/> @@ -34,6 +41,7 @@ <ant antfile="build.xml" dir="maven-surefire-plugin" target="compile"/> <ant antfile="build.xml" dir="maven-failsafe-plugin" target="compile"/> <ant antfile="build.xml" dir="maven-surefire-report-plugin" target="compile"/> + <ant antfile="build.xml" dir="surefire-its" target="compile"/> </target> <!-- ====================================================================== --> @@ -41,8 +49,11 @@ <!-- ====================================================================== --> <target name="compile-tests" description="Compile the test code"> + <ant antfile="build.xml" dir="surefire-shared-utils" target="compile-tests"/> <ant antfile="build.xml" dir="surefire-logger-api" target="compile-tests"/> <ant antfile="build.xml" dir="surefire-api" target="compile-tests"/> + <ant antfile="build.xml" dir="surefire-extensions-api" target="compile-tests"/> + <ant antfile="build.xml" dir="surefire-extensions-spi" target="compile-tests"/> <ant antfile="build.xml" dir="surefire-booter" target="compile-tests"/> <ant antfile="build.xml" dir="surefire-grouper" target="compile-tests"/> <ant antfile="build.xml" dir="surefire-providers" target="compile-tests"/> @@ -51,6 +62,7 @@ <ant antfile="build.xml" dir="maven-surefire-plugin" target="compile-tests"/> <ant antfile="build.xml" dir="maven-failsafe-plugin" target="compile-tests"/> <ant antfile="build.xml" dir="maven-surefire-report-plugin" target="compile-tests"/> + <ant antfile="build.xml" dir="surefire-its" target="compile-tests"/> </target> <!-- ====================================================================== --> @@ -58,8 +70,11 @@ <!-- ====================================================================== --> <target name="test" description="Run the test cases"> + <ant antfile="build.xml" dir="surefire-shared-utils" target="test"/> <ant antfile="build.xml" dir="surefire-logger-api" target="test"/> <ant antfile="build.xml" dir="surefire-api" target="test"/> + <ant antfile="build.xml" dir="surefire-extensions-api" target="test"/> + <ant antfile="build.xml" dir="surefire-extensions-spi" target="test"/> <ant antfile="build.xml" dir="surefire-booter" target="test"/> <ant antfile="build.xml" dir="surefire-grouper" target="test"/> <ant antfile="build.xml" dir="surefire-providers" target="test"/> @@ -68,6 +83,7 @@ <ant antfile="build.xml" dir="maven-surefire-plugin" target="test"/> <ant antfile="build.xml" dir="maven-failsafe-plugin" target="test"/> <ant antfile="build.xml" dir="maven-surefire-report-plugin" target="test"/> + <ant antfile="build.xml" dir="surefire-its" target="test"/> </target> <!-- ====================================================================== --> @@ -75,8 +91,11 @@ <!-- ====================================================================== --> <target name="javadoc" description="Generates the Javadoc of the application"> + <ant antfile="build.xml" dir="surefire-shared-utils" target="javadoc"/> <ant antfile="build.xml" dir="surefire-logger-api" target="javadoc"/> <ant antfile="build.xml" dir="surefire-api" target="javadoc"/> + <ant antfile="build.xml" dir="surefire-extensions-api" target="javadoc"/> + <ant antfile="build.xml" dir="surefire-extensions-spi" target="javadoc"/> <ant antfile="build.xml" dir="surefire-booter" target="javadoc"/> <ant antfile="build.xml" dir="surefire-grouper" target="javadoc"/> <ant antfile="build.xml" dir="surefire-providers" target="javadoc"/> @@ -85,6 +104,7 @@ <ant antfile="build.xml" dir="maven-surefire-plugin" target="javadoc"/> <ant antfile="build.xml" dir="maven-failsafe-plugin" target="javadoc"/> <ant antfile="build.xml" dir="maven-surefire-report-plugin" target="javadoc"/> + <ant antfile="build.xml" dir="surefire-its" target="javadoc"/> </target> <!-- ====================================================================== --> @@ -92,8 +112,11 @@ <!-- ====================================================================== --> <target name="package" description="Package the application"> + <ant antfile="build.xml" dir="surefire-shared-utils" target="package"/> <ant antfile="build.xml" dir="surefire-logger-api" target="package"/> <ant antfile="build.xml" dir="surefire-api" target="package"/> + <ant antfile="build.xml" dir="surefire-extensions-api" target="package"/> + <ant antfile="build.xml" dir="surefire-extensions-spi" target="package"/> <ant antfile="build.xml" dir="surefire-booter" target="package"/> <ant antfile="build.xml" dir="surefire-grouper" target="package"/> <ant antfile="build.xml" dir="surefire-providers" target="package"/> @@ -102,6 +125,7 @@ <ant antfile="build.xml" dir="maven-surefire-plugin" target="package"/> <ant antfile="build.xml" dir="maven-failsafe-plugin" target="package"/> <ant antfile="build.xml" dir="maven-surefire-report-plugin" target="package"/> + <ant antfile="build.xml" dir="surefire-its" target="package"/> </target> </project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2024-02-21 16:32:42.437614926 +0100 +++ new/common.xml 2024-04-08 12:24:59.691251350 +0200 @@ -3,15 +3,16 @@ <project name="common" basedir="."> <property file="build.properties"/> - <property name="project.version" value="2.22.2"/> + <property name="project.version" value="3.2.5"/> <property name="project.groupId" value="org.apache.maven.surefire"/> <property name="project.url" value="https://maven.apache.org/surefire/"/> <property name="project.organization.name" value="The Apache Software Foundation"/> - <property name="spec.version" value="2.22"/> + <property name="spec.version" value="3.2"/> - <property name="compiler.source" value="1.8"/> + <property name="compiler.release" value="8"/> + <property name="compiler.source" value="1.${compiler.release}"/> <property name="compiler.target" value="${compiler.source}"/> </project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-failsafe-plugin/build.xml new/maven-failsafe-plugin/build.xml --- old/maven-failsafe-plugin/build.xml 2019-04-02 13:23:32.203868392 +0200 +++ new/maven-failsafe-plugin/build.xml 2024-04-08 15:58:41.948262634 +0200 @@ -37,6 +37,7 @@ <pathelement location="../surefire-api/target/classes"/> <pathelement location="../surefire-logger-api/target/classes"/> <pathelement location="../surefire-booter/target/classes"/> + <pathelement location="../surefire-extensions-api/target/classes"/> <fileset dir="../lib"> <include name="**/*.jar"/> </fileset> @@ -46,6 +47,7 @@ <pathelement location="../surefire-api/target/classes"/> <pathelement location="../surefire-logger-api/target/classes"/> <pathelement location="../surefire-booter/target/classes"/> + <pathelement location="../surefire-extensions-api/target/classes"/> <fileset dir="../lib"> <include name="**/*.jar"/> </fileset> @@ -71,6 +73,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -104,6 +107,34 @@ </target> <!-- ====================================================================== --> + <!-- Target to generate Plexus component.xml --> + <!-- ====================================================================== --> + + <target name="plexus" + depends="compile" + description="Generate Plexus component.xml"> + <mkdir dir="${build.outputDir}/META-INF/plexus"/> + <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" + failonerror="true" + fork="true"> + <!-- <jvmarg value="-verbose"/> --> + <classpath> + <path refid="build.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + <arg value="-X"/> + <arg value="-s"/> + <arg value="${build.srcDir}"/> + <arg value="-c"/> + <arg value="${build.outputDir}"/> + <arg value="-m"/> + <arg value="${build.outputDir}/META-INF/plexus"/> + <arg value="-o"/> + <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> + </java> + </target> + + <!-- ====================================================================== --> <!-- Test-compilation target --> <!-- ====================================================================== --> @@ -118,6 +149,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -229,7 +261,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile,test" description="Package the application"> + <target name="package" depends="plexus,test" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-surefire-common/build.xml new/maven-surefire-common/build.xml --- old/maven-surefire-common/build.xml 2019-04-02 10:28:18.098196803 +0200 +++ new/maven-surefire-common/build.xml 2024-04-08 15:58:26.754817410 +0200 @@ -30,7 +30,9 @@ <path id="build.classpath"> <pathelement location="../surefire-api/target/classes"/> <pathelement location="../surefire-logger-api/target/classes"/> + <pathelement location="../surefire-extensions-api/target/classes"/> <pathelement location="../surefire-booter/target/classes"/> + <pathelement location="../surefire-extensions-spi/target/classes"/> <fileset dir="../lib"> <include name="**/*.jar"/> </fileset> @@ -38,7 +40,9 @@ <path id="build.test.classpath"> <pathelement location="../surefire-api/target/classes"/> <pathelement location="../surefire-logger-api/target/classes"/> + <pathelement location="../surefire-extensions-api/target/classes"/> <pathelement location="../surefire-booter/target/classes"/> + <pathelement location="../surefire-extensions-spi/target/classes"/> <fileset dir="../lib"> <include name="**/*.jar"/> </fileset> @@ -64,6 +68,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -76,6 +81,77 @@ </target> <!-- ====================================================================== --> + <!-- Target to generate Plexus component.xml --> + <!-- ====================================================================== --> + + <target name="plexus" + depends="compile" + description="Generate Plexus component.xml"> + <mkdir dir="${build.outputDir}/META-INF/plexus"/> + <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" + failonerror="true" + fork="true"> + <!-- <jvmarg value="-verbose"/> --> + <classpath> + <path refid="build.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + <arg value="-X"/> + <arg value="-s"/> + <arg value="${build.srcDir}"/> + <arg value="-c"/> + <arg value="${build.outputDir}"/> + <arg value="-m"/> + <arg value="${build.outputDir}/META-INF/plexus"/> + <arg value="-o"/> + <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> + </java> + </target> + + <!-- ====================================================================== --> + <!-- Sisu javax.inject.Named generation targets --> + <!-- ====================================================================== --> + + <target name="sisu" + depends="compile" + description="Generate javax.inject.Name index"> + <sequential> + <java classname="org.eclipse.sisu.space.SisuIndex" + failonerror="true" + fork="true"> + <classpath> + <path refid="build.classpath"/> + </classpath> + <arg value="${build.outputDir}"/> + </java> + <move todir="${build.outputDir}/META-INF"> + <fileset dir="META-INF"/> + </move> + </sequential> + </target> + + <target name="sisu-tests" + depends="compile-tests" + description="Generate javax.inject.Named index" + unless="test.skip"> + <sequential> + <java classname="org.eclipse.sisu.space.SisuIndex" + failonerror="true" + fork="true"> + <classpath> + <path refid="build.test.classpath"/> + <pathelement location="${build.outputDir}"/> + <pathelement location="${build.testOutputDir}"/> + </classpath> + <arg value="${build.testOutputDir}"/> + </java> + </sequential> + <move todir="${build.testOutputDir}/META-INF"> + <fileset dir="META-INF"/> + </move> + </target> + + <!-- ====================================================================== --> <!-- Test-compilation target --> <!-- ====================================================================== --> @@ -90,6 +166,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -112,7 +189,7 @@ <!-- ====================================================================== --> <target name="test" - depends="compile-tests, junit-missing" + depends="sisu-tests, junit-missing" unless="junit.skipped" description="Run the test cases"> <mkdir dir="${test.reports}"/> @@ -201,7 +278,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile,test" description="Package the application"> + <target name="package" depends="sisu,plexus,test" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-surefire-plugin/build.xml new/maven-surefire-plugin/build.xml --- old/maven-surefire-plugin/build.xml 2019-04-02 13:23:39.971907966 +0200 +++ new/maven-surefire-plugin/build.xml 2024-04-08 15:58:12.764714373 +0200 @@ -37,6 +37,7 @@ <pathelement location="../surefire-api/target/classes"/> <pathelement location="../surefire-logger-api/target/classes"/> <pathelement location="../surefire-booter/target/classes"/> + <pathelement location="../surefire-extensions-api/target/classes"/> <fileset dir="../lib"> <include name="**/*.jar"/> </fileset> @@ -46,6 +47,7 @@ <pathelement location="../surefire-api/target/classes"/> <pathelement location="../surefire-logger-api/target/classes"/> <pathelement location="../surefire-booter/target/classes"/> + <pathelement location="../surefire-extensions-api/target/classes"/> <fileset dir="../lib"> <include name="**/*.jar"/> </fileset> @@ -71,6 +73,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -118,6 +121,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-surefire-report-plugin/build.xml new/maven-surefire-report-plugin/build.xml --- old/maven-surefire-report-plugin/build.xml 2019-04-02 13:23:48.291950352 +0200 +++ new/maven-surefire-report-plugin/build.xml 2024-04-08 15:57:59.531283591 +0200 @@ -68,6 +68,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -104,6 +105,34 @@ </target> <!-- ====================================================================== --> + <!-- Target to generate Plexus component.xml --> + <!-- ====================================================================== --> + + <target name="plexus" + depends="compile" + description="Generate Plexus component.xml"> + <mkdir dir="${build.outputDir}/META-INF/plexus"/> + <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" + failonerror="true" + fork="true"> + <!-- <jvmarg value="-verbose"/> --> + <classpath> + <path refid="build.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + <arg value="-X"/> + <arg value="-s"/> + <arg value="${build.srcDir}"/> + <arg value="-c"/> + <arg value="${build.outputDir}"/> + <arg value="-m"/> + <arg value="${build.outputDir}/META-INF/plexus"/> + <arg value="-o"/> + <arg value="${build.outputDir}/META-INF/plexus/components.xml"/> + </java> + </target> + + <!-- ====================================================================== --> <!-- Test-compilation target --> <!-- ====================================================================== --> @@ -118,6 +147,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -231,7 +261,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile,test" description="Package the application"> + <target name="package" depends="plexus,test" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/surefire-api/build.xml new/surefire-api/build.xml --- old/surefire-api/build.xml 2019-04-02 10:28:18.098196803 +0200 +++ new/surefire-api/build.xml 2024-04-08 15:57:39.524469597 +0200 @@ -16,10 +16,8 @@ <property name="build.dir" value="target"/> <property name="build.outputDir" value="${build.dir}/classes"/> <property name="build.srcDir" value="src/main/java"/> - <property name="build.resourceDir" value="src/main/resources"/> <property name="build.testOutputDir" value="${build.dir}/test-classes"/> <property name="build.testDir" value="src/test/java"/> - <property name="build.testResourceDir" value="src/test/resources"/> <property name="test.reports" value="${build.dir}/test-reports"/> <property name="reporting.outputDirectory" value="${build.dir}/site"/> @@ -60,6 +58,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -69,9 +68,6 @@ </src> <classpath refid="build.classpath"/> </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> </target> <!-- ====================================================================== --> @@ -89,6 +85,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/surefire-booter/build.xml new/surefire-booter/build.xml --- old/surefire-booter/build.xml 2019-04-02 10:28:18.098196803 +0200 +++ new/surefire-booter/build.xml 2024-04-08 15:57:26.994377337 +0200 @@ -30,6 +30,8 @@ <path id="build.classpath"> <pathelement location="../surefire-api/target/classes"/> <pathelement location="../surefire-logger-api/target/classes"/> + <pathelement location="../surefire-shared-utils/target/classes"/> + <pathelement location="../surefire-extensions-spi/target/classes"/> <fileset dir="../lib"> <include name="**/*.jar"/> </fileset> @@ -37,6 +39,8 @@ <path id="build.test.classpath"> <pathelement location="../surefire-api/target/classes"/> <pathelement location="../surefire-logger-api/target/classes"/> + <pathelement location="../surefire-shared-utils/target/classes"/> + <pathelement location="../surefire-extensions-spi/target/classes"/> <fileset dir="../lib"> <include name="**/*.jar"/> </fileset> @@ -62,6 +66,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -88,6 +93,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/surefire-extensions-api/build.xml new/surefire-extensions-api/build.xml --- old/surefire-extensions-api/build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/surefire-extensions-api/build.xml 2024-04-08 15:57:15.724294343 +0200 @@ -0,0 +1,232 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="surefire-extensions-api" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <property file="build.properties"/> + <include file="../common.xml"/> + + <property name="project.artifactId" value="surefire-extensions-api"/> + <property name="project.name" value="Surefire Extensions API"/> + + <property name="build.finalName" value="${project.artifactId}-${project.version}"/> + <property name="build.dir" value="target"/> + <property name="build.outputDir" value="${build.dir}/classes"/> + <property name="build.srcDir" value="src/main/java"/> + <property name="build.resourceDir" value="src/main/resources"/> + <property name="build.testOutputDir" value="${build.dir}/test-classes"/> + <property name="build.testDir" value="src/test/java"/> + <property name="build.testResourceDir" value="src/test/resources"/> + <property name="test.reports" value="${build.dir}/test-reports"/> + <property name="reporting.outputDirectory" value="${build.dir}/site"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"> + <pathelement location="../surefire-api/target/classes"/> + <pathelement location="../surefire-logger-api/target/classes"/> + <pathelement location="../surefire-shared-utils/target/classes"/> + <fileset dir="../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + <path id="build.test.classpath"> + <pathelement location="../surefire-api/target/classes"/> + <pathelement location="../surefire-logger-api/target/classes"/> + <pathelement location="../surefire-shared-utils/target/classes"/> + <fileset dir="../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${build.dir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> + <mkdir dir="${build.outputDir}"/> + <javac destdir="${build.outputDir}" + encoding="UTF-8" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + release="${compiler.release}" + target="${compiler.target}" + verbose="false" + fork="true" + source="${compiler.source}"> + <src> + <pathelement location="${build.srcDir}"/> + </src> + <classpath refid="build.classpath"/> + </javac> + </target> + + <!-- ====================================================================== --> + <!-- Test-compilation target --> + <!-- ====================================================================== --> + + <target name="compile-tests" + depends="compile" + description="Compile the test code" + unless="test.skip"> + <mkdir dir="${build.testOutputDir}"/> + <javac destdir="${build.testOutputDir}" + encoding="UTF-8" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + release="${compiler.release}" + target="${compiler.target}" + verbose="false" + fork="true" + source="${cpmpiler.source}"> + <src> + <pathelement location="${build.testDir}"/> + </src> + <classpath> + <path refid="build.test.classpath"/> + <pathelement location="${build.outputDir}"/> + </classpath> + </javac> + </target> + + <!-- ====================================================================== --> + <!-- Run all tests --> + <!-- ====================================================================== --> + + <target name="test" + depends="compile-tests, junit-missing" + unless="junit.skipped" + description="Run the test cases"> + <mkdir dir="${test.reports}"/> + <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> + <sysproperty key="basedir" value="."/> + <formatter type="xml"/> + <formatter type="plain" usefile="false"/> + <classpath> + <path refid="build.test.classpath"/> + <pathelement location="${build.outputDir}"/> + <pathelement location="${build.testOutputDir}"/> + </classpath> + <batchtest todir="${test.reports}" unless="test"> + <fileset dir="${build.testDir}"> + <include name="**/JUnit4SuiteTest.java"/> + <exclude name="**/*Abstract*Test.java"/> + </fileset> + </batchtest> + <batchtest todir="${test.reports}" if="test"> + <fileset dir="${build.testDir}"> + <include name="**/${test}.java"/> + <exclude name="**/*Abstract*Test.java"/> + </fileset> + </batchtest> + </junit> + </target> + + <target name="test-junit-present"> + <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> + </target> + + <target name="test-junit-status" + depends="test-junit-present"> + <condition property="junit.missing"> + <and> + <isfalse value="${junit.present}"/> + <isfalse value="${test.skip}"/> + </and> + </condition> + <condition property="junit.skipped"> + <or> + <isfalse value="${junit.present}"/> + <istrue value="${test.skip}"/> + </or> + </condition> + </target> + + <target name="junit-missing" + depends="test-junit-status" + if="junit.missing"> + <echo>=================================== WARNING ===================================</echo> + <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> + <echo>===============================================================================</echo> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${build.srcDir}" + packagenames="*" + destdir="${reporting.outputDirectory}/apidocs" + access="protected" + source="${compiler.source}" + verbose="false" + locale="en" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + charset="ISO-8859-1" + linksource="false" + breakiterator="false"> + <classpath refid="build.classpath"/> + </javadoc> + </target> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="compile,test" description="Package the application"> + <jar jarfile="${build.dir}/${build.finalName}.jar" + compress="true" + index="false" + basedir="${build.outputDir}" + excludes="**/package.html"> + <manifest> + <attribute name="Implementation-Title" value="${project.name}"/> + <attribute name="Implementation-URL" value="${project.url}${project.artifactId}/"/> + <attribute name="Implementation-Vendor" value="${project.organization.name}"/> + <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/> + <attribute name="Implementation-Version" value="${project.version}"/> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + <attribute name="Specification-Title" value="${project.name}"/> + <attribute name="Specification-Vendor" value="${project.organization.name}"/> + <attribute name="Specification-Version" value="${spec.version}"/> + </manifest> + </jar> + </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + +</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/surefire-extensions-spi/build.xml new/surefire-extensions-spi/build.xml --- old/surefire-extensions-spi/build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/surefire-extensions-spi/build.xml 2024-04-08 15:57:00.387514731 +0200 @@ -0,0 +1,189 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="surefire-extensions-spi" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <property file="build.properties"/> + <include file="../common.xml"/> + + <property name="project.artifactId" value="surefire-extensions-spi"/> + <property name="project.name" value="Surefire Extensions SPI"/> + + <property name="build.finalName" value="${project.artifactId}-${project.version}"/> + <property name="build.dir" value="target"/> + <property name="build.outputDir" value="${build.dir}/classes"/> + <property name="build.srcDir" value="src/main/java"/> + <property name="build.resourceDir" value="src/main/resources"/> + <property name="build.testOutputDir" value="${build.dir}/test-classes"/> + <property name="build.testDir" value="src/test/java"/> + <property name="build.testResourceDir" value="src/test/resources"/> + <property name="test.reports" value="${build.dir}/test-reports"/> + <property name="reporting.outputDirectory" value="${build.dir}/site"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"> + <pathelement location="../surefire-api/target/classes"/> + <pathelement location="../surefire-logger-api/target/classes"/> + <pathelement location="../surefire-shared-utils/target/classes"/> + <fileset dir="../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + <path id="build.test.classpath"> + <pathelement location="../surefire-api/target/classes"/> + <pathelement location="../surefire-logger-api/target/classes"/> + <pathelement location="../surefire-shared-utils/target/classes"/> + <fileset dir="../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${build.dir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> + <mkdir dir="${build.outputDir}"/> + <javac destdir="${build.outputDir}" + encoding="UTF-8" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + release="${compiler.release}" + target="${compiler.target}" + verbose="false" + fork="true" + source="${compiler.source}"> + <src> + <pathelement location="${build.srcDir}"/> + </src> + <classpath refid="build.classpath"/> + </javac> + </target> + + <!-- ====================================================================== --> + <!-- Test-compilation target --> + <!-- ====================================================================== --> + + <target name="compile-tests" + depends="compile" + description="Compile the test code" + unless="test.skip"> + <mkdir dir="${build.testOutputDir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Run all tests --> + <!-- ====================================================================== --> + + <target name="test" + depends="compile-tests, junit-missing" + unless="junit.skipped" + description="Run the test cases"/> + + <target name="test-junit-present"> + <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> + </target> + + <target name="test-junit-status" + depends="test-junit-present"> + <condition property="junit.missing"> + <and> + <isfalse value="${junit.present}"/> + <isfalse value="${test.skip}"/> + </and> + </condition> + <condition property="junit.skipped"> + <or> + <isfalse value="${junit.present}"/> + <istrue value="${test.skip}"/> + </or> + </condition> + </target> + + <target name="junit-missing" + depends="test-junit-status" + if="junit.missing"> + <echo>=================================== WARNING ===================================</echo> + <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> + <echo>===============================================================================</echo> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${build.srcDir}" + packagenames="*" + destdir="${reporting.outputDirectory}/apidocs" + access="protected" + old="false" + verbose="false" + locale="en" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + charset="ISO-8859-1" + linksource="false" + breakiterator="false"> + <classpath refid="build.classpath"/> + </javadoc> + </target> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="compile,test" description="Package the application"> + <jar jarfile="${build.dir}/${build.finalName}.jar" + compress="true" + index="false" + basedir="${build.outputDir}" + excludes="**/package.html"> + <manifest> + <attribute name="Implementation-Title" value="${project.name}"/> + <attribute name="Implementation-URL" value="${project.url}${project.artifactId}/"/> + <attribute name="Implementation-Vendor" value="${project.organization.name}"/> + <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/> + <attribute name="Implementation-Version" value="${project.version}"/> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + <attribute name="Specification-Title" value="${project.name}"/> + <attribute name="Specification-Vendor" value="${project.organization.name}"/> + <attribute name="Specification-Version" value="${spec.version}"/> + </manifest> + </jar> + </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + +</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/surefire-grouper/build.xml new/surefire-grouper/build.xml --- old/surefire-grouper/build.xml 2019-04-02 10:28:18.098196803 +0200 +++ new/surefire-grouper/build.xml 2024-04-08 15:56:25.353923417 +0200 @@ -65,6 +65,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -92,6 +93,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/surefire-its/build.xml new/surefire-its/build.xml --- old/surefire-its/build.xml 2019-04-02 10:28:18.098196803 +0200 +++ new/surefire-its/build.xml 2024-04-08 15:55:30.160183641 +0200 @@ -64,6 +64,7 @@ debug="true" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/surefire-logger-api/build.xml new/surefire-logger-api/build.xml --- old/surefire-logger-api/build.xml 2019-04-02 10:28:18.098196803 +0200 +++ new/surefire-logger-api/build.xml 2024-04-08 15:55:19.666773039 +0200 @@ -50,6 +50,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/surefire-providers/common-java5/build.xml new/surefire-providers/common-java5/build.xml --- old/surefire-providers/common-java5/build.xml 2019-04-02 10:28:18.098196803 +0200 +++ new/surefire-providers/common-java5/build.xml 2024-04-08 15:54:11.666272295 +0200 @@ -62,6 +62,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -88,6 +89,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/surefire-providers/common-junit3/build.xml new/surefire-providers/common-junit3/build.xml --- old/surefire-providers/common-junit3/build.xml 2019-04-02 10:28:18.102196823 +0200 +++ new/surefire-providers/common-junit3/build.xml 2024-04-08 15:53:56.632828265 +0200 @@ -62,6 +62,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -88,6 +89,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/surefire-providers/common-junit4/build.xml new/surefire-providers/common-junit4/build.xml --- old/surefire-providers/common-junit4/build.xml 2019-04-02 10:52:25.673510028 +0200 +++ new/surefire-providers/common-junit4/build.xml 2024-04-08 15:53:22.985914252 +0200 @@ -66,6 +66,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -92,6 +93,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/surefire-providers/common-junit48/build.xml new/surefire-providers/common-junit48/build.xml --- old/surefire-providers/common-junit48/build.xml 2019-04-02 10:28:18.102196823 +0200 +++ new/surefire-providers/common-junit48/build.xml 2024-04-08 15:53:36.102677309 +0200 @@ -70,6 +70,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -96,6 +97,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/surefire-providers/surefire-junit3/build.xml new/surefire-providers/surefire-junit3/build.xml --- old/surefire-providers/surefire-junit3/build.xml 2019-04-02 10:28:18.102196823 +0200 +++ new/surefire-providers/surefire-junit3/build.xml 2024-04-08 15:53:09.375814242 +0200 @@ -31,6 +31,7 @@ <pathelement location="../../surefire-api/target/classes"/> <pathelement location="../../surefire-logger-api/target/classes"/> <pathelement location="../common-junit3/target/classes"/> + <pathelement location="../common-java5/target/classes"/> <fileset dir="../../lib"> <include name="**/*.jar"/> </fileset> @@ -39,6 +40,7 @@ <pathelement location="../../surefire-api/target/classes"/> <pathelement location="../../surefire-logger-api/target/classes"/> <pathelement location="../common-junit3/target/classes"/> + <pathelement location="../common-java5/target/classes"/> <fileset dir="../../lib"> <include name="**/*.jar"/> </fileset> @@ -64,6 +66,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -94,6 +97,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/surefire-providers/surefire-junit4/build.xml new/surefire-providers/surefire-junit4/build.xml --- old/surefire-providers/surefire-junit4/build.xml 2019-04-02 10:28:18.102196823 +0200 +++ new/surefire-providers/surefire-junit4/build.xml 2024-04-08 15:52:44.465631171 +0200 @@ -68,6 +68,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -98,6 +99,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/surefire-providers/surefire-junit47/build.xml new/surefire-providers/surefire-junit47/build.xml --- old/surefire-providers/surefire-junit47/build.xml 2019-04-02 10:28:18.102196823 +0200 +++ new/surefire-providers/surefire-junit47/build.xml 2024-04-08 15:52:57.289058750 +0200 @@ -71,6 +71,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -101,6 +102,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/surefire-providers/surefire-testng/build.xml new/surefire-providers/surefire-testng/build.xml --- old/surefire-providers/surefire-testng/build.xml 2019-04-02 10:28:18.102196823 +0200 +++ new/surefire-providers/surefire-testng/build.xml 2024-04-08 15:52:30.632196179 +0200 @@ -67,6 +67,7 @@ debug="true" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -96,6 +97,7 @@ debug="true" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/surefire-providers/surefire-testng-utils/build.xml new/surefire-providers/surefire-testng-utils/build.xml --- old/surefire-providers/surefire-testng-utils/build.xml 2019-04-02 10:28:18.102196823 +0200 +++ new/surefire-providers/surefire-testng-utils/build.xml 2024-04-08 15:52:12.358728552 +0200 @@ -64,6 +64,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -90,6 +91,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/surefire-report-parser/build.xml new/surefire-report-parser/build.xml --- old/surefire-report-parser/build.xml 2019-04-02 10:28:18.098196803 +0200 +++ new/surefire-report-parser/build.xml 2024-04-08 15:55:04.346660217 +0200 @@ -60,6 +60,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" @@ -86,6 +87,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/surefire-setup-integration-tests/build.xml new/surefire-setup-integration-tests/build.xml --- old/surefire-setup-integration-tests/build.xml 2019-04-02 10:28:18.098196803 +0200 +++ new/surefire-setup-integration-tests/build.xml 2024-04-08 15:54:37.119793055 +0200 @@ -107,6 +107,7 @@ debug="true" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/surefire-shared-utils/build.xml new/surefire-shared-utils/build.xml --- old/surefire-shared-utils/build.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/surefire-shared-utils/build.xml 2024-04-08 12:51:56.839821139 +0200 @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="surefire-shared-utils" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <property file="build.properties"/> + <include file="../common.xml"/> + + <property name="project.artifactId" value="surefire-shared-utils"/> + <property name="project.name" value="Surefire Shared Utils"/> + + <property name="build.finalName" value="${project.artifactId}-${project.version}"/> + <property name="build.dir" value="target"/> + <property name="build.outputDir" value="${build.dir}/classes"/> + <property name="build.srcDir" value="src/main/java"/> + <property name="build.resourceDir" value="src/main/resources"/> + <property name="build.testOutputDir" value="${build.dir}/test-classes"/> + <property name="build.testDir" value="src/test/java"/> + <property name="build.testResourceDir" value="src/test/resources"/> + <property name="test.reports" value="${build.dir}/test-reports"/> + <property name="reporting.outputDirectory" value="${build.dir}/site"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"> + <fileset dir="../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + <path id="build.test.classpath"> + <fileset dir="../lib"> + <include name="**/*.jar"/> + </fileset> + </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${build.dir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> + <mkdir dir="${build.outputDir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Test-compilation target --> + <!-- ====================================================================== --> + + <target name="compile-tests" + depends="compile" + description="Compile the test code" + unless="test.skip"> + <mkdir dir="${build.testOutputDir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Run all tests --> + <!-- ====================================================================== --> + + <target name="test" + depends="compile-tests, junit-missing" + unless="junit.skipped" + description="Run the test cases"/> + + <target name="test-junit-present"> + <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> + </target> + + <target name="test-junit-status" + depends="test-junit-present"> + <condition property="junit.missing"> + <and> + <isfalse value="${junit.present}"/> + <isfalse value="${test.skip}"/> + </and> + </condition> + <condition property="junit.skipped"> + <or> + <isfalse value="${junit.present}"/> + <istrue value="${test.skip}"/> + </or> + </condition> + </target> + + <target name="junit-missing" + depends="test-junit-status" + if="junit.missing"> + <echo>=================================== WARNING ===================================</echo> + <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> + <echo>===============================================================================</echo> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"/> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="compile,test" description="Package the application"> + <jar jarfile="${build.dir}/${build.finalName}.jar" + compress="true" + index="false" + basedir="${build.outputDir}" + excludes="**/package.html"> + <manifest> + <attribute name="Implementation-Title" value="${project.name}"/> + <attribute name="Implementation-URL" value="${project.url}${project.artifactId}/"/> + <attribute name="Implementation-Vendor" value="${project.organization.name}"/> + <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/> + <attribute name="Implementation-Version" value="${project.version}"/> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + <attribute name="Specification-Title" value="${project.name}"/> + <attribute name="Specification-Vendor" value="${project.organization.name}"/> + <attribute name="Specification-Version" value="${spec.version}"/> + </manifest> + </jar> + </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + +</project>
