You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/06/28 14:24:28 UTC
svn commit: r1354975 - in /karaf/trunk/assemblies/features:
enterprise/pom.xml spring/pom.xml standard/pom.xml
Author: jbonofre
Date: Thu Jun 28 12:24:27 2012
New Revision: 1354975
URL: http://svn.apache.org/viewvc?rev=1354975&view=rev
Log:
Fix features pom to avoid duplicate dependencies declaration
Modified:
karaf/trunk/assemblies/features/enterprise/pom.xml
karaf/trunk/assemblies/features/spring/pom.xml
karaf/trunk/assemblies/features/standard/pom.xml
Modified: karaf/trunk/assemblies/features/enterprise/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/enterprise/pom.xml?rev=1354975&r1=1354974&r2=1354975&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/enterprise/pom.xml (original)
+++ karaf/trunk/assemblies/features/enterprise/pom.xml Thu Jun 28 12:24:27 2012
@@ -67,12 +67,6 @@
<!-- jpa deps -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>${geronimo.jta-spec.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<version>${geronimo.jpa-spec.version}</version>
<scope>provided</scope>
@@ -110,12 +104,6 @@
<!-- jndi deps -->
<dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <version>${aries.util.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
<version>${aries.jndi.api.version}</version>
@@ -256,4 +244,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: karaf/trunk/assemblies/features/spring/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/spring/pom.xml?rev=1354975&r1=1354974&r2=1354975&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/spring/pom.xml (original)
+++ karaf/trunk/assemblies/features/spring/pom.xml Thu Jun 28 12:24:27 2012
@@ -97,12 +97,6 @@
<version>${spring.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.karaf.deployer</groupId>
- <artifactId>org.apache.karaf.deployer.spring</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
<!-- spring-aspects deps -->
<dependency>
@@ -213,12 +207,6 @@
<version>${spring.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>${spring.version}</version>
- <scope>provided</scope>
- </dependency>
<!-- spring-struts deps -->
<dependency>
Modified: karaf/trunk/assemblies/features/standard/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/pom.xml?rev=1354975&r1=1354974&r2=1354975&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/pom.xml (original)
+++ karaf/trunk/assemblies/features/standard/pom.xml Thu Jun 28 12:24:27 2012
@@ -582,12 +582,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
<version>${jasypt.bundle.version}</version>
@@ -603,12 +597,6 @@
<!-- scr deps -->
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.metatype</artifactId>
- <version>${felix.metatype.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<version>${felix.scr.version}</version>
<scope>provided</scope>