Author: veithen
Date: Thu Aug 5 21:40:04 2010
New Revision: 982795
URL: http://svn.apache.org/viewvc?rev=982795&view=rev
Log:
AXIS2-4788: Removed the extra dependency on org.apache.bcel:bcel and keep
whatever transitive dependency is introduced by jibx.
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
axis/axis2/java/core/trunk/modules/jibx/pom.xml
axis/axis2/java/core/trunk/modules/parent/pom.xml
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=982795&r1=982794&r2=982795&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
(original)
+++
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
Thu Aug 5 21:40:04 2010
@@ -212,8 +212,6 @@
<exclude>org.springframework:spring-context:jar</exclude>
<exclude>org.springframework:spring-core:jar</exclude>
<exclude>org.springframework:spring-web:jar</exclude>
- <exclude>jakarta-regexp:jakarta-regexp:jar</exclude>
- <exclude>org.apache.bcel:bcel:jar</exclude>
<exclude>org.apache.ant:ant:jar</exclude>
<exclude>org.apache.ant:ant-launcher:jar</exclude>
<exclude>aopalliance:aopalliance:jar</exclude>
Modified: axis/axis2/java/core/trunk/modules/jibx/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jibx/pom.xml?rev=982795&r1=982794&r2=982795&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jibx/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jibx/pom.xml Thu Aug 5 21:40:04 2010
@@ -62,10 +62,6 @@
<artifactId>jibx-run</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.bcel</groupId>
- <artifactId>bcel</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>test</scope>
Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=982795&r1=982794&r2=982795&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Thu Aug 5 21:40:04 2010
@@ -79,7 +79,6 @@
<!-- Use released versions for these projects -->
<ant.version>1.7.0</ant.version>
<antlr.version>2.7.7</antlr.version>
- <bcel.version>5.2</bcel.version>
<bsf.version>2.4.0</bsf.version>
<commons.codec.version>1.3</commons.codec.version>
<commons.fileupload.version>1.2</commons.fileupload.version>
@@ -713,11 +712,6 @@
<version>${ant.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.bcel</groupId>
- <artifactId>bcel</artifactId>
- <version>${bcel.version}</version>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons.logging.version}</version>
