You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by ac...@apache.org on 2019/11/12 19:29:32 UTC
[incubator-tamaya-extensions] branch PrepareForNextDevIteration
created (now 829ad9f)
This is an automated email from the ASF dual-hosted git repository.
acoburn pushed a change to branch PrepareForNextDevIteration
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-extensions.git.
at 829ad9f Prepare for next development iteration
This branch includes the following new commits:
new 829ad9f Prepare for next development iteration
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-tamaya-extensions] 01/01: Prepare for next development
iteration
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acoburn pushed a commit to branch PrepareForNextDevIteration
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-extensions.git
commit 829ad9ff1314919e966a52d3d49efa53b1de2c9b
Author: Aaron Coburn <ac...@apache.org>
AuthorDate: Tue Nov 12 14:29:16 2019 -0500
Prepare for next development iteration
---
distribution/pom.xml | 4 +-
examples/01-resources-example/pom.xml | 5 +-
examples/02-resolver-example/pom.xml | 2 +-
examples/03-injection-example/pom.xml | 3 +-
examples/04-events-example/pom.xml | 2 +-
examples/05-spring-example/pom.xml | 2 +-
examples/06-distributed/pom.xml | 2 +-
examples/pom.xml | 2 +-
modules/collections/pom.xml | 2 +-
modules/consul/pom.xml | 2 +-
modules/etcd/pom.xml | 2 +-
modules/events/pom.xml | 2 +-
modules/features/pom.xml | 2 +-
modules/filter/pom.xml | 2 +-
modules/formats/base/pom.xml | 2 +-
modules/formats/hjson/pom.xml | 2 +-
modules/formats/hocon/pom.xml | 2 +-
modules/formats/json/pom.xml | 2 +-
modules/formats/pom.xml | 2 +-
modules/formats/yaml/pom.xml | 2 +-
modules/functions/pom.xml | 2 +-
modules/hazelcast/pom.xml | 2 +-
modules/injection/cdi/pom.xml | 2 +-
modules/injection/injection-api/pom.xml | 2 +-
modules/injection/pom.xml | 2 +-
modules/injection/standalone/pom.xml | 2 +-
modules/jndi/pom.xml | 2 +-
modules/microprofile/pom.xml | 2 +-
modules/mutable-config/pom.xml | 2 +-
modules/optional/pom.xml | 2 +-
modules/osgi/common/pom.xml | 2 +-
modules/osgi/gogo-shell/pom.xml | 2 +-
modules/osgi/injection/pom.xml | 2 +-
modules/osgi/karaf-features/pom.xml | 2 +-
.../karaf-features/src/main/features/features.xml | 90 +++++++++++-----------
modules/osgi/karaf-shell/pom.xml | 2 +-
modules/osgi/pom.xml | 2 +-
modules/osgi/updater/pom.xml | 2 +-
modules/pom.xml | 2 +-
modules/resolver/pom.xml | 2 +-
.../apache/tamaya/resolver/ManualSetupTest.java | 5 --
modules/resources/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
pom.xml | 4 +-
44 files changed, 90 insertions(+), 97 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 50a0827..f648204 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions-all</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-extension-distribution</artifactId>
@@ -46,7 +46,7 @@ under the License.
<url>
https://git-wip-us.apache.org/repos/asf?p=incubator-tamaya.git
</url>
- <tag>tamaya-0.4-incubating</tag>
+ <tag>HEAD</tag>
</scm>
<build>
diff --git a/examples/01-resources-example/pom.xml b/examples/01-resources-example/pom.xml
index 9274ab5..942447f 100644
--- a/examples/01-resources-example/pom.xml
+++ b/examples/01-resources-example/pom.xml
@@ -25,12 +25,11 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>01-resources-example</artifactId>
- <version>0.4-incubating</version>
<name>Apache Tamaya Resource Location Example</name>
<description>This project contains a simple example using the resource location module.</description>
@@ -64,4 +63,4 @@ under the License.
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/02-resolver-example/pom.xml b/examples/02-resolver-example/pom.xml
index 5495f55..10549e7 100644
--- a/examples/02-resolver-example/pom.xml
+++ b/examples/02-resolver-example/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/examples/03-injection-example/pom.xml b/examples/03-injection-example/pom.xml
index b300e3b..fd84704 100644
--- a/examples/03-injection-example/pom.xml
+++ b/examples/03-injection-example/pom.xml
@@ -25,12 +25,11 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>03-injection-example</artifactId>
- <version>0.4-incubating</version>
<name>Apache Tamaya Configuration Injection Example</name>
<description>This project contains a simple illustrating how configuration values can be injected.</description>
diff --git a/examples/04-events-example/pom.xml b/examples/04-events-example/pom.xml
index ab00208..99023d9 100644
--- a/examples/04-events-example/pom.xml
+++ b/examples/04-events-example/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/examples/05-spring-example/pom.xml b/examples/05-spring-example/pom.xml
index f9ea828..84e90fd 100644
--- a/examples/05-spring-example/pom.xml
+++ b/examples/05-spring-example/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>05-spring-example</artifactId>
diff --git a/examples/06-distributed/pom.xml b/examples/06-distributed/pom.xml
index b62c5fa..bfb670c 100644
--- a/examples/06-distributed/pom.xml
+++ b/examples/06-distributed/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>06-distributed-example</artifactId>
diff --git a/examples/pom.xml b/examples/pom.xml
index 44af539..0c73948 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions-all</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
diff --git a/modules/collections/pom.xml b/modules/collections/pom.xml
index e80ad46..0704c0f 100644
--- a/modules/collections/pom.xml
+++ b/modules/collections/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-collections</artifactId>
diff --git a/modules/consul/pom.xml b/modules/consul/pom.xml
index ff643b6..7c3f544 100644
--- a/modules/consul/pom.xml
+++ b/modules/consul/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-consul</artifactId>
diff --git a/modules/etcd/pom.xml b/modules/etcd/pom.xml
index 4c6d0b7..8fd124a 100644
--- a/modules/etcd/pom.xml
+++ b/modules/etcd/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-etcd</artifactId>
diff --git a/modules/events/pom.xml b/modules/events/pom.xml
index 444781b..3967445 100644
--- a/modules/events/pom.xml
+++ b/modules/events/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-events</artifactId>
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index 84ee408..1938e16 100644
--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-features</artifactId>
diff --git a/modules/filter/pom.xml b/modules/filter/pom.xml
index a23e49a..2fecac6 100644
--- a/modules/filter/pom.xml
+++ b/modules/filter/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-filter</artifactId>
diff --git a/modules/formats/base/pom.xml b/modules/formats/base/pom.xml
index fda97ed..768530b 100644
--- a/modules/formats/base/pom.xml
+++ b/modules/formats/base/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats-all</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/modules/formats/hjson/pom.xml b/modules/formats/hjson/pom.xml
index c26f801..accb90a 100644
--- a/modules/formats/hjson/pom.xml
+++ b/modules/formats/hjson/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats-all</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/modules/formats/hocon/pom.xml b/modules/formats/hocon/pom.xml
index 1a463cb..b7d94d9 100644
--- a/modules/formats/hocon/pom.xml
+++ b/modules/formats/hocon/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats-all</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/modules/formats/json/pom.xml b/modules/formats/json/pom.xml
index 7a2b7a6..fdf8e14 100644
--- a/modules/formats/json/pom.xml
+++ b/modules/formats/json/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats-all</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/modules/formats/pom.xml b/modules/formats/pom.xml
index 79a0e6e..1ed9f14 100644
--- a/modules/formats/pom.xml
+++ b/modules/formats/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-formats-all</artifactId>
diff --git a/modules/formats/yaml/pom.xml b/modules/formats/yaml/pom.xml
index 841bab4..3a03b5a 100644
--- a/modules/formats/yaml/pom.xml
+++ b/modules/formats/yaml/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats-all</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/modules/functions/pom.xml b/modules/functions/pom.xml
index 0647478..110a01b 100644
--- a/modules/functions/pom.xml
+++ b/modules/functions/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-functions</artifactId>
diff --git a/modules/hazelcast/pom.xml b/modules/hazelcast/pom.xml
index d63d9f9..d7a7100 100644
--- a/modules/hazelcast/pom.xml
+++ b/modules/hazelcast/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-hazelcast</artifactId>
diff --git a/modules/injection/cdi/pom.xml b/modules/injection/cdi/pom.xml
index f8e5271..2470f59 100644
--- a/modules/injection/cdi/pom.xml
+++ b/modules/injection/cdi/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-injection-all</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/modules/injection/injection-api/pom.xml b/modules/injection/injection-api/pom.xml
index b5ccffa..775c20f 100644
--- a/modules/injection/injection-api/pom.xml
+++ b/modules/injection/injection-api/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-injection-all</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/modules/injection/pom.xml b/modules/injection/pom.xml
index d202535..a0e7ba5 100644
--- a/modules/injection/pom.xml
+++ b/modules/injection/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-injection-all</artifactId>
diff --git a/modules/injection/standalone/pom.xml b/modules/injection/standalone/pom.xml
index 3c103f7..e0ba081 100644
--- a/modules/injection/standalone/pom.xml
+++ b/modules/injection/standalone/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-injection-all</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/modules/jndi/pom.xml b/modules/jndi/pom.xml
index 81de63b..48c05c5 100644
--- a/modules/jndi/pom.xml
+++ b/modules/jndi/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-jndi</artifactId>
diff --git a/modules/microprofile/pom.xml b/modules/microprofile/pom.xml
index e53ebae..f7054c8 100644
--- a/modules/microprofile/pom.xml
+++ b/modules/microprofile/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-microprofile</artifactId>
diff --git a/modules/mutable-config/pom.xml b/modules/mutable-config/pom.xml
index 5101945..93c3be3 100644
--- a/modules/mutable-config/pom.xml
+++ b/modules/mutable-config/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-mutable-config</artifactId>
diff --git a/modules/optional/pom.xml b/modules/optional/pom.xml
index 2f20b36..a24821e 100644
--- a/modules/optional/pom.xml
+++ b/modules/optional/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-optional</artifactId>
diff --git a/modules/osgi/common/pom.xml b/modules/osgi/common/pom.xml
index 2849b58..25f9e66 100644
--- a/modules/osgi/common/pom.xml
+++ b/modules/osgi/common/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-osgi-all</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-osgi</artifactId>
diff --git a/modules/osgi/gogo-shell/pom.xml b/modules/osgi/gogo-shell/pom.xml
index 3614439..2b30609 100644
--- a/modules/osgi/gogo-shell/pom.xml
+++ b/modules/osgi/gogo-shell/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-osgi-all</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-osgi-gogo-shell</artifactId>
diff --git a/modules/osgi/injection/pom.xml b/modules/osgi/injection/pom.xml
index 9ad078d..2a62150 100644
--- a/modules/osgi/injection/pom.xml
+++ b/modules/osgi/injection/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-osgi-all</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-osgi-injection</artifactId>
diff --git a/modules/osgi/karaf-features/pom.xml b/modules/osgi/karaf-features/pom.xml
index e399153..670b8b4 100644
--- a/modules/osgi/karaf-features/pom.xml
+++ b/modules/osgi/karaf-features/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-osgi-all</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-karaf-features</artifactId>
diff --git a/modules/osgi/karaf-features/src/main/features/features.xml b/modules/osgi/karaf-features/src/main/features/features.xml
index 34949b7..ba86cd6 100644
--- a/modules/osgi/karaf-features/src/main/features/features.xml
+++ b/modules/osgi/karaf-features/src/main/features/features.xml
@@ -16,69 +16,69 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" name="org-apache-tamaya-all">
- <features name="org-apache-tamaya-config" version="0.4-incubating">
- <features name="org-apache-tamaya-configadmin" version="0.4-incubating">
- <bundle>mvn:org.apache.tamaya.ext/tamaya-osgi_alpha/0.4-incubating/jar</bundle>
- <bundle>mvn:org.apache.tamaya.ext/tamaya-functions/0.4-incubating/jar</bundle>
- <bundle>mvn:org.apache.tamaya/tamaya-spisupport/0.4-incubating/jar</bundle>
- <bundle>mvn:org.apache.tamaya.ext/tamaya-osgi-karaf_alpha/0.4-incubating/jar</bundle>
- <features name="org-apache-tamaya-minimal" version="0.4-incubating">
- <feature name="org-apache-tamaya-api" version="0.4-incubating">
- <bundle>mvn:org.apache.tamaya/tamaya-api/0.4-incubating/jar</bundle>
+ <features name="org-apache-tamaya-config" version="${project.version}">
+ <features name="org-apache-tamaya-configadmin" version="${project.version}">
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-osgi_alpha/${project.version}/jar</bundle>
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-functions/${project.version}/jar</bundle>
+ <bundle>mvn:org.apache.tamaya/tamaya-spisupport/${project.version}/jar</bundle>
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-osgi-karaf_alpha/${project.version}/jar</bundle>
+ <features name="org-apache-tamaya-minimal" version="${project.version}">
+ <feature name="org-apache-tamaya-api" version="${project.version}">
+ <bundle>mvn:org.apache.tamaya/tamaya-api/${project.version}/jar</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.2_spec/1.0-alpha-1/jar</bundle>
</feature>
- <feature name="org-apache-tamaya-core" version="0.4-incubating">
- <bundle>mvn:org.apache.tamaya/tamaya-core/0.4-incubating/jar</bundle>
+ <feature name="org-apache-tamaya-core" version="${project.version}">
+ <bundle>mvn:org.apache.tamaya/tamaya-core/${project.version}/jar</bundle>
</feature>
</features>
</features>
- <features name="org-apache-tamaya-config-injection" version="0.4-incubating">
- <bundle>mvn:org.apache.tamaya.ext/tamaya-osgi-injection_alpha/0.4-incubating/jar</bundle>
- <bundle>mvn:org.apache.tamaya.ext/tamaya-injection-api/0.4-incubating/jar</bundle>
- <bundle>mvn:org.apache.tamaya.ext/tamaya-injection-se/0.4-incubating/jar</bundle>
+ <features name="org-apache-tamaya-config-injection" version="${project.version}">
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-osgi-injection_alpha/${project.version}/jar</bundle>
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-injection-api/${project.version}/jar</bundle>
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-injection-se/${project.version}/jar</bundle>
</features>
- <feature name="org-apache-tamaya-config-updater" version="0.4-incubating">
- <bundle>mvn:org.apache.tamaya.ext/tamaya-events/0.4-incubating/jar</bundle>
- <bundle>mvn:org.apache.tamaya.ext/tamaya-osgi-updater_alpha/0.4-incubating/jar</bundle>
+ <feature name="org-apache-tamaya-config-updater" version="${project.version}">
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-events/${project.version}/jar</bundle>
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-osgi-updater_alpha/${project.version}/jar</bundle>
</feature>
</features>
- <features name="org-apache-tamaya-formats" version="0.4-incubating">
- <bundle>mvn:org.apache.tamaya.ext/tamaya-formats/0.4-incubating/jar</bundle>
+ <features name="org-apache-tamaya-formats" version="${project.version}">
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-formats/${project.version}/jar</bundle>
</features>
- <features name="org-apache-tamaya-formats-json" version="0.4-incubating">
- <bundle>mvn:org.apache.tamaya.ext/tamaya-formats-json/0.4-incubating/jar</bundle>
+ <features name="org-apache-tamaya-formats-json" version="${project.version}">
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-formats-json/${project.version}/jar</bundle>
</features>
- <features name="org-apache-tamaya-formats-yaml" version="0.4-incubating">
- <bundle>mvn:org.apache.tamaya.ext/tamaya-formats-yaml/0.4-incubating/jar</bundle>
+ <features name="org-apache-tamaya-formats-yaml" version="${project.version}">
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-formats-yaml/${project.version}/jar</bundle>
</features>
- <features name="org-apache-tamaya-filter" version="0.4-incubating">
- <bundle>mvn:org.apache.tamaya.ext/tamaya-filter/0.4-incubating/jar</bundle>
+ <features name="org-apache-tamaya-filter" version="${project.version}">
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-filter/${project.version}/jar</bundle>
</features>
- <features name="org-apache-tamaya-resources" version="0.4-incubating">
- <bundle>mvn:org.apache.tamaya.ext/tamaya-resources/0.4-incubating/jar</bundle>
+ <features name="org-apache-tamaya-resources" version="${project.version}">
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-resources/${project.version}/jar</bundle>
</features>
- <features name="org-apache-tamaya-resolver" version="0.4-incubating">
- <bundle>mvn:org.apache.tamaya.ext/tamaya-resolver/0.4-incubating/jar</bundle>
+ <features name="org-apache-tamaya-resolver" version="${project.version}">
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-resolver/${project.version}/jar</bundle>
</features>
- <features name="org-apache-tamaya-mutable-config" version="0.4-incubating">
- <bundle>mvn:org.apache.tamaya.ext/tamaya-mutable-config/0.4-incubating/jar</bundle>
+ <features name="org-apache-tamaya-mutable-config" version="${project.version}">
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-mutable-config/${project.version}/jar</bundle>
</features>
- <features name="org-apache-tamaya-spring" version="0.4-incubating">
- <bundle>mvn:org.apache.tamaya.ext/tamaya-spring/0.4-incubating/jar</bundle>
+ <features name="org-apache-tamaya-spring" version="${project.version}">
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-spring/${project.version}/jar</bundle>
</features>
- <features name="org-apache-tamaya-optional" version="0.4-incubating">
- <bundle>mvn:org.apache.tamaya.ext/tamaya-optional/0.4-incubating/jar</bundle>
+ <features name="org-apache-tamaya-optional" version="${project.version}">
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-optional/${project.version}/jar</bundle>
</features>
- <features name="org-apache-tamaya-jndi" version="0.4-incubating">
- <bundle>mvn:org.apache.tamaya.ext/tamaya-jndi/0.4-incubating/jar</bundle>
+ <features name="org-apache-tamaya-jndi" version="${project.version}">
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-jndi/${project.version}/jar</bundle>
</features>
- <features name="org-apache-tamaya-features" version="0.4-incubating">
- <bundle>mvn:org.apache.tamaya.ext/tamaya-features/0.4-incubating/jar</bundle>
+ <features name="org-apache-tamaya-features" version="${project.version}">
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-features/${project.version}/jar</bundle>
</features>
- <features name="org-apache-tamaya-events" version="0.4-incubating">
- <bundle>mvn:org.apache.tamaya.ext/tamaya-events/0.4-incubating/jar</bundle>
+ <features name="org-apache-tamaya-events" version="${project.version}">
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-events/${project.version}/jar</bundle>
</features>
- <features name="org-apache-tamaya-uom" version="0.4-incubating">
- <bundle>mvn:org.apache.tamaya.ext/tamaya-uom/0.4-incubating/jar</bundle>
+ <features name="org-apache-tamaya-uom" version="${project.version}">
+ <bundle>mvn:org.apache.tamaya.ext/tamaya-uom/${project.version}/jar</bundle>
</features>
-</features>
\ No newline at end of file
+</features>
diff --git a/modules/osgi/karaf-shell/pom.xml b/modules/osgi/karaf-shell/pom.xml
index bf5c74b..20f1363 100644
--- a/modules/osgi/karaf-shell/pom.xml
+++ b/modules/osgi/karaf-shell/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-osgi-all</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-osgi-karaf-shell</artifactId>
diff --git a/modules/osgi/pom.xml b/modules/osgi/pom.xml
index f13d4c6..4c5d386 100644
--- a/modules/osgi/pom.xml
+++ b/modules/osgi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-osgi-all</artifactId>
diff --git a/modules/osgi/updater/pom.xml b/modules/osgi/updater/pom.xml
index d92c7c1..d9e6876 100644
--- a/modules/osgi/updater/pom.xml
+++ b/modules/osgi/updater/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-osgi-all</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-osgi-updater</artifactId>
diff --git a/modules/pom.xml b/modules/pom.xml
index 3e49b2d..c1d3fa7 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions-all</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-extensions</artifactId>
diff --git a/modules/resolver/pom.xml b/modules/resolver/pom.xml
index 518498d..c9f2c77 100644
--- a/modules/resolver/pom.xml
+++ b/modules/resolver/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-resolver</artifactId>
diff --git a/modules/resolver/src/test/java/org/apache/tamaya/resolver/ManualSetupTest.java b/modules/resolver/src/test/java/org/apache/tamaya/resolver/ManualSetupTest.java
index b08b236..b2ab10c 100644
--- a/modules/resolver/src/test/java/org/apache/tamaya/resolver/ManualSetupTest.java
+++ b/modules/resolver/src/test/java/org/apache/tamaya/resolver/ManualSetupTest.java
@@ -43,13 +43,8 @@ public class ManualSetupTest {
PropertyValue unfiltered = reolverFilter.filterProperty(PropertyValue.createValue("foo", "${url:cccabABabbaaaba}"), null);
assertThat(filtered).isNotNull();
assertThat(unfiltered).isNotNull();
-<<<<<<< HEAD
assertThat(filtered.getValue()).isNotNull().isEqualTo("CCCBBABBBBBBBBB");
assertThat(unfiltered.getValue()).isNotNull().isEqualTo("?{url:cccabABabbaaaba}");
-=======
- assertThat(filtered.getValue()).isEqualTo("CCCBBABBBBBBBBB");
- assertThat(unfiltered.getValue()).isEqualTo("?{url:cccabABabbaaaba}");
->>>>>>> release-0.4-incubating
}
private static final class CustomResolver implements ExpressionResolver{
diff --git a/modules/resources/pom.xml b/modules/resources/pom.xml
index a3c2a12..d3ee446 100644
--- a/modules/resources/pom.xml
+++ b/modules/resources/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-resources</artifactId>
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index d99752e..fc5ea66 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<artifactId>tamaya-extensions</artifactId>
<groupId>org.apache.tamaya.ext</groupId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-spring</artifactId>
diff --git a/pom.xml b/pom.xml
index 038c250..44045f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ under the License.
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions-all</artifactId>
- <version>0.4-incubating</version>
+ <version>0.5-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Tamaya Extensions</name>
@@ -85,7 +85,7 @@ under the License.
<!-- Dependencies for site generation -->
<reflow-skin.version>1.1.1</reflow-skin.version>
- <released_version>0.3-incubating</released_version>
+ <released_version>0.4-incubating</released_version>
<!-- API checker -->
<revapi-java.version>0.18.0</revapi-java.version>
<revapi.plugin.version>0.10.5</revapi.plugin.version>