svn commit: r633551 - in /activemq/camel/trunk: apache-camel/pom.xml components/camel-osgi/pom.xml components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java

[ha...@apache.org]

Author: hadrian
Date: Tue Mar  4 09:09:04 2008
New Revision: 633551

URL: http://svn.apache.org/viewvc?rev=633551&view=rev
Log:
Update shade and spring-osgi versions.

Modified:
    activemq/camel/trunk/apache-camel/pom.xml
    activemq/camel/trunk/components/camel-osgi/pom.xml
    activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java

Modified: activemq/camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/pom.xml?rev=633551&r1=633550&r2=633551&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/pom.xml (original)
+++ activemq/camel/trunk/apache-camel/pom.xml Tue Mar  4 09:09:04 2008
@@ -35,7 +35,7 @@
   <properties>
     <maven.test.skip>true</maven.test.skip>
     <createSourcesJar>false</createSourcesJar>
-    <shade.version>1.0-beta-1</shade.version>
+    <shade.version>1.0</shade.version>
   </properties>
 
 

Modified: activemq/camel/trunk/components/camel-osgi/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/pom.xml?rev=633551&r1=633550&r2=633551&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-osgi/pom.xml (original)
+++ activemq/camel/trunk/components/camel-osgi/pom.xml Tue Mar  4 09:09:04 2008
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>org.springframework.osgi</groupId>
       <artifactId>spring-osgi-core</artifactId>
-      <version>1.0-m3</version>
+      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
@@ -100,11 +100,6 @@
   </dependencies>
 
   <repositories>
-    <repository>
-      <id>i21-s3-maven-repo</id>
-      <name>i21 S3 milestone repo</name>
-      <url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
-    </repository>
     <repository>
       <id>spring.osgi</id>
       <url>http://static.springframework.org/maven2</url>

Modified: activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java?rev=633551&r1=633550&r2=633551&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java (original)
+++ activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java Tue Mar  4 09:09:04 2008
@@ -32,7 +32,7 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleEvent;
 import org.osgi.framework.SynchronousBundleListener;
-import org.springframework.osgi.internal.context.support.BundleDelegatingClassLoader;
+import org.springframework.osgi.util.BundleDelegatingClassLoader;
 
 /**
  * Created by IntelliJ IDEA.