TAMAYA-300 Simplified dependencies.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/c990e961 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/c990e961 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/c990e961 Branch: refs/heads/master Commit: c990e961142fa66cb50a020217da3c84684546c1 Parents: 9d8fe86 Author: Anatole Tresch <anat...@apache.org> Authored: Sun Oct 1 14:24:11 2017 +0200 Committer: Anatole Tresch <anat...@apache.org> Committed: Sun Oct 1 14:24:11 2017 +0200 ---------------------------------------------------------------------- osgi/common/pom.xml | 67 +------------------ osgi/gogo-shell/pom.xml | 10 +-- osgi/karaf-shell/pom.xml | 17 +---- osgi/pom.xml | 148 ------------------------------------------ osgi/updater/pom.xml | 15 +---- 5 files changed, 7 insertions(+), 250 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/c990e961/osgi/common/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/common/pom.xml b/osgi/common/pom.xml index fd4d8db..a166929 100644 --- a/osgi/common/pom.xml +++ b/osgi/common/pom.xml @@ -27,7 +27,7 @@ <version>0.4-incubating-SNAPSHOT</version> </parent> - <artifactId>tamaya-osgi_alpha</artifactId> + <artifactId>tamaya-osgi</artifactId> <packaging>jar</packaging> <name>Apache Tamaya :: OSGi :: ConfigurationPlugin</name> <description>Tamaya Based OSGI ConfigurationPlugin Implementation</description> @@ -35,12 +35,6 @@ <properties> <osgi.config.version>1.5.0</osgi.config.version> <osgi.tracker.version>1.5.1</osgi.tracker.version> - - <pax.exam.version>4.9.2</pax.exam.version> - <pax.url.version>2.5.2</pax.url.version> - <slf4j.version>1.6.6</slf4j.version> - <mockito.version>1.9.5</mockito.version> - <atinject.version>1.0</atinject.version> </properties> <dependencies> @@ -58,10 +52,6 @@ </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-atinject_1.0_spec</artifactId> - </dependency> - <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> <version>${project.parent.version}</version> @@ -96,61 +86,6 @@ <artifactId>mockito-core</artifactId> </dependency> - <!-- OSGI Testing --> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-container-karaf</artifactId> - <version>${pax.exam.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-junit4</artifactId> - <version>${pax.exam.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-link-mvn</artifactId> - <version>${pax.exam.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-aether</artifactId> - <version>${pax.url.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.tinybundles</groupId> - <artifactId>tinybundles</artifactId> - <version>2.1.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.framework</artifactId> - <version>5.6.8</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.configadmin</artifactId> - <version>1.8.16</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - <version>1.2.3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>1.2.3</version> - <scope>test</scope> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/c990e961/osgi/gogo-shell/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/gogo-shell/pom.xml b/osgi/gogo-shell/pom.xml index 2b7bb7d..ba9fa64 100644 --- a/osgi/gogo-shell/pom.xml +++ b/osgi/gogo-shell/pom.xml @@ -27,7 +27,7 @@ <version>0.4-incubating-SNAPSHOT</version> </parent> - <artifactId>tamaya-osgi-gogo-shell_alpha</artifactId> + <artifactId>tamaya-osgi-gogo-shell</artifactId> <packaging>jar</packaging> <name>Apache Tamaya :: OSGI :: Gogo :: Shell</name> <description>Tamaya Gogo Shell Commands</description> @@ -35,7 +35,7 @@ <dependencies> <dependency> <groupId>org.apache.tamaya.ext</groupId> - <artifactId>tamaya-osgi_alpha</artifactId> + <artifactId>tamaya-osgi</artifactId> <version>${project.parent.version}</version> </dependency> <dependency> @@ -46,18 +46,12 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.gogo.runtime</artifactId> <version>1.0.8</version> </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.scr.annotations</artifactId> - <version>1.12.0</version> - </dependency> <!-- Testing --> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/c990e961/osgi/karaf-shell/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/karaf-shell/pom.xml b/osgi/karaf-shell/pom.xml index a11a1a5..119b264 100644 --- a/osgi/karaf-shell/pom.xml +++ b/osgi/karaf-shell/pom.xml @@ -27,7 +27,7 @@ <version>0.4-incubating-SNAPSHOT</version> </parent> - <artifactId>tamaya-osgi-karaf-shell_alpha</artifactId> + <artifactId>tamaya-osgi-karaf-shell</artifactId> <packaging>jar</packaging> <name>Apache Tamaya :: OSGI :: Karaf :: Shell</name> <description>Tamaya Karaf Shell Commands</description> @@ -35,18 +35,16 @@ <dependencies> <dependency> <groupId>org.apache.tamaya.ext</groupId> - <artifactId>tamaya-osgi_alpha</artifactId> + <artifactId>tamaya-osgi</artifactId> <version>${project.parent.version}</version> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.compendium</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.karaf.shell</groupId> @@ -60,17 +58,6 @@ <version>${dependency.karaf.version}</version> <scope>provided</scope> </dependency> - - - <!-- Testing --> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>java-hamcrest</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/c990e961/osgi/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/pom.xml b/osgi/pom.xml index 9f0edf9..40ba101 100644 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@ -37,19 +37,12 @@ <osgi.config.version>1.5.0</osgi.config.version> <osgi.tracker.version>1.5.1</osgi.tracker.version> - <dependency.pax.exam.version>4.7.0</dependency.pax.exam.version> - <dependency.paxurl.version>2.5.2</dependency.paxurl.version> - <dependency.pax.logging.version>1.8.4</dependency.pax.logging.version> - <dependency.swissbox.version>1.8.2</dependency.swissbox.version> - <dependency.tinybundles.version>2.1.1</dependency.tinybundles.version> <dependency.base.version>1.5.0</dependency.base.version> - <dependency.slf4j.version>1.6.6</dependency.slf4j.version> <dependency.mockito.version>1.9.5</dependency.mockito.version> <dependency.asm.version>3.0</dependency.asm.version> <dependency.atinject.version>1.0</dependency.atinject.version> <dependency.karaf.version>4.0.7</dependency.karaf.version> <dependency.felix.version>5.6.1</dependency.felix.version> - <!-- 1.0.8 and higher require slf4j 1.7 --> <dependency.logback.version>1.0.7</dependency.logback.version> </properties> @@ -99,150 +92,9 @@ <version>${osgi.tracker.version}</version> <scope>provided</scope> </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>${dependency.mockito.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam</artifactId> - <version>${dependency.pax.exam.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-junit4</artifactId> - <version>${dependency.pax.exam.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-container-native</artifactId> - <version>${dependency.pax.exam.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-container-forked</artifactId> - <version>${dependency.pax.exam.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-container-karaf</artifactId> - <version>${dependency.pax.exam.version}</version> - <scope>test</scope> - </dependency> - <!-- URL Handlers are runtime artifacts. --> - <dependency> - <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-aether</artifactId> - <version>${dependency.paxurl.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-reference</artifactId> - <version>${dependency.paxurl.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-classpath</artifactId> - <version>${dependency.paxurl.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-assembly</artifactId> - <version>${dependency.paxurl.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-wrap</artifactId> - <version>${dependency.paxurl.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-link</artifactId> - <version>${dependency.paxurl.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-mvn</artifactId> - <version>${dependency.paxurl.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-link-mvn</artifactId> - <version>4.9.2</version> - <scope>test</scope> - </dependency> - - - <dependency> - <groupId>org.kohsuke.metainf-services</groupId> - <artifactId>metainf-services</artifactId> - <version>1.2</version> - </dependency> - - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-atinject_1.0_spec</artifactId> - <version>${dependency.atinject.version}</version> - </dependency> - - <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-core</artifactId> - <version>${dependency.swissbox.version}</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-extender</artifactId> - <version>${dependency.swissbox.version}</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-optional-jcl</artifactId> - <version>${dependency.swissbox.version}</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-property</artifactId> - <version>${dependency.swissbox.version}</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-tracker</artifactId> - <version>${dependency.swissbox.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.framework</artifactId> - <version>${dependency.felix.version}</version> - <scope>test</scope> - </dependency> </dependencies> </dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.tamaya</groupId> - <artifactId>tamaya-api</artifactId> - <version>0.4-incubating-SNAPSHOT</version> - </dependency> - </dependencies> - <modules> <module>common</module> <module>updater</module> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/c990e961/osgi/updater/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/updater/pom.xml b/osgi/updater/pom.xml index fed3f46..18d5370 100644 --- a/osgi/updater/pom.xml +++ b/osgi/updater/pom.xml @@ -27,7 +27,7 @@ <version>0.4-incubating-SNAPSHOT</version> </parent> - <artifactId>tamaya-osgi-updater_alpha</artifactId> + <artifactId>tamaya-osgi-updater</artifactId> <packaging>jar</packaging> <name>Apache Tamaya :: OSGi :: Updater</name> <description>Tamaya Based OSGI Updater to propagate Tamaya changes to OSGI.</description> @@ -36,24 +36,13 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.compendium</artifactId> - <scope>provided</scope> </dependency> - <!--<dependency>--> - <!--<groupId>org.osgi</groupId>--> - <!--<artifactId>org.osgi.util.tracker</artifactId>--> - <!--<scope>provided</scope>--> - <!--</dependency>--> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-atinject_1.0_spec</artifactId> - </dependency> - <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> <version>${project.parent.version}</version> @@ -80,7 +69,7 @@ </dependency> <dependency> <groupId>org.apache.tamaya.ext</groupId> - <artifactId>tamaya-osgi_alpha</artifactId> + <artifactId>tamaya-osgi</artifactId> <version>${project.parent.version}</version> </dependency>
