Repository: incubator-tamaya-extensions Updated Branches: refs/heads/master e81a819cc -> e81f0df35
Introduced a property called tamaya-apicore.version to decouple the used version of Tamaya API&Core from the version of the Tamaya Extensions project. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/e81f0df3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/e81f0df3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/e81f0df3 Branch: refs/heads/master Commit: e81f0df3552fb7a96c11c3c55640a205a39d3811 Parents: e81a819 Author: Oliver B. Fischer <[email protected]> Authored: Mon Jul 3 22:32:18 2017 +0200 Committer: Oliver B. Fischer <[email protected]> Committed: Mon Jul 3 22:32:18 2017 +0200 ---------------------------------------------------------------------- distribution/pom.xml | 14 +++++++------- examples/01-resources-example/pom.xml | 2 +- examples/02-resolver-example/pom.xml | 2 +- examples/03-injection-example/pom.xml | 2 +- examples/04-events-example/pom.xml | 2 +- modules/events/pom.xml | 4 ++-- modules/features/pom.xml | 4 ++-- modules/filter/pom.xml | 4 ++-- modules/formats/base/pom.xml | 4 ++-- modules/formats/json/pom.xml | 4 ++-- modules/formats/yaml/pom.xml | 4 ++-- modules/functions/pom.xml | 4 ++-- modules/injection/cdi/pom.xml | 4 ++-- modules/injection/injection-api/pom.xml | 2 +- modules/injection/standalone/pom.xml | 4 ++-- modules/jndi/pom.xml | 4 ++-- modules/mutable-config/pom.xml | 4 ++-- modules/optional/pom.xml | 4 ++-- modules/resolver/pom.xml | 4 ++-- modules/resources/pom.xml | 4 ++-- modules/spi-support/pom.xml | 4 ++-- modules/spring/pom.xml | 4 ++-- pom.xml | 7 +++++-- 23 files changed, 49 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index e9d96ed..9e006f1 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -40,7 +40,7 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-docs</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <classifier>documentation</classifier> <type>zip</type> </dependency> @@ -49,36 +49,36 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> </dependency> <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <classifier>sources</classifier> </dependency> <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <classifier>javadoc</classifier> </dependency> <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> </dependency> <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <classifier>sources</classifier> </dependency> <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <classifier>javadoc</classifier> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/examples/01-resources-example/pom.xml ---------------------------------------------------------------------- diff --git a/examples/01-resources-example/pom.xml b/examples/01-resources-example/pom.xml index 4e1af44..f71d542 100644 --- a/examples/01-resources-example/pom.xml +++ b/examples/01-resources-example/pom.xml @@ -38,7 +38,7 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> </dependency> <dependency> <groupId>org.apache.tamaya.ext</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/examples/02-resolver-example/pom.xml ---------------------------------------------------------------------- diff --git a/examples/02-resolver-example/pom.xml b/examples/02-resolver-example/pom.xml index e242a77..b2bb703 100644 --- a/examples/02-resolver-example/pom.xml +++ b/examples/02-resolver-example/pom.xml @@ -36,7 +36,7 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> </dependency> <dependency> <groupId>org.apache.tamaya.ext</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/examples/03-injection-example/pom.xml ---------------------------------------------------------------------- diff --git a/examples/03-injection-example/pom.xml b/examples/03-injection-example/pom.xml index 258cd54..0fba95d 100644 --- a/examples/03-injection-example/pom.xml +++ b/examples/03-injection-example/pom.xml @@ -42,7 +42,7 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> </dependency> <dependency> <groupId>org.apache.tamaya.ext</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/examples/04-events-example/pom.xml ---------------------------------------------------------------------- diff --git a/examples/04-events-example/pom.xml b/examples/04-events-example/pom.xml index e736f7b..2ad79eb 100644 --- a/examples/04-events-example/pom.xml +++ b/examples/04-events-example/pom.xml @@ -46,7 +46,7 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> </dependency> <dependency> <groupId>org.apache.tamaya.ext</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/modules/events/pom.xml ---------------------------------------------------------------------- diff --git a/modules/events/pom.xml b/modules/events/pom.xml index b29d680..02a6512 100644 --- a/modules/events/pom.xml +++ b/modules/events/pom.xml @@ -40,7 +40,7 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> </dependency> <dependency> <groupId>org.apache.tamaya.ext</groupId> @@ -55,7 +55,7 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>runtime</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/modules/features/pom.xml ---------------------------------------------------------------------- diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 30677d2..399dfd1 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -40,13 +40,13 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/modules/filter/pom.xml ---------------------------------------------------------------------- diff --git a/modules/filter/pom.xml b/modules/filter/pom.xml index 1317396..2c1f588 100644 --- a/modules/filter/pom.xml +++ b/modules/filter/pom.xml @@ -40,13 +40,13 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/modules/formats/base/pom.xml ---------------------------------------------------------------------- diff --git a/modules/formats/base/pom.xml b/modules/formats/base/pom.xml index 4a492fe..f2560e6 100644 --- a/modules/formats/base/pom.xml +++ b/modules/formats/base/pom.xml @@ -40,7 +40,7 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -62,7 +62,7 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/modules/formats/json/pom.xml ---------------------------------------------------------------------- diff --git a/modules/formats/json/pom.xml b/modules/formats/json/pom.xml index f7967f8..3c88904 100644 --- a/modules/formats/json/pom.xml +++ b/modules/formats/json/pom.xml @@ -42,14 +42,14 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/modules/formats/yaml/pom.xml ---------------------------------------------------------------------- diff --git a/modules/formats/yaml/pom.xml b/modules/formats/yaml/pom.xml index 31a7fe5..744116b 100644 --- a/modules/formats/yaml/pom.xml +++ b/modules/formats/yaml/pom.xml @@ -43,14 +43,14 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/modules/functions/pom.xml ---------------------------------------------------------------------- diff --git a/modules/functions/pom.xml b/modules/functions/pom.xml index b9f8bd1..57952a3 100644 --- a/modules/functions/pom.xml +++ b/modules/functions/pom.xml @@ -40,13 +40,13 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> </dependency> <!-- Test scope only, do not create a code dependency! --> <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/modules/injection/cdi/pom.xml ---------------------------------------------------------------------- diff --git a/modules/injection/cdi/pom.xml b/modules/injection/cdi/pom.xml index a0415b1..0254268 100644 --- a/modules/injection/cdi/pom.xml +++ b/modules/injection/cdi/pom.xml @@ -74,13 +74,13 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/modules/injection/injection-api/pom.xml ---------------------------------------------------------------------- diff --git a/modules/injection/injection-api/pom.xml b/modules/injection/injection-api/pom.xml index de4cfdb..d47a9ba 100644 --- a/modules/injection/injection-api/pom.xml +++ b/modules/injection/injection-api/pom.xml @@ -42,7 +42,7 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/modules/injection/standalone/pom.xml ---------------------------------------------------------------------- diff --git a/modules/injection/standalone/pom.xml b/modules/injection/standalone/pom.xml index cb911c4..0433c91 100644 --- a/modules/injection/standalone/pom.xml +++ b/modules/injection/standalone/pom.xml @@ -40,7 +40,7 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -51,7 +51,7 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/modules/jndi/pom.xml ---------------------------------------------------------------------- diff --git a/modules/jndi/pom.xml b/modules/jndi/pom.xml index 2416356..433629b 100644 --- a/modules/jndi/pom.xml +++ b/modules/jndi/pom.xml @@ -40,13 +40,13 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/modules/mutable-config/pom.xml ---------------------------------------------------------------------- diff --git a/modules/mutable-config/pom.xml b/modules/mutable-config/pom.xml index ca7962d..19a222a 100644 --- a/modules/mutable-config/pom.xml +++ b/modules/mutable-config/pom.xml @@ -40,7 +40,7 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> </dependency> <dependency> <groupId>org.apache.tamaya.ext</groupId> @@ -55,7 +55,7 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>runtime</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/modules/optional/pom.xml ---------------------------------------------------------------------- diff --git a/modules/optional/pom.xml b/modules/optional/pom.xml index 6ab12b3..54078b8 100644 --- a/modules/optional/pom.xml +++ b/modules/optional/pom.xml @@ -43,14 +43,14 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>provided</scope> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>provided</scope> <optional>true</optional> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/modules/resolver/pom.xml ---------------------------------------------------------------------- diff --git a/modules/resolver/pom.xml b/modules/resolver/pom.xml index ec80a62..313e178 100644 --- a/modules/resolver/pom.xml +++ b/modules/resolver/pom.xml @@ -40,12 +40,12 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> </dependency> <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/modules/resources/pom.xml ---------------------------------------------------------------------- diff --git a/modules/resources/pom.xml b/modules/resources/pom.xml index 5ee1432..619dc5e 100644 --- a/modules/resources/pom.xml +++ b/modules/resources/pom.xml @@ -40,12 +40,12 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> </dependency> <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/modules/spi-support/pom.xml ---------------------------------------------------------------------- diff --git a/modules/spi-support/pom.xml b/modules/spi-support/pom.xml index ab8d927..11ed46b 100644 --- a/modules/spi-support/pom.xml +++ b/modules/spi-support/pom.xml @@ -42,13 +42,13 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> </dependency> <!-- Test scope only, do not create a code dependency! --> <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/modules/spring/pom.xml ---------------------------------------------------------------------- diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml index e3f4ed0..e7085c8 100644 --- a/modules/spring/pom.xml +++ b/modules/spring/pom.xml @@ -51,13 +51,13 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/e81f0df3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c6b3951..f46635b 100644 --- a/pom.xml +++ b/pom.xml @@ -48,6 +48,9 @@ under the License. </prerequisites> <properties> + <!-- Used version of Tamaya API&Core --> + <tamaya-apicore.version>0.3-incubating-SNAPSHOT</tamaya-apicore.version> + <commons-io.version>2.5</commons-io.version> <findbugs.skip>false</findbugs.skip> <jdkVersion>1.7</jdkVersion> @@ -390,7 +393,7 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>buildconfigurations</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> </dependency> <dependency> <groupId>com.puppycrawl.tools</groupId> @@ -442,7 +445,7 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>buildconfigurations</artifactId> - <version>${project.version}</version> + <version>${tamaya-apicore.version}</version> </dependency> </dependencies> </plugin>
