You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/07/10 10:01:53 UTC

svn commit: r962784 - in /camel/trunk: parent/pom.xml platforms/karaf/features/src/main/resources/features.xml

Author: ningjiang
Date: Sat Jul 10 08:01:53 2010
New Revision: 962784

URL: http://svn.apache.org/viewvc?rev=962784&view=rev
Log:
CAMEL-2930 Upgrade to spring security 3.0.3

Modified:
    camel/trunk/parent/pom.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=962784&r1=962783&r2=962784&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sat Jul 10 08:01:53 2010
@@ -114,6 +114,7 @@
     <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
     <spring-version>3.0.3.RELEASE</spring-version>
     <spring-osgi-version>1.2.0</spring-osgi-version>
+    <spring-security-version>3.0.3.RELEASE</spring-security-version>
     <stax-api-version>1.0.1</stax-api-version>
     <stringtemplate-version>3.0</stringtemplate-version>
     <tagsoup-version>1.2</tagsoup-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=962784&r1=962783&r2=962784&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sat Jul 10 08:01:53 2010
@@ -498,6 +498,12 @@
     <bundle>mvn:org.springframework/spring-test/${spring3-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-spring-javaconfig/${pom.version}</bundle>
   </feature>
+  <feature name='camel-spring-security' version='${pom.version}'>
+    <feature version='${pom.version}'>camel-spring</feature>
+    <bundle>mvn:org.springframework.security/spring-security-core/${spring-security-version}</bundle>
+    <bundle>mvn:org.springframework.security/spring-security-config/${spring-security-version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-spring-security/${pom.version}</bundle>
+  </feature>
   <feature name='camel-sql' version='${pom.version}'>
     <bundle>mvn:org.springframework/spring-tx/${spring3-version}</bundle>
     <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>