[Git][java-team/jtreg7][master] 5 commits: d/p/flush-alarm.patch: Remove unused patch.

[Vladimir Petko (@vpa1977)]

Vladimir Petko pushed to branch master at Debian Java Maintainers / jtreg7


Commits:
b65a0535 by Vladimir Petko at 2026-10-01T09:21:43+13:00
d/p/flush-alarm.patch: Remove unused patch.

- - - - -
eeb4ed25 by Vladimir Petko at 2026-10-01T09:29:12+13:00
  * Standards-Version 4.7.4:
    - d/control: Drop Priority field.

- - - - -
2ac9dca6 by Vladimir Petko at 2026-10-01T09:44:27+13:00
  * d/{apiguardian/rules, opentest4j-reporting/rules}: Remove Gradle Kotlin DSL
    build files (Closes: #1149424).

- - - - -
d418ece1 by Vladimir Petko at 2026-10-01T09:44:31+13:00
changelog

- - - - -
a545f08d by Vladimir Petko at 2026-09-30T20:45:06+00:00
Merge branch 'build-fix' into 'master'

Fix ftbfs caused by the Gradle upgrade

See merge request java-team/jtreg7!14
- - - - -


5 changed files:

- debian/apiguardian/rules
- debian/changelog
- debian/control
- debian/opentest4j-reporting/rules
- − debian/patches/flush-alarm.patch


Changes:

=====================================
debian/apiguardian/rules
=====================================
@@ -3,14 +3,9 @@
 %:
 	dh $@ --buildsystem=gradle --with maven-repo-helper
 
-override_dh_auto_clean:
-	dh_auto_clean
-	# Remove the build.gradle file we created during configure
-	rm -f build.gradle settings.gradle
-
-override_dh_auto_configure:
-	# Until the Debian Gradle toolchain has Kotlin support,
-	# copy the (patched) build.gradle.kts to build.gradle
-	cp build.gradle.kts build.gradle
-	cp settings.gradle.kts settings.gradle
-	dh_auto_configure
+override_dh_auto_build:
+	trap 'mv -f build.gradle build.gradle.kts; \
+	      mv -f settings.gradle settings.gradle.kts' EXIT INT TERM HUP; \
+	mv -f build.gradle.kts build.gradle; \
+	mv -f settings.gradle.kts settings.gradle; \
+	dh_auto_build


=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+jtreg7 (7.5.2+1+ds2-4) UNRELEASED; urgency=medium
+
+  * d/{apiguardian/rules, opentest4j-reporting/rules}: Remove Gradle Kotlin DSL
+    build files (Closes: #1149424).
+  * d/p/flush-alarm.patch: Remove unused patch.
+  * Standards-Version 4.7.4:
+    - d/control: Drop Priority field.
+
+ -- Vladimir Petko <vladimir.petko at canonical.com>  Thu, 01 Oct 2026 08:35:43 +1300
+
 jtreg7 (7.5.2+1+ds2-3) unstable; urgency=medium
 
   * d/p/codetools-7904157-proposed.patch: override compile


=====================================
debian/control
=====================================
@@ -1,6 +1,5 @@
 Source: jtreg7
 Section: java
-Priority: optional
 Maintainer: Vladimir Petko <vladimir.petko at canonical.com>
 Uploaders: Matthias Klose <doko at debian.org>
 Build-Depends:
@@ -41,7 +40,7 @@ Build-Depends:
  libmaven-plugin-tools-java,
  libplexus-component-metadata-java,
  libxbean-java,
-Standards-Version: 4.7.2
+Standards-Version: 4.7.4
 Vcs-Git: https://salsa.debian.org/java-team/jtreg7.git
 Vcs-Browser: https://salsa.debian.org/java-team/jtreg7
 Homepage: https://openjdk.java.net/jtreg


=====================================
debian/opentest4j-reporting/rules
=====================================
@@ -7,4 +7,8 @@ override_dh_auto_test:
 
 override_dh_auto_configure:
 	dh_auto_configure $@
-	rsync -Lav ../debian/built-components/ debian/ || true
\ No newline at end of file
+	rsync -Lav ../debian/built-components/ debian/ || true
+
+override_dh_auto_build:
+	find . -name "*.gradle.kts" -delete
+	dh_auto_build


=====================================
debian/patches/flush-alarm.patch deleted
=====================================
@@ -1,15 +0,0 @@
-Description: Flush alarm output
- Addresses sporadic FTBFS during builds on some systems related
- to 'missing "Timeout signalled" action timeout message' errors.
-Author: Vladimir Petko <vladimir.petko at canonical.com>
-Forwarded: not-needed
---- a/src/share/classes/com/sun/javatest/regtest/agent/Alarm.java
-+++ b/src/share/classes/com/sun/javatest/regtest/agent/Alarm.java
-@@ -147,6 +147,7 @@
-             } else if (count % 100 == 0) {
-                 msgOut.println(String.format("Timeout refired %d times", count));
-             }
-+            msgOut.flush();
-         }
-         count++;
-         fired = true;



View it on GitLab: https://salsa.debian.org/java-team/jtreg7/-/compare/69a403f7343a1552bb4ece1ccf82f4392de255b5...a545f08d643a2b66881894be53fe428909da1047

-- 
View it on GitLab: https://salsa.debian.org/java-team/jtreg7/-/compare/69a403f7343a1552bb4ece1ccf82f4392de255b5...a545f08d643a2b66881894be53fe428909da1047
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20260930/bc303406/attachment.htm>