Emmanuel Bourg pushed to branch master at Debian Java Maintainers / junit4
Commits: f49fcbe0 by Emmanuel Bourg at 2021-02-05T13:15:25+01:00 Standards-Version updated to 4.5.1 - - - - - 26046224 by Emmanuel Bourg at 2021-02-05T13:17:15+01:00 Removed debian/orig-tar.sh - - - - - 46f803ce by Emmanuel Bourg at 2021-02-05T13:44:21+01:00 Fixed the build failure with OpenJDK 17 (Closes: #981830) - - - - - f52b681d by Emmanuel Bourg at 2021-02-05T13:48:17+01:00 Upload to unstable - - - - - 8 changed files: - debian/changelog - debian/control - debian/copyright - − debian/orig-tar.exclude - − debian/orig-tar.sh - + debian/patches/java17-compatibility.patch - debian/patches/series - debian/watch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +junit4 (4.13.1-2) unstable; urgency=medium + + * Fixed the build failure with OpenJDK 17 (Closes: #981830) + * Standards-Version updated to 4.5.1 + * Removed debian/orig-tar.sh + + -- Emmanuel Bourg <[email protected]> Fri, 05 Feb 2021 13:48:11 +0100 + junit4 (4.13.1-1) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -17,7 +17,7 @@ Build-Depends: libhamcrest-java-doc, libmaven-javadoc-plugin-java, maven-debian-helper (>= 2.2) -Standards-Version: 4.5.0 +Standards-Version: 4.5.1 Vcs-Git: https://salsa.debian.org/java-team/junit4.git Vcs-Browser: https://salsa.debian.org/java-team/junit4 Homepage: http://www.junit.org ===================================== debian/copyright ===================================== @@ -6,6 +6,14 @@ Files-Excluded: mvnw mvnw.cmd .mvn + *.jar + *.zip + apache-maven + hopscotch-*.min.js + .classpath + .project + .settings + .travis.yml Files: * Copyright: 2006-2020 Junit contributors ===================================== debian/orig-tar.exclude deleted ===================================== @@ -1,8 +0,0 @@ -*.jar -*.zip -apache-maven -hopscotch-*.min.js -.classpath -.project -.settings -.travis.yml ===================================== debian/orig-tar.sh deleted ===================================== @@ -1,25 +0,0 @@ -#!/bin/sh -e - -# called by uscan with '--upstream-version' <version> <file> -VERSION=$2 -DIR=junit4-$VERSION -TAR=../junit4_$VERSION.orig.tar.xz -ORIG_TAR=$3 - -#rm -f $3 -#wget -O $TAR http://github.com/KentBeck/junit/archive/r$VERSION - -# clean up the upstream tarball -mkdir $DIR -tar -x -v -z -f $ORIG_TAR -rm $ORIG_TAR -find . -maxdepth 2 -wholename "./junit-*/*" -exec mv '{}' $DIR \; -XZ_OPT=--best tar -c -J -f $TAR -X debian/orig-tar.exclude $DIR -rm -rf $DIR junit-* - -# move to directory 'tarballs' -if [ -r .svn/deb-layout ]; then - . .svn/deb-layout - mv $TAR $origDir - echo "moved $TAR to $origDir" -fi ===================================== debian/patches/java17-compatibility.patch ===================================== @@ -0,0 +1,50 @@ +Description: Disable doclint and change the source level to fix the build failure with OpenJDK 17 +Author: Emmanuel Bourg <[email protected]> +Forwarded: https://github.com/junit-team/junit4/issues/1696 +Bug-Debian: https://bugs.debian.org/981830 +--- a/pom.xml ++++ b/pom.xml +@@ -530,14 +530,14 @@ + <configuration> + <compilerArgs> + <arg>-Xlint:unchecked</arg> +- <arg>-Xdoclint:accessibility,reference,syntax</arg> ++ <arg>-Xdoclint:none</arg> + </compilerArgs> + </configuration> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> +- <additionalparam>-Xdoclint:accessibility -Xdoclint:reference</additionalparam> ++ <additionalparam>-Xdoclint:none</additionalparam> + </configuration> + </plugin> + </plugins> +@@ -547,7 +547,7 @@ + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> +- <additionalparam>-Xdoclint:accessibility -Xdoclint:reference</additionalparam> ++ <additionalparam>-Xdoclint:none</additionalparam> + </configuration> + </plugin> + </plugins> +@@ -567,7 +567,7 @@ + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> +- <source>1.6</source> ++ <source>8</source> + </configuration> + </plugin> + </plugins> +@@ -577,7 +577,7 @@ + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> +- <source>1.6</source> ++ <source>8</source> + </configuration> + </plugin> + </plugins> ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ exclude-dependency-sources.patch Version.patch +java17-compatibility.patch ===================================== debian/watch ===================================== @@ -1,3 +1,3 @@ version=4 -opts=filenamemangle=s/.+\/r?(\d\S+)\.tar\.gz/junit4-$1\.tar\.gz/ \ +opts=repack,compression=xz,filenamemangle=s/.+\/r?(\d\S+)\.tar\.gz/junit4-$1\.tar\.gz/ \ https://github.com/junit-team/junit4/tags .*/r?(\d\S+)\.tar\.gz View it on GitLab: https://salsa.debian.org/java-team/junit4/-/compare/c7f69227311d84ce6bff925a864663a4bcc35776...f52b681d47dc2b25fbdeab11ffaade8ecbd55e4d -- View it on GitLab: https://salsa.debian.org/java-team/junit4/-/compare/c7f69227311d84ce6bff925a864663a4bcc35776...f52b681d47dc2b25fbdeab11ffaade8ecbd55e4d 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
