TAMAYA-408 Preparing release.
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 6754987..cd8b6f2 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-extension-distribution</artifactId>
diff --git a/examples/01-resources-example/pom.xml b/examples/01-resources-example/pom.xml
index 2f8693c..146ede6 100644
--- a/examples/01-resources-example/pom.xml
+++ b/examples/01-resources-example/pom.xml
@@ -25,12 +25,12 @@
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
<artifactId>01-resources-example</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <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>
diff --git a/examples/02-resolver-example/pom.xml b/examples/02-resolver-example/pom.xml
index 60b98e5..17b6789 100644
--- a/examples/02-resolver-example/pom.xml
+++ b/examples/02-resolver-example/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
diff --git a/examples/03-injection-example/pom.xml b/examples/03-injection-example/pom.xml
index 03e3099..949bef6 100644
--- a/examples/03-injection-example/pom.xml
+++ b/examples/03-injection-example/pom.xml
@@ -25,12 +25,12 @@
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
<artifactId>03-injection-example</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <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 12bc5ee..dbd35d5 100644
--- a/examples/04-events-example/pom.xml
+++ b/examples/04-events-example/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
diff --git a/examples/05-spring-example/pom.xml b/examples/05-spring-example/pom.xml
index ef7b4a7..34206dd 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-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>05-spring-example</artifactId>
diff --git a/examples/06-distributed/pom.xml b/examples/06-distributed/pom.xml
index 9909cc4..b0ef758 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-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>06-distributed-example</artifactId>
diff --git a/examples/pom.xml b/examples/pom.xml
index 87de37f..44af539 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
diff --git a/modules/collections/pom.xml b/modules/collections/pom.xml
index 1cb5b12..e80ad46 100644
--- a/modules/collections/pom.xml
+++ b/modules/collections/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-collections</artifactId>
diff --git a/modules/consul/pom.xml b/modules/consul/pom.xml
index 39fe23c..ff643b6 100644
--- a/modules/consul/pom.xml
+++ b/modules/consul/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-consul</artifactId>
diff --git a/modules/etcd/pom.xml b/modules/etcd/pom.xml
index 28c805e..4c6d0b7 100644
--- a/modules/etcd/pom.xml
+++ b/modules/etcd/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-etcd</artifactId>
diff --git a/modules/events/pom.xml b/modules/events/pom.xml
index 9577c0c..b566b9a 100644
--- a/modules/events/pom.xml
+++ b/modules/events/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-events</artifactId>
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index 0badfc6..c7d1d7a 100644
--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-features</artifactId>
diff --git a/modules/filter/pom.xml b/modules/filter/pom.xml
index dddd6ab..0a1ec37 100644
--- a/modules/filter/pom.xml
+++ b/modules/filter/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-filter</artifactId>
diff --git a/modules/formats/base/pom.xml b/modules/formats/base/pom.xml
index 329b64b..83388d2 100644
--- a/modules/formats/base/pom.xml
+++ b/modules/formats/base/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
diff --git a/modules/formats/hjson/pom.xml b/modules/formats/hjson/pom.xml
index a520417..c26f801 100644
--- a/modules/formats/hjson/pom.xml
+++ b/modules/formats/hjson/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
diff --git a/modules/formats/hocon/pom.xml b/modules/formats/hocon/pom.xml
index 41e7f7e..406f856 100644
--- a/modules/formats/hocon/pom.xml
+++ b/modules/formats/hocon/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
diff --git a/modules/formats/json/pom.xml b/modules/formats/json/pom.xml
index 3ca7d5d..b55dd0b 100644
--- a/modules/formats/json/pom.xml
+++ b/modules/formats/json/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
diff --git a/modules/formats/pom.xml b/modules/formats/pom.xml
index d35a3ba..79a0e6e 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-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-formats-all</artifactId>
diff --git a/modules/formats/yaml/pom.xml b/modules/formats/yaml/pom.xml
index a70cf8a..ab76efd 100644
--- a/modules/formats/yaml/pom.xml
+++ b/modules/formats/yaml/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
diff --git a/modules/functions/pom.xml b/modules/functions/pom.xml
index 9ac5332..8df4037 100644
--- a/modules/functions/pom.xml
+++ b/modules/functions/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-functions</artifactId>
diff --git a/modules/hazelcast/pom.xml b/modules/hazelcast/pom.xml
index 336c711..d63d9f9 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-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-hazelcast</artifactId>
diff --git a/modules/injection/cdi/pom.xml b/modules/injection/cdi/pom.xml
index 0eb0e8a..857d2dc 100644
--- a/modules/injection/cdi/pom.xml
+++ b/modules/injection/cdi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-injection-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
diff --git a/modules/injection/injection-api/pom.xml b/modules/injection/injection-api/pom.xml
index e7e1918..dcdd616 100644
--- a/modules/injection/injection-api/pom.xml
+++ b/modules/injection/injection-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-injection-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
diff --git a/modules/injection/pom.xml b/modules/injection/pom.xml
index d30e3f7..d202535 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-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-injection-all</artifactId>
diff --git a/modules/injection/standalone/pom.xml b/modules/injection/standalone/pom.xml
index 62a98f6..5a69991 100644
--- a/modules/injection/standalone/pom.xml
+++ b/modules/injection/standalone/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-injection-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<relativePath>..</relativePath>
</parent>
diff --git a/modules/jndi/pom.xml b/modules/jndi/pom.xml
index c75375d..8b7f5c7 100644
--- a/modules/jndi/pom.xml
+++ b/modules/jndi/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-jndi</artifactId>
diff --git a/modules/microprofile/pom.xml b/modules/microprofile/pom.xml
index 491a49a..6bd1477 100644
--- a/modules/microprofile/pom.xml
+++ b/modules/microprofile/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-microprofile</artifactId>
diff --git a/modules/mutable-config/pom.xml b/modules/mutable-config/pom.xml
index f9fe497..96b30e7 100644
--- a/modules/mutable-config/pom.xml
+++ b/modules/mutable-config/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-mutable-config</artifactId>
diff --git a/modules/optional/pom.xml b/modules/optional/pom.xml
index da78259..659154a 100644
--- a/modules/optional/pom.xml
+++ b/modules/optional/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-optional</artifactId>
diff --git a/modules/osgi/common/pom.xml b/modules/osgi/common/pom.xml
index d946337..2849b58 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-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-osgi</artifactId>
diff --git a/modules/osgi/gogo-shell/pom.xml b/modules/osgi/gogo-shell/pom.xml
index b43d30f..3614439 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-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-osgi-gogo-shell</artifactId>
diff --git a/modules/osgi/injection/pom.xml b/modules/osgi/injection/pom.xml
index 256a244..9ad078d 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-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-osgi-injection</artifactId>
diff --git a/modules/osgi/karaf-features/pom.xml b/modules/osgi/karaf-features/pom.xml
index 8d8c2d4..e399153 100644
--- a/modules/osgi/karaf-features/pom.xml
+++ b/modules/osgi/karaf-features/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-osgi-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-karaf-features</artifactId>
diff --git a/modules/osgi/karaf-shell/pom.xml b/modules/osgi/karaf-shell/pom.xml
index 119b264..bf5c74b 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-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-osgi-karaf-shell</artifactId>
diff --git a/modules/osgi/pom.xml b/modules/osgi/pom.xml
index 1f604cd..f13d4c6 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-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-osgi-all</artifactId>
diff --git a/modules/osgi/updater/pom.xml b/modules/osgi/updater/pom.xml
index 8622676..d92c7c1 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-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-osgi-updater</artifactId>
diff --git a/modules/pom.xml b/modules/pom.xml
index 8481905..3e49b2d 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-extensions</artifactId>
diff --git a/modules/resolver/pom.xml b/modules/resolver/pom.xml
index b5d7fcc..8b05147 100644
--- a/modules/resolver/pom.xml
+++ b/modules/resolver/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</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 7b06541..d8f323f 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
@@ -27,8 +27,8 @@
import java.util.Arrays;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
+
/**
* Creates and test a manual filter setup using a custom resolver.
@@ -40,12 +40,11 @@
ExpressionEvaluator evaluator = new DefaultExpressionEvaluator(Arrays.asList(new CustomResolver()));
ExpressionResolutionFilter reolverFilter = new ExpressionResolutionFilter(evaluator);
PropertyValue filtered = reolverFilter.filterProperty(PropertyValue.createValue("foo", "${foo:cccabABabbaaaba}"), null);
- assertNotNull(filtered);
PropertyValue unfiltered = reolverFilter.filterProperty(PropertyValue.createValue("foo", "${url:cccabABabbaaaba}"), null);
- assertNotNull(filtered);
- assertEquals("CCCBBABBBBBBBBB", filtered.getValue());
- assertNotNull(unfiltered);
- assertEquals("?{url:cccabABabbaaaba}", unfiltered.getValue());
+ assertThat(filtered).isNotNull();
+ assertThat(unfiltered).isNotNull();
+ assertThat(filtered.getValue()).isEqualTo("CCCBBABBBBBBBBB");
+ assertThat(unfiltered.getValue()).isEqualTo("?{url:cccabABabbaaaba}");
}
private static final class CustomResolver implements ExpressionResolver{
diff --git a/modules/resources/pom.xml b/modules/resources/pom.xml
index 70403a9..10bc82d 100644
--- a/modules/resources/pom.xml
+++ b/modules/resources/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-resources</artifactId>
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index 3a7aecf..6dd06f2 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>tamaya-extensions</artifactId>
<groupId>org.apache.tamaya.ext</groupId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
</parent>
<artifactId>tamaya-spring</artifactId>
diff --git a/pom.xml b/pom.xml
index a8da550..1db00f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions-all</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.4-incubating</version>
<packaging>pom</packaging>
<name>Apache Tamaya Extensions</name>
