You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by pi...@apache.org on 2012/05/22 10:51:20 UTC
svn commit: r1341356 - /karaf/trunk/assemblies/features/spring/pom.xml
Author: pieber
Date: Tue May 22 08:51:20 2012
New Revision: 1341356
URL: http://svn.apache.org/viewvc?rev=1341356&view=rev
Log:
[RX-1390] Make sure that non-available springsource artifacts do not break the build
Signed-off-by: Andreas Pieber <an...@gmail.com>
Modified:
karaf/trunk/assemblies/features/spring/pom.xml
Modified: karaf/trunk/assemblies/features/spring/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/spring/pom.xml?rev=1341356&r1=1341355&r2=1341356&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/spring/pom.xml (original)
+++ karaf/trunk/assemblies/features/spring/pom.xml Tue May 22 08:51:20 2012
@@ -167,6 +167,14 @@
<groupId>org.springframework</groupId>
<artifactId>org.springframework.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>com.springsource.javax.servlet</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.aopalliance</groupId>
+ <artifactId>com.springsource.org.aopalliance</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -264,6 +272,12 @@
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>com.springsource.javax.servlet</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>