You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2014/04/10 13:53:25 UTC
svn commit: r1586274 - /qpid/qpid-parent-pom/trunk/pom.xml
Author: robbie
Date: Thu Apr 10 11:53:25 2014
New Revision: 1586274
URL: http://svn.apache.org/r1586274
Log:
QPID-5676, QPID-5048: go back to using the original BCEL dependency and instead update the dependency checking to cope with its lack of metadata
Modified:
qpid/qpid-parent-pom/trunk/pom.xml
Modified: qpid/qpid-parent-pom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/qpid/qpid-parent-pom/trunk/pom.xml?rev=1586274&r1=1586273&r2=1586274&view=diff
==============================================================================
--- qpid/qpid-parent-pom/trunk/pom.xml (original)
+++ qpid/qpid-parent-pom/trunk/pom.xml Thu Apr 10 11:53:25 2014
@@ -95,7 +95,7 @@
<geronimo-j2ee-connector-version>2.0.0</geronimo-j2ee-connector-version>
<geronimo-ejb-version>1.0.1</geronimo-ejb-version>
<geronimo-kernel-version>2.2.1</geronimo-kernel-version>
- <bcel-version>5.2_4</bcel-version>
+ <bcel-version>5.2</bcel-version>
<velocity-version>1.4</velocity-version>
<derby-version>10.8.2.2</derby-version>
<jython-version>2.5.3</jython-version>
@@ -325,9 +325,9 @@
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.bcel</artifactId>
- <version>5.2_4</version>
+ <groupId>org.apache.bcel</groupId>
+ <artifactId>bcel</artifactId>
+ <version>${bcel-version}</version>
<scope>compile</scope>
</dependency>
@@ -639,6 +639,8 @@
<failIfWarning>true</failIfWarning>
<excludedScopes>provided</excludedScopes>
<outputDirectory>${license-maven-plugin-output-dir}</outputDirectory>
+ <!-- Exclude BCEL from being checked, it is ALv2 but doesnt have the necessary metadata -->
+ <excludedGroups>org.apache.bcel</excludedGroups>
<includedLicenses>
<includedLicense>Apache Software License, Version 2.0</includedLicense>
<includedLicense>The MIT License</includedLicense>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org