You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2017/08/08 22:23:29 UTC
[1/4] incubator-tamaya-extensions git commit: TAMAYA-274: Moved to
Java 8, set version to 0.4-incubating-SNAPSHOT
Repository: incubator-tamaya-extensions
Updated Branches:
refs/heads/java8 5cb0e696e -> 72c37c5c1
TAMAYA-274: Moved to Java 8, set version to 0.4-incubating-SNAPSHOT
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/70edbf97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/70edbf97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/70edbf97
Branch: refs/heads/java8
Commit: 70edbf9727abc2f9dcd214fd47a3ee3dda33e411
Parents: 5cb0e69
Author: anatole <an...@apache.org>
Authored: Tue Aug 8 21:44:52 2017 +0200
Committer: anatole <an...@apache.org>
Committed: Tue Aug 8 21:44:52 2017 +0200
----------------------------------------------------------------------
distribution/pom.xml | 2 +-
examples/01-resources-example/pom.xml | 4 ++--
examples/02-resolver-example/pom.xml | 2 +-
examples/03-injection-example/pom.xml | 4 ++--
examples/04-events-example/pom.xml | 2 +-
examples/pom.xml | 4 ++--
modules/events/pom.xml | 2 +-
modules/features/pom.xml | 2 +-
modules/filter/pom.xml | 2 +-
modules/formats/base/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/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/mutable-config/pom.xml | 2 +-
modules/optional/pom.xml | 2 +-
modules/pom.xml | 2 +-
modules/resolver/pom.xml | 2 +-
modules/resources/pom.xml | 2 +-
modules/spi-support/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index a28bf93..61ecda0 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/examples/01-resources-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/01-resources-example/pom.xml b/examples/01-resources-example/pom.xml
index f71d542..e8a269c 100644
--- a/examples/01-resources-example/pom.xml
+++ b/examples/01-resources-example/pom.xml
@@ -25,11 +25,11 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<artifactId>01-resources-example</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<name>Apache Tamaya Resource Location Example</name>
<description>This project contains a simple example using the resource location module.</description>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/examples/02-resolver-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/02-resolver-example/pom.xml b/examples/02-resolver-example/pom.xml
index b2bb703..fd97227 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<artifactId>02-resolver-example</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/examples/03-injection-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/03-injection-example/pom.xml b/examples/03-injection-example/pom.xml
index 0fba95d..d647359 100644
--- a/examples/03-injection-example/pom.xml
+++ b/examples/03-injection-example/pom.xml
@@ -25,11 +25,11 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<artifactId>03-injection-example</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<name>Apache Tamaya Configuration Injection Example</name>
<description>This project contains a simple illustrating how configuration values can be injected.</description>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/examples/04-events-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/04-events-example/pom.xml b/examples/04-events-example/pom.xml
index 2ad79eb..b6addcc 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<artifactId>04-events-example</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index c332fbb..7a1c73f 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -25,12 +25,12 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions-all</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.tamaya.ext.examples</groupId>
<artifactId>examples</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<name>Apache Tamaya Extensions Examples</name>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/events/pom.xml
----------------------------------------------------------------------
diff --git a/modules/events/pom.xml b/modules/events/pom.xml
index 02a6512..a9fd9ac 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-events</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/features/pom.xml
----------------------------------------------------------------------
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index 399dfd1..ca1b8c3 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-features</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/filter/pom.xml
----------------------------------------------------------------------
diff --git a/modules/filter/pom.xml b/modules/filter/pom.xml
index 2c1f588..bc8a4d6 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-filter</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/formats/base/pom.xml
----------------------------------------------------------------------
diff --git a/modules/formats/base/pom.xml b/modules/formats/base/pom.xml
index f2560e6..8e5ff74 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/formats/json/pom.xml
----------------------------------------------------------------------
diff --git a/modules/formats/json/pom.xml b/modules/formats/json/pom.xml
index 3c88904..0cacc56 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/formats/pom.xml
----------------------------------------------------------------------
diff --git a/modules/formats/pom.xml b/modules/formats/pom.xml
index 472187d..9853c55 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/formats/yaml/pom.xml
----------------------------------------------------------------------
diff --git a/modules/formats/yaml/pom.xml b/modules/formats/yaml/pom.xml
index 744116b..431c574 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/functions/pom.xml
----------------------------------------------------------------------
diff --git a/modules/functions/pom.xml b/modules/functions/pom.xml
index 57952a3..5c90633 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/injection/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/injection/cdi/pom.xml b/modules/injection/cdi/pom.xml
index 0254268..b3ca6d6 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/injection/injection-api/pom.xml
----------------------------------------------------------------------
diff --git a/modules/injection/injection-api/pom.xml b/modules/injection/injection-api/pom.xml
index d47a9ba..925db07 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/injection/pom.xml
----------------------------------------------------------------------
diff --git a/modules/injection/pom.xml b/modules/injection/pom.xml
index 3b45a85..9cf6c7f 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/injection/standalone/pom.xml
----------------------------------------------------------------------
diff --git a/modules/injection/standalone/pom.xml b/modules/injection/standalone/pom.xml
index 0433c91..aacc143 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/jndi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jndi/pom.xml b/modules/jndi/pom.xml
index 433629b..c4e4e0e 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-jndi</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/mutable-config/pom.xml
----------------------------------------------------------------------
diff --git a/modules/mutable-config/pom.xml b/modules/mutable-config/pom.xml
index 19a222a..740420e 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/optional/pom.xml
----------------------------------------------------------------------
diff --git a/modules/optional/pom.xml b/modules/optional/pom.xml
index 54078b8..8d8a163 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/pom.xml
----------------------------------------------------------------------
diff --git a/modules/pom.xml b/modules/pom.xml
index 621ef44..95feb73 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/resolver/pom.xml
----------------------------------------------------------------------
diff --git a/modules/resolver/pom.xml b/modules/resolver/pom.xml
index 313e178..b5e0bc7 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/resources/pom.xml
----------------------------------------------------------------------
diff --git a/modules/resources/pom.xml b/modules/resources/pom.xml
index 619dc5e..514dc90 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/spi-support/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spi-support/pom.xml b/modules/spi-support/pom.xml
index 11ed46b..5e7b083 100644
--- a/modules/spi-support/pom.xml
+++ b/modules/spi-support/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index e7085c8..b3a4e1a 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.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-spring</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/70edbf97/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c506628..529aace 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions-all</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Tamaya Extensions</name>
[3/4] incubator-tamaya-extensions git commit: TAMAYA-274: Simplified
compiler settings, set version to 0.4-incubating-SNAPSHOT
Posted by an...@apache.org.
TAMAYA-274: Simplified compiler settings, set version to 0.4-incubating-SNAPSHOT
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/1d1cf72e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/1d1cf72e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/1d1cf72e
Branch: refs/heads/java8
Commit: 1d1cf72ef18e95980602807e6d4f1e939c90a7d2
Parents: 0d13b0e
Author: anatole <an...@apache.org>
Authored: Wed Aug 9 00:21:01 2017 +0200
Committer: anatole <an...@apache.org>
Committed: Wed Aug 9 00:21:01 2017 +0200
----------------------------------------------------------------------
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 | 1 -
modules/functions/pom.xml | 4 ----
modules/injection/injection-api/pom.xml | 1 -
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 ----
pom.xml | 9 ++++-----
16 files changed, 4 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/events/pom.xml
----------------------------------------------------------------------
diff --git a/modules/events/pom.xml b/modules/events/pom.xml
index a9fd9ac..3ef6ff7 100644
--- a/modules/events/pom.xml
+++ b/modules/events/pom.xml
@@ -32,10 +32,6 @@ under the License.
<name>Apache Tamaya Event and dynamic Update Extensions</name>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/features/pom.xml
----------------------------------------------------------------------
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index ca1b8c3..6f15c0f 100644
--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@@ -32,10 +32,6 @@ under the License.
<name>Apache Tamaya Feature Check</name>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/filter/pom.xml
----------------------------------------------------------------------
diff --git a/modules/filter/pom.xml b/modules/filter/pom.xml
index bc8a4d6..4cf2bd6 100644
--- a/modules/filter/pom.xml
+++ b/modules/filter/pom.xml
@@ -32,10 +32,6 @@ under the License.
<name>Apache Tamaya Adaptive Configuration Filtering</name>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/formats/base/pom.xml
----------------------------------------------------------------------
diff --git a/modules/formats/base/pom.xml b/modules/formats/base/pom.xml
index 8e5ff74..aa2c660 100644
--- a/modules/formats/base/pom.xml
+++ b/modules/formats/base/pom.xml
@@ -32,10 +32,6 @@ under the License.
<name>Apache Tamaya Modules Formats Common</name>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/formats/json/pom.xml
----------------------------------------------------------------------
diff --git a/modules/formats/json/pom.xml b/modules/formats/json/pom.xml
index 0cacc56..5f807c5 100644
--- a/modules/formats/json/pom.xml
+++ b/modules/formats/json/pom.xml
@@ -34,10 +34,6 @@ under the License.
<packaging>jar</packaging>
<inceptionYear>2015</inceptionYear>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/formats/yaml/pom.xml
----------------------------------------------------------------------
diff --git a/modules/formats/yaml/pom.xml b/modules/formats/yaml/pom.xml
index 431c574..d5448f3 100644
--- a/modules/formats/yaml/pom.xml
+++ b/modules/formats/yaml/pom.xml
@@ -35,7 +35,6 @@ under the License.
<inceptionYear>2016</inceptionYear>
<properties>
- <jdkVersion>1.7</jdkVersion>
<snakeyaml.version>1.17</snakeyaml.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/functions/pom.xml
----------------------------------------------------------------------
diff --git a/modules/functions/pom.xml b/modules/functions/pom.xml
index 5c90633..957f3a3 100644
--- a/modules/functions/pom.xml
+++ b/modules/functions/pom.xml
@@ -32,10 +32,6 @@ under the License.
<name>Apache Tamaya Modules - Common Functional Extensions</name>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/injection/injection-api/pom.xml
----------------------------------------------------------------------
diff --git a/modules/injection/injection-api/pom.xml b/modules/injection/injection-api/pom.xml
index 925db07..b5fab8d 100644
--- a/modules/injection/injection-api/pom.xml
+++ b/modules/injection/injection-api/pom.xml
@@ -33,7 +33,6 @@ under the License.
<packaging>jar</packaging>
<properties>
- <jdkVersion>1.7</jdkVersion>
<geronimo-atinject-1.0-spec.version>1.0</geronimo-atinject-1.0-spec.version>
<geronimo-jcdi-1.1-spec.version>1.0</geronimo-jcdi-1.1-spec.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/injection/standalone/pom.xml
----------------------------------------------------------------------
diff --git a/modules/injection/standalone/pom.xml b/modules/injection/standalone/pom.xml
index aacc143..66ad0ac 100644
--- a/modules/injection/standalone/pom.xml
+++ b/modules/injection/standalone/pom.xml
@@ -32,10 +32,6 @@ under the License.
<name>Apache Tamaya Modules - Injection Standalone</name>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/jndi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jndi/pom.xml b/modules/jndi/pom.xml
index c4e4e0e..aa115e5 100644
--- a/modules/jndi/pom.xml
+++ b/modules/jndi/pom.xml
@@ -32,10 +32,6 @@ under the License.
<name>Apache Tamaya JNDI Support</name>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/mutable-config/pom.xml
----------------------------------------------------------------------
diff --git a/modules/mutable-config/pom.xml b/modules/mutable-config/pom.xml
index 740420e..55dd945 100644
--- a/modules/mutable-config/pom.xml
+++ b/modules/mutable-config/pom.xml
@@ -32,10 +32,6 @@ under the License.
and write changes back to some property sources, files etc.</description>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/optional/pom.xml
----------------------------------------------------------------------
diff --git a/modules/optional/pom.xml b/modules/optional/pom.xml
index 8d8a163..244a230 100644
--- a/modules/optional/pom.xml
+++ b/modules/optional/pom.xml
@@ -35,10 +35,6 @@ under the License.
considers/uses Tamaya functionality.</description>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/resolver/pom.xml
----------------------------------------------------------------------
diff --git a/modules/resolver/pom.xml b/modules/resolver/pom.xml
index b5e0bc7..86a1c59 100644
--- a/modules/resolver/pom.xml
+++ b/modules/resolver/pom.xml
@@ -32,10 +32,6 @@ under the License.
<name>Apache Tamaya Resolver Services</name>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/resources/pom.xml
----------------------------------------------------------------------
diff --git a/modules/resources/pom.xml b/modules/resources/pom.xml
index 514dc90..3506017 100644
--- a/modules/resources/pom.xml
+++ b/modules/resources/pom.xml
@@ -32,10 +32,6 @@ under the License.
<name>Apache Tamaya Resource Services</name>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/modules/spi-support/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spi-support/pom.xml b/modules/spi-support/pom.xml
index 5e7b083..76b21ce 100644
--- a/modules/spi-support/pom.xml
+++ b/modules/spi-support/pom.xml
@@ -34,10 +34,6 @@ under the License.
implementation.</description>
<packaging>jar</packaging>
- <properties>
- <jdkVersion>1.7</jdkVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tamaya</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/1d1cf72e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 529aace..1bd0660 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,11 +53,10 @@ under the License.
<commons-io.version>2.5</commons-io.version>
<findbugs.skip>false</findbugs.skip>
- <jdkVersion>1.8</jdkVersion>
<osgi.version>4.3.1</osgi.version>
<osgi.compendium.version>${osgi.version}</osgi.compendium.version>
- <maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
- <maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
+ <maven.compile.targetLevel>1.8</maven.compile.targetLevel>
+ <maven.compile.sourceLevel>1.8</maven.compile.sourceLevel>
<maven.compile.optimize>false</maven.compile.optimize>
<maven.compile.deprecation>true</maven.compile.deprecation>
<maven.javadoc.skip>false</maven.javadoc.skip>
@@ -787,8 +786,8 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>${maven.compile.sourceLevel}</source>
+ <target>${maven.compile.targetLevel}</target>
</configuration>
</plugin>
<plugin>
[2/4] incubator-tamaya-extensions git commit: Added latency for
change test (sometimes failing).
Posted by an...@apache.org.
Added latency for change test (sometimes failing).
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/0d13b0ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/0d13b0ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/0d13b0ec
Branch: refs/heads/java8
Commit: 0d13b0ec09527c0a5ffdc0580f11350b01ba6064
Parents: 70edbf9
Author: anatole <an...@apache.org>
Authored: Tue Aug 8 21:46:22 2017 +0200
Committer: anatole <an...@apache.org>
Committed: Tue Aug 8 21:46:22 2017 +0200
----------------------------------------------------------------------
.../test/java/org/apache/tamaya/events/ConfigurationChangeTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/0d13b0ec/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java b/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java
index 4cedeab..60f40c2 100644
--- a/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java
+++ b/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java
@@ -69,6 +69,7 @@ public class ConfigurationChangeTest {
@Test
public void testGetTimestamp() throws Exception {
Configuration config = ConfigurationProvider.getConfiguration();
+ Thread.sleep(10L);
ConfigurationChange change = ConfigurationChangeBuilder.of(config).build();
assertTrue((System.currentTimeMillis() - change.getTimestamp()) > 0L);
change = ConfigurationChangeBuilder.of(config).setTimestamp(10L).build();
[4/4] incubator-tamaya-extensions git commit: TAMAYA-260: Added
support for config_ordinal as alternative ordinal key.
Posted by an...@apache.org.
TAMAYA-260: Added support for config_ordinal as alternative ordinal key.
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/72c37c5c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/72c37c5c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/72c37c5c
Branch: refs/heads/java8
Commit: 72c37c5c1e5d3504c87e796b9af923ae476d4436
Parents: 1d1cf72
Author: anatole <an...@apache.org>
Authored: Wed Aug 9 00:21:48 2017 +0200
Committer: anatole <an...@apache.org>
Committed: Wed Aug 9 00:21:48 2017 +0200
----------------------------------------------------------------------
.../spisupport/PropertySourceComparator.java | 59 +++++++++++---------
1 file changed, 32 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/72c37c5c/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/PropertySourceComparator.java
----------------------------------------------------------------------
diff --git a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/PropertySourceComparator.java b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/PropertySourceComparator.java
index f4c37ac..6799e4e 100644
--- a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/PropertySourceComparator.java
+++ b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/PropertySourceComparator.java
@@ -39,6 +39,8 @@ public class PropertySourceComparator implements Comparator<PropertySource>, Ser
private static final PropertySourceComparator INSTANCE = new PropertySourceComparator();
+ private String alternativeOrdinalKey;
+
private PropertySourceComparator(){}
/**
@@ -58,9 +60,9 @@ public class PropertySourceComparator implements Comparator<PropertySource>, Ser
* @return the comparison result.
*/
private int comparePropertySources(PropertySource source1, PropertySource source2) {
- if (getOrdinal(source1) < getOrdinal(source2)) {
+ if (getOrdinal(source1, alternativeOrdinalKey) < getOrdinal(source2, alternativeOrdinalKey)) {
return -1;
- } else if (getOrdinal(source1) > getOrdinal(source2)) {
+ } else if (getOrdinal(source1, alternativeOrdinalKey) > getOrdinal(source2, alternativeOrdinalKey)) {
return 1;
} else {
return source1.getClass().getName().compareTo(source2.getClass().getName());
@@ -68,35 +70,38 @@ public class PropertySourceComparator implements Comparator<PropertySource>, Ser
}
public static int getOrdinal(PropertySource propertySource) {
-// PropertyValue ordinalValue = propertySource.get(PropertySource.TAMAYA_ORDINAL);
-// if(ordinalValue!=null){
-// try{
-// return Integer.parseInt(ordinalValue.getProperty().trim());
-// }catch(Exception e){
-// LOG.finest("Failed to parse ordinal from " + PropertySource.TAMAYA_ORDINAL +
-// " in " + propertySource.getName()+": "+ordinalValue.getProperty());
-// }
-// }
-// try {
-// Method method = propertySource.getClass().getMethod("getOrdinal");
-// if(int.class.equals(method.getReturnType())){
-// try {
-// return (int)method.invoke(propertySource);
-// } catch (Exception e) {
-// LOG.log(Level.FINEST, "Error calling int getOrdinal() on " + propertySource.getName(), e);
-// }
-// }
-// } catch (NoSuchMethodException e) {
-// LOG.finest("No int getOrdinal() method found in " + propertySource.getName());
-// }
-// Priority prio = propertySource.getClass().getAnnotation(Priority.class);
-// if(prio!=null){
-// return prio.value();
-// }
+ return getOrdinal(propertySource, null);
+ }
+
+ public static int getOrdinal(PropertySource propertySource, String alternativeOrdinalKey) {
+ if(alternativeOrdinalKey!=null) {
+ PropertyValue ordinalValue = propertySource.get(alternativeOrdinalKey);
+ if (ordinalValue != null) {
+ try {
+ return Integer.parseInt(ordinalValue.getValue().trim());
+ } catch (Exception e) {
+ LOG.finest("Failed to parse ordinal from " + alternativeOrdinalKey +
+ " in " + propertySource.getName() + ": " + ordinalValue.getValue());
+ }
+ }
+ }
return propertySource.getOrdinal();
}
+
+ /**
+ * Overrides/adds the key to evaluate/override a property sources ordinal.
+ * @param ordinalKey sets the alternative ordinal key, if null default
+ * behaviour will be active.
+ * @return the instance for chaining.
+ */
+ public PropertySourceComparator setOrdinalKey(String ordinalKey) {
+ this.alternativeOrdinalKey = ordinalKey;
+ return this;
+ }
+
@Override
public int compare(PropertySource source1, PropertySource source2) {
return comparePropertySources(source1, source2);
}
+
}