Author: cmueller
Date: Fri Jan 13 17:47:30 2012
New Revision: 1231206
URL: http://svn.apache.org/viewvc?rev=1231206&view=rev
Log:
CAMEL-4886: Upgrade Spring Security 3.0.7.RELEASE -> 3.1.0.RELEASE
Modified:
camel/trunk/components/camel-spring-security/pom.xml
camel/trunk/examples/camel-example-spring-security/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-spring-security/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-security/pom.xml?rev=1231206&r1=1231205&r2=1231206&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-security/pom.xml (original)
+++ camel/trunk/components/camel-spring-security/pom.xml Fri Jan 13 17:47:30
2012
@@ -66,6 +66,12 @@
<artifactId>spring-security-config</artifactId>
<version>${spring-security-version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
+ <!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
@@ -81,6 +87,7 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
+
</dependencies>
<build>
Modified: camel/trunk/examples/camel-example-spring-security/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-security/pom.xml?rev=1231206&r1=1231205&r2=1231206&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-security/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring-security/pom.xml Fri Jan 13
17:47:30 2012
@@ -33,33 +33,27 @@
<description>An example showing how to work with Camel and Spring
Security</description>
<dependencies>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-security</artifactId>
</dependency>
-
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>${spring-security-version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-servlet</artifactId>
</dependency>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
-
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1231206&r1=1231205&r2=1231206&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Jan 13 17:47:30 2012
@@ -149,7 +149,7 @@
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
<spring-version>3.0.7.RELEASE</spring-version>
<spring-osgi-version>1.2.1</spring-osgi-version>
- <spring-security-version>3.0.7.RELEASE</spring-security-version>
+ <spring-security-version>3.1.0.RELEASE</spring-security-version>
<spring-ws-version>2.0.3.RELEASE</spring-ws-version>
<spymemcached-version>2.5</spymemcached-version>
<stax-api-version>1.0.1</stax-api-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=1231206&r1=1231205&r2=1231206&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Fri
Jan 13 17:47:30 2012
@@ -636,8 +636,10 @@
</feature>
<feature name='camel-spring-security' version='${project.version}'
resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-spring</feature>
+ <feature version='[3,4)'>spring-web</feature>
<bundle
dependency='true'>mvn:org.springframework.security/spring-security-core/${spring-security-version}</bundle>
<bundle
dependency='true'>mvn:org.springframework.security/spring-security-config/${spring-security-version}</bundle>
+ <bundle
dependency='true'>mvn:org.springframework.security/spring-security-web/${spring-security-version}</bundle>
<bundle>mvn:org.apache.camel/camel-spring-security/${project.version}</bundle>
</feature>
<feature name='camel-spring-ws' version='${project.version}'
resolver='(obr)' start-level='50'>
