Repository: ant
Updated Branches:
refs/heads/master c2a61ea21 -> a8b465489
update BCEL dependency to 6.0
https://bz.apache.org/bugzilla/show_bug.cgi?id=61196
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/a8b46548
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/a8b46548
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/a8b46548
Branch: refs/heads/master
Commit: a8b46548990ded7f10fd3461865d84d6b920e3bf
Parents: c2a61ea
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sun Jul 23 17:50:31 2017 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sun Jul 23 17:50:31 2017 +0200
----------------------------------------------------------------------
WHATSNEW | 7 ++++++-
fetch.xml | 5 ++++-
lib/libraries.properties | 2 +-
src/etc/poms/ant-apache-bcel/pom.xml | 4 ++--
4 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/a8b46548/WHATSNEW
----------------------------------------------------------------------
diff --git a/WHATSNEW b/WHATSNEW
index 8e76f47..ee0c1e9 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,6 +1,12 @@
Changes from Ant 1.10.1 TO Ant 1.10.2
=====================================
+Changes that could break older environments:
+-------------------------------------------
+
+ * updated the dependency of BCEL to 6.0.
+ Bugzilla Report 61196
+
Fixed bugs:
-----------
@@ -8,7 +14,6 @@ Fixed bugs:
value.
Bugzilla Report 60767
-
* bootstrapping Ant on Windows failed
Bugzilla Report 61027
http://git-wip-us.apache.org/repos/asf/ant/blob/a8b46548/fetch.xml
----------------------------------------------------------------------
diff --git a/fetch.xml b/fetch.xml
index f8e0bf9..4ba3548 100644
--- a/fetch.xml
+++ b/fetch.xml
@@ -248,7 +248,10 @@ Set -Ddest=LOCATION on the command line
<target name="bcel"
description="load bcel libraries"
depends="init">
- <f2 project="bcel" />
+ <copy todir="${dest.dir}">
+ <url url="${m2.url}/org/apache/bcel/bcel/${bcel.version}/bcel-${bcel.version}.jar"/>
+ <flattenmapper/>
+ </copy>
</target>
<target name="jdepend"
http://git-wip-us.apache.org/repos/asf/ant/blob/a8b46548/lib/libraries.properties
----------------------------------------------------------------------
diff --git a/lib/libraries.properties b/lib/libraries.properties
index 21961f3..6b90fdb 100644
--- a/lib/libraries.properties
+++ b/lib/libraries.properties
@@ -33,7 +33,7 @@ m2.repo=http://repo1.maven.org/maven2/
#when a specific dependency forces them to be out-of-order
ivy.version=2.4.0
antlr.version=2.7.7
-bcel.version=5.1
+bcel.version=6.0
bsf.version=2.4.0
bsh.version=2.0b4
bsh-core.version=${bsh.version}
http://git-wip-us.apache.org/repos/asf/ant/blob/a8b46548/src/etc/poms/ant-apache-bcel/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-apache-bcel/pom.xml b/src/etc/poms/ant-apache-bcel/pom.xml
index c27da12..40cdcea 100644
--- a/src/etc/poms/ant-apache-bcel/pom.xml
+++ b/src/etc/poms/ant-apache-bcel/pom.xml
@@ -43,9 +43,9 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>bcel</groupId>
+ <groupId>org.apache.bcel</groupId>
<artifactId>bcel</artifactId>
- <version>5.1</version>
+ <version>6.0</version>
<scope>compile</scope>
</dependency>
</dependencies>