Repository: incubator-tamaya-sandbox Updated Branches: refs/heads/master b11f31742 -> d43cef4cc
Fixed merge issues. 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/d43cef4c Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/d43cef4c Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/d43cef4c Branch: refs/heads/master Commit: d43cef4cccbcd38f6fdfa9115174a3c60f1d339a Parents: b11f317 Author: Anatole Tresch <[email protected]> Authored: Sun Oct 1 14:31:18 2017 +0200 Committer: Anatole Tresch <[email protected]> Committed: Sun Oct 1 14:31:18 2017 +0200 ---------------------------------------------------------------------- camel/pom.xml | 3 --- configured-sysprops/pom.xml | 3 --- consul/pom.xml | 3 --- etcd/pom.xml | 3 --- hazelcast/pom.xml | 3 --- jodatime/pom.xml | 3 --- management/pom.xml | 3 --- metamodel/pom.xml | 3 --- microprofile/pom.xml | 3 --- propertysources/pom.xml | 3 --- remote/pom.xml | 3 --- server/pom.xml | 3 --- ui/base/pom.xml | 3 --- ui/events/pom.xml | 3 --- ui/mutableconfig/pom.xml | 3 --- usagetracker/pom.xml | 3 --- validation/pom.xml | 3 --- vertx/pom.xml | 3 --- 18 files changed, 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d43cef4c/camel/pom.xml ---------------------------------------------------------------------- diff --git a/camel/pom.xml b/camel/pom.xml index 38800d4..f4324bb 100644 --- a/camel/pom.xml +++ b/camel/pom.xml @@ -23,10 +23,7 @@ under the License. <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> -<<<<<<< HEAD -======= <relativePath>..</relativePath> ->>>>>>> java8 </parent> <artifactId>tamaya-camel_beta</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d43cef4c/configured-sysprops/pom.xml ---------------------------------------------------------------------- diff --git a/configured-sysprops/pom.xml b/configured-sysprops/pom.xml index d568d79..28ce175 100644 --- a/configured-sysprops/pom.xml +++ b/configured-sysprops/pom.xml @@ -24,10 +24,7 @@ under the License. <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> -<<<<<<< HEAD -======= <relativePath>..</relativePath> ->>>>>>> java8 </parent> <artifactId>tamaya-sysprops_beta</artifactId> <name>Apache Tamaya Modules - Configured System Properties</name> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d43cef4c/consul/pom.xml ---------------------------------------------------------------------- diff --git a/consul/pom.xml b/consul/pom.xml index 4de66e5..47ce340 100644 --- a/consul/pom.xml +++ b/consul/pom.xml @@ -23,10 +23,7 @@ under the License. <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> -<<<<<<< HEAD -======= <relativePath>..</relativePath> ->>>>>>> java8 </parent> <artifactId>tamaya-consul_beta</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d43cef4c/etcd/pom.xml ---------------------------------------------------------------------- diff --git a/etcd/pom.xml b/etcd/pom.xml index 600375a..329d760 100644 --- a/etcd/pom.xml +++ b/etcd/pom.xml @@ -23,10 +23,7 @@ under the License. <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> -<<<<<<< HEAD -======= <relativePath>..</relativePath> ->>>>>>> java8 </parent> <artifactId>tamaya-etcd_beta</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d43cef4c/hazelcast/pom.xml ---------------------------------------------------------------------- diff --git a/hazelcast/pom.xml b/hazelcast/pom.xml index adedf5f..1052787 100644 --- a/hazelcast/pom.xml +++ b/hazelcast/pom.xml @@ -23,10 +23,7 @@ <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> -<<<<<<< HEAD -======= <relativePath>..</relativePath> ->>>>>>> java8 </parent> <artifactId>tamaya-hazelcast_beta</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d43cef4c/jodatime/pom.xml ---------------------------------------------------------------------- diff --git a/jodatime/pom.xml b/jodatime/pom.xml index 3dbc582..7ffbf23 100644 --- a/jodatime/pom.xml +++ b/jodatime/pom.xml @@ -26,10 +26,7 @@ under the License. <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> -<<<<<<< HEAD -======= <relativePath>..</relativePath> ->>>>>>> java8 </parent> <artifactId>tamaya-jodatime_beta</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d43cef4c/management/pom.xml ---------------------------------------------------------------------- diff --git a/management/pom.xml b/management/pom.xml index 6bcac03..81f64c9 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -23,10 +23,7 @@ under the License. <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> -<<<<<<< HEAD -======= <relativePath>..</relativePath> ->>>>>>> java8 </parent> <artifactId>tamaya-management_alpha</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d43cef4c/metamodel/pom.xml ---------------------------------------------------------------------- diff --git a/metamodel/pom.xml b/metamodel/pom.xml index 40e56de..f56096e 100644 --- a/metamodel/pom.xml +++ b/metamodel/pom.xml @@ -23,10 +23,7 @@ <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> -<<<<<<< HEAD -======= <relativePath>..</relativePath> ->>>>>>> java8 </parent> <artifactId>tamaya-metamodel_alpha</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d43cef4c/microprofile/pom.xml ---------------------------------------------------------------------- diff --git a/microprofile/pom.xml b/microprofile/pom.xml index b4724a0..37bbb2b 100644 --- a/microprofile/pom.xml +++ b/microprofile/pom.xml @@ -23,10 +23,7 @@ under the License. <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> -<<<<<<< HEAD -======= <relativePath>..</relativePath> ->>>>>>> java8 </parent> <artifactId>tamaya-microprofile_alpha</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d43cef4c/propertysources/pom.xml ---------------------------------------------------------------------- diff --git a/propertysources/pom.xml b/propertysources/pom.xml index a96fcc0..e9d64ac 100644 --- a/propertysources/pom.xml +++ b/propertysources/pom.xml @@ -24,10 +24,7 @@ under the License. <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> -<<<<<<< HEAD -======= <relativePath>..</relativePath> ->>>>>>> java8 </parent> <artifactId>tamaya-propertysources_alpha</artifactId> <name>Apache Tamaya Modules - PropertySources</name> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d43cef4c/remote/pom.xml ---------------------------------------------------------------------- diff --git a/remote/pom.xml b/remote/pom.xml index ff08eb9..37f2bf5 100644 --- a/remote/pom.xml +++ b/remote/pom.xml @@ -24,10 +24,7 @@ under the License. <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> -<<<<<<< HEAD -======= <relativePath>..</relativePath> ->>>>>>> java8 </parent> <artifactId>tamaya-remote_alpha</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d43cef4c/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 0f872dd..ab40526 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -23,10 +23,7 @@ under the License. <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> -<<<<<<< HEAD -======= <relativePath>..</relativePath> ->>>>>>> java8 </parent> <artifactId>tamaya-server_alpha</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d43cef4c/ui/base/pom.xml ---------------------------------------------------------------------- diff --git a/ui/base/pom.xml b/ui/base/pom.xml index 9f297aa..3807cc5 100644 --- a/ui/base/pom.xml +++ b/ui/base/pom.xml @@ -25,10 +25,7 @@ under the License. <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-ui-parent</artifactId> <version>0.4-incubating-SNAPSHOT</version> -<<<<<<< HEAD -======= <relativePath>..</relativePath> ->>>>>>> java8 </parent> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d43cef4c/ui/events/pom.xml ---------------------------------------------------------------------- diff --git a/ui/events/pom.xml b/ui/events/pom.xml index 73d5dd0..4cf01d9 100644 --- a/ui/events/pom.xml +++ b/ui/events/pom.xml @@ -25,10 +25,7 @@ <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-ui-parent</artifactId> <version>0.4-incubating-SNAPSHOT</version> -<<<<<<< HEAD -======= <relativePath>..</relativePath> ->>>>>>> java8 </parent> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d43cef4c/ui/mutableconfig/pom.xml ---------------------------------------------------------------------- diff --git a/ui/mutableconfig/pom.xml b/ui/mutableconfig/pom.xml index d7122f9..6468719 100644 --- a/ui/mutableconfig/pom.xml +++ b/ui/mutableconfig/pom.xml @@ -25,10 +25,7 @@ under the License. <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-ui-parent</artifactId> <version>0.4-incubating-SNAPSHOT</version> -<<<<<<< HEAD -======= <relativePath>..</relativePath> ->>>>>>> java8 </parent> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d43cef4c/usagetracker/pom.xml ---------------------------------------------------------------------- diff --git a/usagetracker/pom.xml b/usagetracker/pom.xml index 6790a1a..06cb59a 100644 --- a/usagetracker/pom.xml +++ b/usagetracker/pom.xml @@ -23,10 +23,7 @@ under the License. <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> -<<<<<<< HEAD -======= <relativePath>..</relativePath> ->>>>>>> java8 </parent> <artifactId>tamaya-usagetracker_beta</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d43cef4c/validation/pom.xml ---------------------------------------------------------------------- diff --git a/validation/pom.xml b/validation/pom.xml index a803edb..870bcaa 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -23,10 +23,7 @@ <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> -<<<<<<< HEAD -======= <relativePath>..</relativePath> ->>>>>>> java8 </parent> <artifactId>tamaya-validation_alpha</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d43cef4c/vertx/pom.xml ---------------------------------------------------------------------- diff --git a/vertx/pom.xml b/vertx/pom.xml index a85b263..ede9c64 100644 --- a/vertx/pom.xml +++ b/vertx/pom.xml @@ -23,10 +23,7 @@ <groupId>org.apache.tamaya.ext</groupId> <artifactId>tamaya-sandbox</artifactId> <version>0.4-incubating-SNAPSHOT</version> -<<<<<<< HEAD -======= <relativePath>..</relativePath> ->>>>>>> java8 </parent> <artifactId>tamaya-vertx-alpha</artifactId>
