Author: davsclaus
Date: Tue Dec 14 13:23:19 2010
New Revision: 1049076
URL: http://svn.apache.org/viewvc?rev=1049076&view=rev
Log:
CAMEL-3412: Upgrade to SMX bundle. Thanks to Jean for patch.
Modified:
camel/trunk/components/camel-shiro/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-shiro/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-shiro/pom.xml?rev=1049076&r1=1049075&r2=1049076&view=diff
==============================================================================
--- camel/trunk/components/camel-shiro/pom.xml (original)
+++ camel/trunk/components/camel-shiro/pom.xml Tue Dec 14 13:23:19 2010
@@ -22,9 +22,9 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- <version>${shiro-version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+
<artifactId>org.apache.servicemix.bundles.shiro</artifactId>
+ <version>${shiro-bundle-version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1049076&r1=1049075&r2=1049076&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Dec 14 13:23:19 2010
@@ -121,7 +121,7 @@
<scala-version>2.8.0</scala-version>
<scala-plugin-version>2.14.1</scala-plugin-version>
<servicemix-specs-version>1.6.0</servicemix-specs-version>
- <shiro-version>1.0.0-incubating</shiro-version>
+ <shiro-bundle-version>1.1.0_1</shiro-bundle-version>
<slf4j-version>1.6.1</slf4j-version>
<smack-version>3.1.0</smack-version>
<snmp4j-version>1.8.1_3</snmp4j-version>
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml?rev=1049076&r1=1049075&r2=1049076&view=diff
==============================================================================
---
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
(original)
+++
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
Tue Dec 14 13:23:19 2010
@@ -510,8 +510,9 @@
</feature>
<feature name='camel-shiro' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>wrap:mvn:https://repository.apache.org!org.apache.shiro/shiro-core/${shiro-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-shiro/${pom.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.shiro/${shiro-bundle-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-shiro/${pom.version}</bundle>
</feature>
<feature name='camel-smpp' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1049076&r1=1049075&r2=1049076&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Dec 14 13:23:19 2010
@@ -513,8 +513,9 @@
</feature>
<feature name='camel-shiro' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>wrap:mvn:https://repository.apache.org!org.apache.shiro/shiro-core/${shiro-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-shiro/${pom.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.shiro/${shiro-bundle-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-shiro/${pom.version}</bundle>
</feature>
<feature name='camel-smpp' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
