You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/01/26 09:55:56 UTC
svn commit: r1236083 - in /camel/trunk: components/camel-shiro/pom.xml
parent/pom.xml platforms/karaf/features/src/main/resources/features.xml
Author: davsclaus
Date: Thu Jan 26 08:55:56 2012
New Revision: 1236083
URL: http://svn.apache.org/viewvc?rev=1236083&view=rev
Log:
CAMEL-4943: Upgraded to Shrio 1.2.0
Modified:
camel/trunk/components/camel-shiro/pom.xml
camel/trunk/parent/pom.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=1236083&r1=1236082&r2=1236083&view=diff
==============================================================================
--- camel/trunk/components/camel-shiro/pom.xml (original)
+++ camel/trunk/components/camel-shiro/pom.xml Thu Jan 26 08:55:56 2012
@@ -40,9 +40,9 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.shiro</artifactId>
- <version>${shiro-bundle-version}</version>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>${shiro-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=1236083&r1=1236082&r2=1236083&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Jan 26 08:55:56 2012
@@ -141,7 +141,7 @@
<scala-version>2.9.1</scala-version>
<scala-plugin-version>2.15.2</scala-plugin-version>
<servicemix-specs-version>1.9.0</servicemix-specs-version>
- <shiro-bundle-version>1.1.0_2</shiro-bundle-version>
+ <shiro-version>1.2.0</shiro-version>
<slf4j-version>1.6.1</slf4j-version>
<smack-version>3.2.1</smack-version>
<snmp4j-version>1.8.1_5</snmp4j-version>
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=1236083&r1=1236082&r2=1236083&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu Jan 26 08:55:56 2012
@@ -596,7 +596,7 @@
<feature name='camel-shiro' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.shiro/${shiro-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.shiro/shiro-core/${shiro-version}</bundle>
<bundle>mvn:org.apache.camel/camel-shiro/${project.version}</bundle>
</feature>
<feature name='camel-smpp' version='${project.version}' resolver='(obr)' start-level='50'>