Repository: karaf Updated Branches: refs/heads/master 25fd0234a -> 9641529c1
Dependency cleanup Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9641529c Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9641529c Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9641529c Branch: refs/heads/master Commit: 9641529c1dc8cf457020ec95fa9f052b845e021f Parents: 25fd023 Author: Jean-Baptiste Onofré <[email protected]> Authored: Sun Apr 26 21:17:33 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sun Apr 26 21:17:33 2015 +0200 ---------------------------------------------------------------------- assemblies/features/spring/pom.xml | 147 -------------------------------- bundle/springstate/pom.xml | 1 + pom.xml | 107 ----------------------- 3 files changed, 1 insertion(+), 254 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/9641529c/assemblies/features/spring/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/spring/pom.xml b/assemblies/features/spring/pom.xml index 7d7f877..12fe37d 100644 --- a/assemblies/features/spring/pom.xml +++ b/assemblies/features/spring/pom.xml @@ -56,56 +56,6 @@ <scope>provided</scope> </dependency> - <!-- spring deps --> - <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-expression</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> - <scope>provided</scope> - </dependency> - - <!-- spring-aspects deps --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aspects</artifactId> - <scope>provided</scope> - </dependency> - <!-- spring-dm deps --> <dependency> <groupId>org.apache.servicemix.bundles</groupId> @@ -164,103 +114,6 @@ </exclusions> </dependency> - <!-- spring-instrument deps --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-instrument</artifactId> - <scope>provided</scope> - </dependency> - - <!-- spring-jdbc deps --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jdbc</artifactId> - <scope>provided</scope> - </dependency> - - <!-- spring-jms deps --> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.1_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jms</artifactId> - <scope>provided</scope> - </dependency> - - <!-- spring-struts deps --> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-struts</artifactId> - <scope>provided</scope> - </dependency> - - <!-- spring-test deps --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <scope>provided</scope> - </dependency> - - <!-- spring-orm deps --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-orm</artifactId> - <scope>provided</scope> - </dependency> - - <!-- spring-oxm deps --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-oxm</artifactId> - <scope>provided</scope> - </dependency> - - <!-- spring-tx deps --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-tx</artifactId> - <scope>provided</scope> - </dependency> - - <!-- spring-web deps --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>com.springsource.javax.servlet</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-webmvc</artifactId> - <scope>provided</scope> - </dependency> - - <!-- spring-web-portlet deps --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-webmvc-portlet</artifactId> - <scope>provided</scope> - </dependency> - <!-- gemini-blueprint deps --> <dependency> <groupId>org.eclipse.gemini</groupId> http://git-wip-us.apache.org/repos/asf/karaf/blob/9641529c/bundle/springstate/pom.xml ---------------------------------------------------------------------- diff --git a/bundle/springstate/pom.xml b/bundle/springstate/pom.xml index 699e0e6..036c27b 100644 --- a/bundle/springstate/pom.xml +++ b/bundle/springstate/pom.xml @@ -63,6 +63,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> + <version>${spring31.version}</version> </dependency> <dependency> <groupId>org.springframework.osgi</groupId> http://git-wip-us.apache.org/repos/asf/karaf/blob/9641529c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index bff28ad..57be45c 100644 --- a/pom.xml +++ b/pom.xml @@ -1031,108 +1031,6 @@ </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> - <version>${spring31.version}</version> - <exclusions> - <exclusion> - <groupId>org.aopalliance</groupId> - <artifactId>com.springsource.org.aopalliance</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - <version>${spring31.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aspects</artifactId> - <version>${spring31.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${spring31.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>${spring31.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${spring31.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> - <version>${spring31.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-expression</artifactId> - <version>${spring31.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-instrument</artifactId> - <version>${spring31.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jdbc</artifactId> - <version>${spring31.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jms</artifactId> - <version>${spring31.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-orm</artifactId> - <version>${spring31.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-oxm</artifactId> - <version>${spring31.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-struts</artifactId> - <version>${spring31.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${spring31.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-tx</artifactId> - <version>${spring31.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>${spring31.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-webmvc</artifactId> - <version>${spring31.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-webmvc-portlet</artifactId> - <version>${spring31.version}</version> - </dependency> - - <dependency> <groupId>org.springframework.osgi</groupId> <artifactId>spring-osgi-core</artifactId> <version>${spring.osgi.version}</version> @@ -1838,11 +1736,6 @@ </dependency> <dependency> <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId> - <version>${aopalliance.bundle.version}</version> - </dependency> - <dependency> - <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.cglib</artifactId> <version>${cglib.bundle.version}</version> </dependency>
