commit fc6f51d3f7477c3d4467541fa67687f565a6b4a2
author Olaf Otto <olaf@x100.de> Mon Mar 14 16:35:00 2016 +0100
committer Olaf Otto <olaf@x100.de> Mon Mar 14 16:44:26 2016 +0100
tree b85b523831f933447981a52478c914525804827d
parent cd688c807ebeb9da07ec4a5d9b8651e4b0238760

488009: Build stabilization: Corrected bundle configuration
Updated references to the new servicemix bundles location

pom.xml

diff --git a/pom.xml b/pom.xml
index e4c4a92..2282299 100644
--- a/pom.xml
+++ b/pom.xml
@@ -682,9 +682,8 @@
                                 <source>1.7</source>
                                 <links>
                                     <link>http://download.oracle.com/javase/6/docs/api/</link>
-                                    <link>http://static.springsource.org/spring/docs/3.0.x/javadoc-api/</link>
+                                    <link>http://docs.spring.io/autorepo/docs/spring-framework/4.2.x/javadoc-api/</link>
                                     <link>http://www2.osgi.org/javadoc/r4/</link>
-                                    <link>http://asm.objectweb.org/asm223/javadoc/user</link>
                                     <link>http://cglib.sourceforge.net/apidocs</link>
                                     <!--<link>http://logging.apache.org/log4j/docs/api/</link>-->
                                     <link>http://jakarta.apache.org/commons/logging/apidocs/</link>

test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties

diff --git a/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties b/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties
index 87e099e..ce2f092 100644
--- a/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties
+++ b/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties
@@ -25,7 +25,7 @@
 ignore.asm.version=2.2.3
 
 # groupIds
-ignore.spring.groupId=org.apache.servicemix.bundles
+ignore.servicemix.bundles.groupId=org.apache.servicemix.bundles
 ignore.gemini.blueprint.groupId=org.eclipse.gemini.blueprint
 ignore.slf4j.groupId=org.slf4j
 ignore.logback.groupId=ch.qos.logback
@@ -45,17 +45,18 @@
 ${ignore.logback.groupId},logback-classic,${ignore.logback.version}=
 
 # aop alliance
-org.aopalliance,com.springsource.org.aopalliance,1.0.0=
+${ignore.servicemix.bundles.groupId},${ignore.servicemix.bundles.groupId}.aopalliance,1.0_6=
+
 # asm
 org.objectweb.asm,com.springsource.org.objectweb.asm,${ignore.asm.version}=
 
 # spring libs
-${ignore.spring.groupId},${ignore.spring.groupId}.spring-beans,${ignore.spring.version}=
-${ignore.spring.groupId},${ignore.spring.groupId}.spring-core,${ignore.spring.version}=
-${ignore.spring.groupId},${ignore.spring.groupId}.spring-context,${ignore.spring.version}=
-${ignore.spring.groupId},${ignore.spring.groupId}.spring-expression,${ignore.spring.version}=
-${ignore.spring.groupId},${ignore.spring.groupId}.spring-aop,${ignore.spring.version}=
-${ignore.spring.groupId},${ignore.spring.groupId}.spring-test,${ignore.spring.version}=
+${ignore.servicemix.bundles.groupId},${ignore.servicemix.bundles.groupId}.spring-beans,${ignore.spring.version}=
+${ignore.servicemix.bundles.groupId},${ignore.servicemix.bundles.groupId}.spring-core,${ignore.spring.version}=
+${ignore.servicemix.bundles.groupId},${ignore.servicemix.bundles.groupId}.spring-context,${ignore.spring.version}=
+${ignore.servicemix.bundles.groupId},${ignore.servicemix.bundles.groupId}.spring-expression,${ignore.spring.version}=
+${ignore.servicemix.bundles.groupId},${ignore.servicemix.bundles.groupId}.spring-aop,${ignore.spring.version}=
+${ignore.servicemix.bundles.groupId},${ignore.servicemix.bundles.groupId}.spring-test,${ignore.spring.version}=
 
 # gemini blueprint libs
 ${ignore.gemini.blueprint.groupId},gemini-blueprint-io,${ignore.gemini.blueprint.version}=