Repository: incubator-tamaya-sandbox Updated Branches: refs/heads/java8 a3e01813f -> f30884f9e
TAMAYA-274: Moved to Java 8, set version to 0.4-incubating-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/d9e2d541 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/d9e2d541 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/d9e2d541 Branch: refs/heads/java8 Commit: d9e2d541ed7fe5467955c20954f21c758a354542 Parents: a3e0181 Author: anatole <anat...@apache.org> Authored: Tue Aug 8 21:44:51 2017 +0200 Committer: anatole <anat...@apache.org> Committed: Tue Aug 8 21:44:51 2017 +0200 ---------------------------------------------------------------------- apache-commons/pom.xml | 2 +- camel/pom.xml | 2 +- configured-sysprops/pom.xml | 2 +- consul/pom.xml | 2 +- etcd/pom.xml | 2 +- hazelcast/pom.xml | 2 +- jodatime/pom.xml | 2 +- management/pom.xml | 2 +- metamodel/pom.xml | 2 +- microprofile/pom.xml | 46 +++++++++++++++++++++++++++++++++++----- osgi/common/pom.xml | 2 +- osgi/karaf-features/pom.xml | 2 +- osgi/pom.xml | 4 ++-- pom.xml | 22 +++++++++---------- propertysources/pom.xml | 2 +- remote/pom.xml | 2 +- server/pom.xml | 2 +- ui/base/pom.xml | 2 +- ui/events/pom.xml | 2 +- ui/mutableconfig/pom.xml | 2 +- ui/pom.xml | 2 +- uom/pom.xml | 2 +- usagetracker/pom.xml | 2 +- validation/pom.xml | 2 +- vertx/pom.xml | 2 +- 25 files changed, 75 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d9e2d541/apache-commons/pom.xml ---------------------------------------------------------------------- diff --git a/apache-commons/pom.xml b/apache-commons/pom.xml index 8f4d945..0ed033d 100644 --- a/apache-commons/pom.xml +++ b/apache-commons/pom.xml @@ -23,7 +23,7 @@ under the License. <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> - <version>0.3-incubating-SNAPSHOT</version> + <version>0.4-incubating-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>tamaya-commons-config_beta</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d9e2d541/camel/pom.xml ---------------------------------------------------------------------- diff --git a/camel/pom.xml b/camel/pom.xml index 2dcdc60..f4324bb 100644 --- a/camel/pom.xml +++ b/camel/pom.xml @@ -22,7 +22,7 @@ under the License. <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</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-sandbox/blob/d9e2d541/configured-sysprops/pom.xml ---------------------------------------------------------------------- diff --git a/configured-sysprops/pom.xml b/configured-sysprops/pom.xml index 884007f..8384d04 100644 --- a/configured-sysprops/pom.xml +++ b/configured-sysprops/pom.xml @@ -23,7 +23,7 @@ under the License. <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> - <version>0.3-incubating-SNAPSHOT</version> + <version>0.4-incubating-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>tamaya-sysprops_beta</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d9e2d541/consul/pom.xml ---------------------------------------------------------------------- diff --git a/consul/pom.xml b/consul/pom.xml index 14dbe65..47ce340 100644 --- a/consul/pom.xml +++ b/consul/pom.xml @@ -22,7 +22,7 @@ under the License. <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</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-sandbox/blob/d9e2d541/etcd/pom.xml ---------------------------------------------------------------------- diff --git a/etcd/pom.xml b/etcd/pom.xml index 376a469..31ea349 100644 --- a/etcd/pom.xml +++ b/etcd/pom.xml @@ -22,7 +22,7 @@ under the License. <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</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-sandbox/blob/d9e2d541/hazelcast/pom.xml ---------------------------------------------------------------------- diff --git a/hazelcast/pom.xml b/hazelcast/pom.xml index 7f594cd..1052787 100644 --- a/hazelcast/pom.xml +++ b/hazelcast/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</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-sandbox/blob/d9e2d541/jodatime/pom.xml ---------------------------------------------------------------------- diff --git a/jodatime/pom.xml b/jodatime/pom.xml index a1e99df..7ffbf23 100644 --- a/jodatime/pom.xml +++ b/jodatime/pom.xml @@ -25,7 +25,7 @@ under the License. <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</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-sandbox/blob/d9e2d541/management/pom.xml ---------------------------------------------------------------------- diff --git a/management/pom.xml b/management/pom.xml index 9ac2ec4..1ac279a 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -22,7 +22,7 @@ under the License. <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</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-sandbox/blob/d9e2d541/metamodel/pom.xml ---------------------------------------------------------------------- diff --git a/metamodel/pom.xml b/metamodel/pom.xml index bfffea8..1f8ae92 100644 --- a/metamodel/pom.xml +++ b/metamodel/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</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-sandbox/blob/d9e2d541/microprofile/pom.xml ---------------------------------------------------------------------- diff --git a/microprofile/pom.xml b/microprofile/pom.xml index 123f7b8..89f29c3 100644 --- a/microprofile/pom.xml +++ b/microprofile/pom.xml @@ -22,7 +22,7 @@ under the License. <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> - <version>0.3-incubating-SNAPSHOT</version> + <version>0.4-incubating-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -36,6 +36,9 @@ under the License. <microprofile.version>1.0</microprofile.version> <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> + <version.shrinkwrap.resolvers>2.2.6</version.shrinkwrap.resolvers> + <org.apache.tomcat.version>6.0.53</org.apache.tomcat.version> + <tamaya-version>0.4-incubating-SNAPSHOT</tamaya-version> </properties> <dependencies> @@ -53,18 +56,18 @@ under the License. <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-core</artifactId> - <version>${project.parent.version}</version> + <version>${tamaya-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>${project.parent.version}</version> + <version>${tamaya-version}</version> </dependency> <dependency> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-functions</artifactId> - <version>${project.parent.version}</version> + <version>${tamaya-version}</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> @@ -97,6 +100,39 @@ under the License. <version>6.9.9</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-depchain</artifactId> + <version>${version.shrinkwrap.resolvers}</version> + <scope>test</scope> + <type>pom</type> + </dependency> + <!-- since microprofile requires a Java EE container ;-( + we need one for executing the TCK! --> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-glassfish-embedded-3.1</artifactId> + <version>1.0.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.main.extras</groupId> + <artifactId>glassfish-embedded-all</artifactId> + <version>4.1.2</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>com.sun</groupId> + <artifactId>tools-jar</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>21.0</version> + <scope>test</scope> + </dependency> </dependencies> <profiles> @@ -115,7 +151,7 @@ under the License. <version>2.19.1</version> <configuration> <suiteXmlFiles> - <suiteXmlFile>tck-suite.xml</suiteXmlFile> + <suiteXmlFile>src/test/tck-suite.xml</suiteXmlFile> </suiteXmlFiles> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d9e2d541/osgi/common/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/common/pom.xml b/osgi/common/pom.xml index 89dabcd..e0a5411 100644 --- a/osgi/common/pom.xml +++ b/osgi/common/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-osgi-all</artifactId> - <version>0.3-incubating-SNAPSHOT</version> + <version>0.4-incubating-SNAPSHOT</version> </parent> <artifactId>tamaya-osgi_alpha</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d9e2d541/osgi/karaf-features/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/karaf-features/pom.xml b/osgi/karaf-features/pom.xml index e1f00ea..b7cc919 100644 --- a/osgi/karaf-features/pom.xml +++ b/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.3-incubating-SNAPSHOT</version> + <version>0.4-incubating-SNAPSHOT</version> </parent> <artifactId>tamaya-karaf-features</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d9e2d541/osgi/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/pom.xml b/osgi/pom.xml index 07a5a3b..ada48f4 100644 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> - <version>0.3-incubating-SNAPSHOT</version> + <version>0.4-incubating-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -272,7 +272,7 @@ <dependency> <groupId>org.apache.tamaya</groupId> <artifactId>tamaya-api</artifactId> - <version>0.3-incubating-SNAPSHOT</version> + <version>0.4-incubating-SNAPSHOT</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d9e2d541/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index afc8a0e..578eac8 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ under the License. </parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> - <version>0.3-incubating-SNAPSHOT</version> + <version>0.4-incubating-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Tamaya Sandbox</name> @@ -224,11 +224,11 @@ under the License. </exclusions> </dependency> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - <version>${findbugs.version}</version> - </dependency> + <!--<dependency>--> + <!--<groupId>com.google.code.findbugs</groupId>--> + <!--<artifactId>jsr305</artifactId>--> + <!--<version>${findbugs.version}</version>--> + <!--</dependency>--> <dependency> <groupId>org.hamcrest</groupId> @@ -425,8 +425,6 @@ under the License. <configuration> <debug>true</debug> <optimize>${maven.compile.optimize}</optimize> - <source>${maven.compile.sourceLevel}</source> - <target>${maven.compile.targetLevel}</target> <encoding>${project.build.sourceEncoding}</encoding> <showDeprecation>${maven.compile.deprecation}</showDeprecation> </configuration> @@ -709,8 +707,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>${jdkVersion}</source> + <target>${jdkVersion}</target> </configuration> </plugin> <plugin> @@ -754,9 +752,9 @@ under the License. <module>osgi</module> <module>management</module> <module>metamodel</module> - <!-- Requires JAVA 8: <module>microprofile</module>--> + <module>microprofile</module> <module>uom</module> - <!-- Requires JAVA 8: <module>vertx</module>--> + <module>vertx</module> </modules> <profiles> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d9e2d541/propertysources/pom.xml ---------------------------------------------------------------------- diff --git a/propertysources/pom.xml b/propertysources/pom.xml index ae50287..e9d64ac 100644 --- a/propertysources/pom.xml +++ b/propertysources/pom.xml @@ -23,7 +23,7 @@ under the License. <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> - <version>0.3-incubating-SNAPSHOT</version> + <version>0.4-incubating-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>tamaya-propertysources_alpha</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d9e2d541/remote/pom.xml ---------------------------------------------------------------------- diff --git a/remote/pom.xml b/remote/pom.xml index 51c9680..25b6847 100644 --- a/remote/pom.xml +++ b/remote/pom.xml @@ -23,7 +23,7 @@ under the License. <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</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-sandbox/blob/d9e2d541/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index f67fb8c..5b4c0dd 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -22,7 +22,7 @@ under the License. <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</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-sandbox/blob/d9e2d541/ui/base/pom.xml ---------------------------------------------------------------------- diff --git a/ui/base/pom.xml b/ui/base/pom.xml index c300feb..3807cc5 100644 --- a/ui/base/pom.xml +++ b/ui/base/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-ui-parent</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-sandbox/blob/d9e2d541/ui/events/pom.xml ---------------------------------------------------------------------- diff --git a/ui/events/pom.xml b/ui/events/pom.xml index cfcc815..4cf01d9 100644 --- a/ui/events/pom.xml +++ b/ui/events/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-ui-parent</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-sandbox/blob/d9e2d541/ui/mutableconfig/pom.xml ---------------------------------------------------------------------- diff --git a/ui/mutableconfig/pom.xml b/ui/mutableconfig/pom.xml index df8b166..6468719 100644 --- a/ui/mutableconfig/pom.xml +++ b/ui/mutableconfig/pom.xml @@ -24,7 +24,7 @@ under the License. <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-ui-parent</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-sandbox/blob/d9e2d541/ui/pom.xml ---------------------------------------------------------------------- diff --git a/ui/pom.xml b/ui/pom.xml index 9214a84..2835676 100644 --- a/ui/pom.xml +++ b/ui/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> - <version>0.3-incubating-SNAPSHOT</version> + <version>0.4-incubating-SNAPSHOT</version> </parent> <artifactId>tamaya-ui-parent</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d9e2d541/uom/pom.xml ---------------------------------------------------------------------- diff --git a/uom/pom.xml b/uom/pom.xml index e0e2e3d..0dc6bba 100644 --- a/uom/pom.xml +++ b/uom/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> - <version>0.3-incubating-SNAPSHOT</version> + <version>0.4-incubating-SNAPSHOT</version> </parent> <artifactId>tamaya-uom_beta</artifactId> <name>Apache Tamaya Modules - Units of Measurement Support</name> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d9e2d541/usagetracker/pom.xml ---------------------------------------------------------------------- diff --git a/usagetracker/pom.xml b/usagetracker/pom.xml index 7399a36..f52516c 100644 --- a/usagetracker/pom.xml +++ b/usagetracker/pom.xml @@ -22,7 +22,7 @@ under the License. <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</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-sandbox/blob/d9e2d541/validation/pom.xml ---------------------------------------------------------------------- diff --git a/validation/pom.xml b/validation/pom.xml index 15bf254..5fc7a5b 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</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-sandbox/blob/d9e2d541/vertx/pom.xml ---------------------------------------------------------------------- diff --git a/vertx/pom.xml b/vertx/pom.xml index 058fbd3..4c14510 100644 --- a/vertx/pom.xml +++ b/vertx/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> - <version>0.3-incubating-SNAPSHOT</version> + <version>0.4-incubating-SNAPSHOT</version> <relativePath>..</relativePath> </parent>