[Git][java-team/gradle-debian-helper][master] Check the JDK specified by JAVA_HOME before adding --add-opens to the gradle...

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / gradle-debian-helper


Commits:
5a3769b9 by Emmanuel Bourg at 2022-06-01T18:18:16+02:00
Check the JDK specified by JAVA_HOME before adding --add-opens to the gradle command line (Closes: #1012215)

- - - - -


2 changed files:

- debian/changelog
- gradle-helper-plugin/src/main/perl/gradle.pm


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+gradle-debian-helper (2.3) unstable; urgency=medium
+
+  * Check the JDK specified by the JAVA_HOME environment variable before
+    adding --add-opens option to the gradle command line (Closes: #1012215)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 01 Jun 2022 18:17:59 +0200
+
 gradle-debian-helper (2.2) unstable; urgency=medium
 
   [ Andrius Merkys ]


=====================================
gradle-helper-plugin/src/main/perl/gradle.pm
=====================================
@@ -105,7 +105,11 @@ sub _execute_gradle_task {
 }
 
 sub _check_jpms {
-	return system("java -cp /usr/share/java/gradle-helper-plugin.jar org.debian.gradle.CheckJPMS") == 0;
+	my $JAVA="java";
+	if (defined $ENV{JAVA_HOME}) {
+		$JAVA="$ENV{JAVA_HOME}/bin/java";
+	}
+	return system("$JAVA -cp /usr/share/java/gradle-helper-plugin.jar org.debian.gradle.CheckJPMS") == 0;
 }
 
 1



View it on GitLab: https://salsa.debian.org/java-team/gradle-debian-helper/-/commit/5a3769b9bda5a581a38be6bdd694676bc24b83ed

-- 
View it on GitLab: https://salsa.debian.org/java-team/gradle-debian-helper/-/commit/5a3769b9bda5a581a38be6bdd694676bc24b83ed
You're receiving this email because of your account on salsa.debian.org.


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