Repository: karaf Updated Branches: refs/heads/master ee4faef99 -> 23f06718d
Cleanup dependencies sets Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/eaf4d10a Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/eaf4d10a Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/eaf4d10a Branch: refs/heads/master Commit: eaf4d10aa9540c544edb2ef4505e2164fd47a50b Parents: 9641529 Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon Apr 27 08:07:08 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Apr 27 08:07:08 2015 +0200 ---------------------------------------------------------------------- assemblies/features/enterprise/pom.xml | 10 ----- assemblies/features/spring/pom.xml | 5 --- assemblies/features/standard/pom.xml | 43 ------------------- demos/deployer/kar/pom.xml | 1 + itests/pom.xml | 1 + pom.xml | 66 ----------------------------- 6 files changed, 2 insertions(+), 124 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/eaf4d10a/assemblies/features/enterprise/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/enterprise/pom.xml b/assemblies/features/enterprise/pom.xml index e16fc29..6f61bab 100644 --- a/assemblies/features/enterprise/pom.xml +++ b/assemblies/features/enterprise/pom.xml @@ -49,11 +49,6 @@ <!-- transaction deps --> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.1_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.apache.aries.transaction</groupId> <artifactId>org.apache.aries.transaction.blueprint</artifactId> <scope>provided</scope> @@ -66,11 +61,6 @@ <!-- jpa deps --> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_2.0_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.apache.aries</groupId> <artifactId>org.apache.aries.util</artifactId> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/karaf/blob/eaf4d10a/assemblies/features/spring/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/spring/pom.xml b/assemblies/features/spring/pom.xml index 12fe37d..0edc26c 100644 --- a/assemblies/features/spring/pom.xml +++ b/assemblies/features/spring/pom.xml @@ -58,11 +58,6 @@ <!-- spring-dm deps --> <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.cglib</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.springframework.osgi</groupId> <artifactId>spring-osgi-io</artifactId> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/karaf/blob/eaf4d10a/assemblies/features/standard/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml index 9882490..79d03eb 100644 --- a/assemblies/features/standard/pom.xml +++ b/assemblies/features/standard/pom.xml @@ -116,11 +116,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-jexl</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-all</artifactId> <scope>provided</scope> @@ -135,16 +130,6 @@ <!-- obr deps --> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.osgi.service.obr</artifactId> <scope>provided</scope> @@ -189,21 +174,6 @@ <artifactId>mail</artifactId> <scope>provided</scope> </dependency> - <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-annotation_1.1_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jaspic_1.0_spec</artifactId> - <scope>provided</scope> - </dependency> <!-- package deps --> <dependency> @@ -390,11 +360,6 @@ <!-- jasypt-encryption deps --> <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.jasypt</artifactId> <scope>provided</scope> @@ -421,14 +386,6 @@ <artifactId>org.apache.karaf.scr.management</artifactId> <scope>provided</scope> </dependency> - - <!-- jolokia --> - <dependency> - <groupId>org.jolokia</groupId> - <artifactId>jolokia-osgi</artifactId> - <version>${jolokia.version}</version> - <scope>provided</scope> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/karaf/blob/eaf4d10a/demos/deployer/kar/pom.xml ---------------------------------------------------------------------- diff --git a/demos/deployer/kar/pom.xml b/demos/deployer/kar/pom.xml index 5903c01..a36a544 100644 --- a/demos/deployer/kar/pom.xml +++ b/demos/deployer/kar/pom.xml @@ -38,6 +38,7 @@ <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> + <version>${commons-collections.version}</version> <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/karaf/blob/eaf4d10a/itests/pom.xml ---------------------------------------------------------------------- diff --git a/itests/pom.xml b/itests/pom.xml index 3a2f74c..055a58d 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -81,6 +81,7 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-atinject_1.0_spec</artifactId> + <version>1.0</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/karaf/blob/eaf4d10a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 57be45c..7b0f306 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,6 @@ <commons-collections.version>3.2.1</commons-collections.version> <commons-dbcp.version>1.4</commons-dbcp.version> <commons-fileupload.version>1.3.1</commons-fileupload.version> - <commons-io.version>2.4</commons-io.version> <commons-jexl.version>2.1.1</commons-jexl.version> <commons-lang.version>2.6</commons-lang.version> <commons-pool.version>1.6</commons-pool.version> @@ -152,9 +151,6 @@ <geronimo.jms-spec.version>1.1.1</geronimo.jms-spec.version> <geronimo.jpa-spec.version>1.1</geronimo.jpa-spec.version> <geronimo.jta-spec.version>1.1.1</geronimo.jta-spec.version> - <geronimo.annotation-spec.version>1.0.1</geronimo.annotation-spec.version> - <geronimo.atinject-spec.version>1.0</geronimo.atinject-spec.version> - <geronimo.jaspic-spec.version>1.1</geronimo.jaspic-spec.version> <easymock.version>3.2</easymock.version> <equinox.groupId>org.eclipse.birt.runtime</equinox.groupId> <equinox.artifactId>org.eclipse.osgi</equinox.artifactId> @@ -823,12 +819,6 @@ </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>${commons-beanutils.version}</version> - </dependency> - - <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> <version>${javax.mail.version}</version> @@ -1123,34 +1113,9 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.1_spec</artifactId> - <version>${geronimo.annotation-spec.version}</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-atinject_1.0_spec</artifactId> - <version>${geronimo.atinject-spec.version}</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jaspic_1.0_spec</artifactId> - <version>${geronimo.jaspic-spec.version}</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> <version>${geronimo.jms-spec.version}</version> </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_2.0_spec</artifactId> - <version>${geronimo.jpa-spec.version}</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>${geronimo.jta-spec.version}</version> - </dependency> <dependency> <groupId>log4j</groupId> @@ -1698,26 +1663,6 @@ <version>${jsw.version}</version> </dependency> <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>${commons-codec.version}</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>${commons-collections.version}</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>${commons-lang.version}</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>${commons-io.version}</version> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> <version>${commons-compress.version}</version> @@ -1736,20 +1681,9 @@ </dependency> <dependency> <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.cglib</artifactId> - <version>${cglib.bundle.version}</version> - </dependency> - <dependency> - <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.jasypt</artifactId> <version>${jasypt.bundle.version}</version> </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-jexl</artifactId> - <version>${commons-jexl.version}</version> - </dependency> </dependencies> </dependencyManagement>
