Commit d28ae18a authored by Emmanuel Bourg's avatar Emmanuel Bourg

Reverted the modification setting the 'release' attribute automatically (Closes: #902895)

parent 5a76fce7
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@apache.org> Tue, 03 Jul 2018 10:53:12 +0200
ant (1.10.4-1) unstable; urgency=medium
* Team upload.
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment