Emmanuel Bourg pushed to branch master at Debian Java Maintainers / surefire
Commits: 68a7082b by Emmanuel Bourg at 2025-04-28T17:53:50+02:00 Restored the maven-surefire-report-plugin - - - - - c533c04b by Emmanuel Bourg at 2025-04-28T17:54:16+02:00 Standards-Version updated to 4.7.2 - - - - - 09a8ca5a by Emmanuel Bourg at 2025-04-28T17:55:12+02:00 Upload to unstable - - - - - 6 changed files: - debian/changelog - debian/control - debian/libsurefire-java.poms - debian/patches/doxia-compatibility.patch - + debian/patches/maven-reporting-api-compatibility.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +surefire (2.22.3-4) unstable; urgency=medium + + * Team upload. + * Restored the maven-surefire-report-plugin + * Standards-Version updated to 4.7.2 + + -- Emmanuel Bourg <[email protected]> Mon, 28 Apr 2025 17:55:07 +0200 + surefire (2.22.3-3) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -23,6 +23,7 @@ Build-Depends: libmaven-dependency-plugin-java, libmaven-plugin-testing-java, libmaven-plugin-tools-java (>= 3.2), + libmaven-reporting-api-java, libmaven-resources-plugin-java, libmaven-shade-plugin-java, libmaven-shared-utils-java, @@ -30,7 +31,7 @@ Build-Depends: libplexus-languages-java, maven-debian-helper (>= 2.3.2~), testng -Standards-Version: 4.7.0 +Standards-Version: 4.7.2 Vcs-Git: https://salsa.debian.org/java-team/surefire.git Vcs-Browser: https://salsa.debian.org/java-team/surefire Homepage: http://maven.apache.org/surefire/ ===================================== debian/libsurefire-java.poms ===================================== @@ -46,5 +46,5 @@ surefire-shadefire/pom.xml --ignore maven-failsafe-plugin/pom.xml --ignore maven-surefire-common/pom.xml --has-package-version maven-surefire-plugin/pom.xml --has-package-version --relocate=org.apache.maven.plugins:maven-surefire-plugin:2.12.4,org.apache.maven.plugins:maven-surefire-plugin:2.17 -maven-surefire-report-plugin/pom.xml --ignore +maven-surefire-report-plugin/pom.xml --has-package-version surefire-its/pom.xml --ignore ===================================== debian/patches/doxia-compatibility.patch ===================================== @@ -12,3 +12,12 @@ Forwarded: no import org.apache.maven.doxia.util.DoxiaUtils; import org.apache.maven.plugin.surefire.log.api.ConsoleLogger; import org.apache.maven.reporting.MavenReportException; +@@ -545,7 +545,7 @@ + + private static String toHtmlId( String id ) + { +- return DoxiaUtils.isValidId( id ) ? id : DoxiaUtils.encodeId( id, true ); ++ return DoxiaUtils.isValidId( id ) ? id : DoxiaUtils.encodeId( id ); + } + + private void constructFailureDetails( Sink sink, LocalizedProperties bundle, List<ReportTestCase> failures ) ===================================== debian/patches/maven-reporting-api-compatibility.patch ===================================== @@ -0,0 +1,14 @@ +Description: Fixes the compatibility with the version of Maven Reporting API in Debian +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java ++++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java +@@ -139,7 +139,7 @@ + } + + @Override +- public boolean canGenerateReport() ++ public boolean canGenerateReport() throws MavenReportException + { + return hasReportDirectories() && super.canGenerateReport(); + } ===================================== debian/patches/series ===================================== @@ -10,3 +10,4 @@ jdk-8186647-workaround.patch maven-shared-utils-compatibility.patch disable-doclint.patch maven-shared-utils-3.3.4-compatibility.patch +maven-reporting-api-compatibility.patch View it on GitLab: https://salsa.debian.org/java-team/surefire/-/compare/f2621b461756efab6ab1a589d899cd75ef20ab17...09a8ca5ab565ce66021e2c4643cb4901a12fee1b -- View it on GitLab: https://salsa.debian.org/java-team/surefire/-/compare/f2621b461756efab6ab1a589d899cd75ef20ab17...09a8ca5ab565ce66021e2c4643cb4901a12fee1b You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
