[Git][java-team/ant][master] Reverted the modification setting the 'release' attribute automatically (Closes: #902895)

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / ant


Commits:
d28ae18a by Emmanuel Bourg at 2018-07-03T10:53:27+02:00
Reverted the modification setting the 'release' attribute automatically (Closes: #902895)

- - - - -


2 changed files:

- debian/changelog
- debian/patches/0013-auto-adjust-target.patch


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ant (1.10.4-2) unstable; urgency=medium
+
+  * Team upload.
+  * Reverted the modification setting the 'release' attribute automatically
+    since this renders the internal JDK APIs unavailable at compile time.
+    (Closes: #902895)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 03 Jul 2018 10:53:12 +0200
+
 ant (1.10.4-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/0013-auto-adjust-target.patch
=====================================
--- a/debian/patches/0013-auto-adjust-target.patch
+++ b/debian/patches/0013-auto-adjust-target.patch
@@ -30,29 +30,16 @@ Forwarded: no
          // scan source directories and dest directory to build up
          // compile list
          if (hasPath(src)) {
-@@ -1713,4 +1713,24 @@
+@@ -1713,4 +1713,11 @@
          0x00, 0x00, 0x00, 0x02, 0x00, 0x04
      };
  
 +    /**
-+     * Adjusts the value of the source/target/release attributes.
++     * Adjusts the value of the source/target attributes.
 +     */
 +    private void adjustLevels() {
 +        source = LanguageLevel.adjust(source, "javac -source", this);
 +        targetAttribute = LanguageLevel.adjust(targetAttribute, "javac -target", this);
-+        release = LanguageLevel.adjust(release, "javac --release", this);
-+        if (LanguageLevel.isDebianBuild()) {
-+            if (release == null && targetAttribute != null) {
-+                log("Release attribute not specified, defaulting to the value of the target attribute (" + targetAttribute + ")");
-+                release = targetAttribute;
-+            } else if (release == null && targetAttribute != null) {
-+                log("Release attribute not specified, defaulting to the value of the source attribute (" + source + ")");
-+                release = source;
-+            }
-+            if (release != null && release.startsWith("1.")) {
-+                release = release.substring(2);
-+            }
-+        }
 +    }
  }
 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java



View it on GitLab: https://salsa.debian.org/java-team/ant/commit/d28ae18aa81495efd9bf33dbcc84838fd586315c

-- 
View it on GitLab: https://salsa.debian.org/java-team/ant/commit/d28ae18aa81495efd9bf33dbcc84838fd586315c
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/20180703/c493a2eb/attachment.html>