Tony Mancill pushed to branch master at Debian Java Maintainers / jtreg7
Commits: 443e9a23 by Vladimir Petko at 2025-04-06T12:26:29+12:00 d/p/jline3-01-ignore-warnings.patch: ignore builtins warnings. - - - - - e702dec5 by Vladimir Petko at 2025-04-06T12:27:57+12:00 add JAVA_SPECIFICATION_VERSION to d/rules - - - - - f2bacc0e by Vladimir Petko at 2025-04-07T08:18:09+12:00 changelog - - - - - ac0b4fec by Tony Mancill at 2025-04-07T01:08:53+00:00 Merge branch 'fix_backports' into 'master' Fix ftbfs in backports See merge request java-team/jtreg7!7 - - - - - 3 changed files: - debian/changelog - debian/patches/jline3-01-ignore-warnings.patch - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,13 @@ +jtreg7 (7.5.1+1+ds1-2) UNRELEASED; urgency=medium + + * Fix ftbfs in backports (Closes: #1102171): + - d/p/jline3-01-ignore-warnings.patch: ignore builtins warnings. + - d/rules: use upstream expression from make/build.sh to set + JAVA_SPECIFICATION_VERSION. Add JAVA_SPECIFICATION_VERSION + make parameter. + + -- Vladimir Petko <[email protected]> Sun, 06 Apr 2025 12:28:18 +1200 + jtreg7 (7.5.1+1+ds1-1) unstable; urgency=medium * New upstream release 7.5.1 build 1. ===================================== debian/patches/jline3-01-ignore-warnings.patch ===================================== @@ -29,3 +29,21 @@ Forwarded: not-needed <arg>-profile</arg> <arg>compact3</arg> </compilerArgs> +--- a/jline3/builtins/pom.xml ++++ b/jline3/builtins/pom.xml +@@ -59,7 +59,6 @@ + </excludes> + <compilerArgs> + <arg>-Xlint:all,-options</arg> +- <arg>-Werror</arg> + <arg>-profile</arg> + <arg>compact1</arg> + </compilerArgs> +@@ -76,7 +75,6 @@ + </includes> + <compilerArgs> + <arg>-Xlint:all,-options</arg> +- <arg>-Werror</arg> + <arg>-profile</arg> + <arg>compact3</arg> + </compilerArgs> ===================================== debian/rules ===================================== @@ -20,6 +20,12 @@ ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) NJOBS = $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) endif +JAVA_VERSION=$(shell java -version 2>&1) +JAVA_SPECIFICATION_VERSION=$(shell echo "${JAVA_VERSION}" | \ + grep -e ^java -e ^openjdk | \ + head -n 1 | \ + sed -e 's/^[^0-9]*\(1\.\)*\([1-9][0-9]*\).*/\2/' ) + components:=apiguardian hawt-jni jansi1 jline3 picocli univocity-parsers libhamcrest-java junit4 opentest4j opentest4j-reporting junit5 testng %: @@ -46,6 +52,7 @@ override_dh_auto_build: BUILD_VERSION_STRING="$(VERSION)-src+$(BUILD_NUMBER)" \ BUILD_MILESTONE=src \ JDKHOME=$(JAVA_HOME) \ + JAVA_SPECIFICATION_VERSION=$(JAVA_SPECIFICATION_VERSION) \ BUILD_NUMBER=$(BUILD_NUMBER) -j$(NJOBS) all) # Generate the manpages View it on GitLab: https://salsa.debian.org/java-team/jtreg7/-/compare/1e1e448785653f260466f2e2dcca8a1ca86239d9...ac0b4fec9c52e0fedabcf49fee15dcc50d3505bb -- View it on GitLab: https://salsa.debian.org/java-team/jtreg7/-/compare/1e1e448785653f260466f2e2dcca8a1ca86239d9...ac0b4fec9c52e0fedabcf49fee15dcc50d3505bb 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
