Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
ant
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Debian Java Maintainers
ant
Commits
d28ae18a
Commit
d28ae18a
authored
6 years ago
by
Emmanuel Bourg
Browse files
Options
Downloads
Patches
Plain Diff
Reverted the modification setting the 'release' attribute automatically (Closes: #902895)
parent
5a76fce7
No related branches found
Branches containing commit
Tags
debian/1.10.4-2
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
debian/changelog
+9
-0
9 additions, 0 deletions
debian/changelog
debian/patches/0013-auto-adjust-target.patch
+2
-15
2 additions, 15 deletions
debian/patches/0013-auto-adjust-target.patch
with
11 additions
and
15 deletions
debian/changelog
+
9
−
0
View file @
d28ae18a
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.
...
...
This diff is collapsed.
Click to expand it.
debian/patches/0013-auto-adjust-target.patch
+
2
−
15
View file @
d28ae18a
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment