[Git][java-team/jtreg8][master] 5 commits: * Standards-Version 4.7.4:

[Vladimir Petko (@vpa1977)]

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


Commits:
c3e4db16 by Vladimir Petko at 2026-10-01T09:57:16+13:00
  * Standards-Version 4.7.4:
    - d/control: Drop Priority field.

- - - - -
1bd93460 by Vladimir Petko at 2026-10-01T09:57:28+13:00
  * d/{apiguardian/rules, opentest4j-reporting/rules}: Remove Gradle Kotlin DSL
    build files (Closes: #1149426).

- - - - -
b7f4a500 by Vladimir Petko at 2026-10-01T09:57:36+13:00
changelog

- - - - -
193ebce2 by Vladimir Petko at 2026-10-01T10:05:11+13:00
changelog

- - - - -
fc9725ca by Vladimir Petko at 2026-09-30T21:09:18+00:00
Merge branch 'fix_ftbfs' into 'master'

Fix ftbfs caused by kotlin dsl enabled in Gradle

See merge request java-team/jtreg8!11
- - - - -


4 changed files:

- debian/apiguardian/rules
- debian/changelog
- debian/control
- debian/opentest4j-reporting/rules


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,12 @@
+jtreg8 (8.3+1+ds1-2) UNRELEASED; urgency=medium
+
+  * d/{apiguardian/rules, opentest4j-reporting/rules}: Remove Gradle
+    Kotlin DSL build files (Closes: #1149426).
+  * Standards-Version 4.7.4:
+    - d/control: Drop Priority field.
+
+ -- Vladimir Petko <vladimir.petko at canonical.com>  Thu, 01 Oct 2026 09:54:28 +1300
+
 jtreg8 (8.3+1+ds1-1) unstable; urgency=medium
 
   * New upstream release jtreg 8.3, build 1.


=====================================
debian/control
=====================================
@@ -1,6 +1,5 @@
 Source: jtreg8
 Section: java
-Priority: optional
 Maintainer: Vladimir Petko <vladimir.petko at canonical.com>
 Uploaders: Matthias Klose <doko at debian.org>
 Build-Depends:
@@ -40,7 +39,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/jtreg8.git
 Vcs-Browser: https://salsa.debian.org/java-team/jtreg8
 Homepage: https://openjdk.java.net/jtreg


=====================================
debian/opentest4j-reporting/rules
=====================================
@@ -14,6 +14,7 @@ override_dh_auto_clean:
 override_dh_auto_build:
 	# Copy generated sources to the appropriate location
 	cp ../debian/opentest4j-reporting/generated/* "$(SPI_DIR)/"
+	find . -name "*.gradle.kts" -delete
 	dh_auto_build
 
 override_dh_auto_test:



View it on GitLab: https://salsa.debian.org/java-team/jtreg8/-/compare/fed7c50bfb2b1362bf61e69da47683674266a92c...fc9725ca3826cc95216e00df7b8bf8bb7d79049e

-- 
View it on GitLab: https://salsa.debian.org/java-team/jtreg8/-/compare/fed7c50bfb2b1362bf61e69da47683674266a92c...fc9725ca3826cc95216e00df7b8bf8bb7d79049e
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/8862d7c7/attachment.htm>