[2/4] incubator-tamaya git commit: TAMAYA-274: Moved to Java 8, added @FunctionalInterface annotations and java.time converters.
TAMAYA-274: Moved to Java 8, added @FunctionalInterface annotations and java.time converters. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/fd6184b8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/fd6184b8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/fd6184b8 Branch: refs/heads/java8 Commit: fd6184b8f7bb665596b04033b7635432a247f22b Parents: d659c1a Author: anatoleAuthored: Tue Aug 8 21:45:49 2017 +0200 Committer: anatole Committed: Tue Aug 8 21:45:49 2017 +0200 -- .../java/org/apache/tamaya/ConfigOperator.java | 1 + .../java/org/apache/tamaya/ConfigQuery.java | 1 + .../apache/tamaya/spi/PropertyConverter.java| 3 ++ .../org/apache/tamaya/spi/PropertyFilter.java | 1 + .../tamaya/spi/PropertySourceProvider.java | 1 + .../org/apache/tamaya/spi/PropertyValue.java| 3 +- .../org/apache/tamaya/spi/ServiceContext.java | 3 +- .../DefaultConfigurationContextBuilder.java | 1 + .../core/internal/PropertySourceComparator.java | 2 +- .../internal/converters/DurationConverter.java | 51 .../internal/converters/LocalDateConverter.java | 49 +++ .../converters/LocalDateTimeConverter.java | 49 +++ .../internal/converters/LocalTimeConverter.java | 49 +++ .../converters/OffsetDateTimeConverter.java | 50 +++ .../converters/OffsetTimeConverter.java | 50 +++ .../org.apache.tamaya.spi.PropertyConverter | 6 +++ 16 files changed, 316 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/fd6184b8/code/api/src/main/java/org/apache/tamaya/ConfigOperator.java -- diff --git a/code/api/src/main/java/org/apache/tamaya/ConfigOperator.java b/code/api/src/main/java/org/apache/tamaya/ConfigOperator.java index 2144218..b14c155 100644 --- a/code/api/src/main/java/org/apache/tamaya/ConfigOperator.java +++ b/code/api/src/main/java/org/apache/tamaya/ConfigOperator.java @@ -23,6 +23,7 @@ package org.apache.tamaya; * to modell additional functionality and applying it to a given {@link org.apache.tamaya.Configuration} instance by calling * the {@link org.apache.tamaya.Configuration#with(org.apache.tamaya.ConfigOperator)} method. */ +@FunctionalInterface public interface ConfigOperator { /** http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/fd6184b8/code/api/src/main/java/org/apache/tamaya/ConfigQuery.java -- diff --git a/code/api/src/main/java/org/apache/tamaya/ConfigQuery.java b/code/api/src/main/java/org/apache/tamaya/ConfigQuery.java index 60e87bb..28b8b93 100644 --- a/code/api/src/main/java/org/apache/tamaya/ConfigQuery.java +++ b/code/api/src/main/java/org/apache/tamaya/ConfigQuery.java @@ -23,6 +23,7 @@ package org.apache.tamaya; * to model additional functionality and applying it to a given {@link Configuration} instance by * calling the {@link Configuration#query(ConfigQuery)} method. */ +@FunctionalInterface public interface ConfigQuery { /** http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/fd6184b8/code/api/src/main/java/org/apache/tamaya/spi/PropertyConverter.java -- diff --git a/code/api/src/main/java/org/apache/tamaya/spi/PropertyConverter.java b/code/api/src/main/java/org/apache/tamaya/spi/PropertyConverter.java index ef6e2ac..56ac5e6 100644 --- a/code/api/src/main/java/org/apache/tamaya/spi/PropertyConverter.java +++ b/code/api/src/main/java/org/apache/tamaya/spi/PropertyConverter.java @@ -19,6 +19,8 @@ package org.apache.tamaya.spi; +import jdk.nashorn.internal.objects.annotations.Function; + /** * Interface for an property that converts a configured String into something else. * This is used for implementing type conversion from a property (String) to a certain target @@ -26,6 +28,7 @@ package org.apache.tamaya.spi; * * @param the type of the type literal */ +@FunctionalInterface public interface PropertyConverter{ /** http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/fd6184b8/code/api/src/main/java/org/apache/tamaya/spi/PropertyFilter.java -- diff --git a/code/api/src/main/java/org/apache/tamaya/spi/PropertyFilter.java b/code/api/src/main/java/org/apache/tamaya/spi/PropertyFilter.java index 350bd73..3054496 100644 --- a/code/api/src/main/java/org/apache/tamaya/spi/PropertyFilter.java +++
[4/4] incubator-tamaya git commit: TAMAYA-274: Moved to Java 8, added missing converters.
TAMAYA-274: Moved to Java 8, added missing converters. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/c4285641 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/c4285641 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/c4285641 Branch: refs/heads/java8 Commit: c4285641af328fe7c3a0ee4522eca73c27f4fbdb Parents: c32b45f Author: anatoleAuthored: Wed Aug 9 00:22:59 2017 +0200 Committer: anatole Committed: Wed Aug 9 00:22:59 2017 +0200 -- .../internal/converters/BooleanConverter.java | 4 +- .../internal/converters/InstantConverter.java | 49 .../internal/converters/OptionalConverter.java | 61 .../org.apache.tamaya.spi.PropertyConverter | 2 + 4 files changed, 115 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/c4285641/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java -- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java index d926b14..61c182b 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java @@ -34,11 +34,12 @@ public class BooleanConverter implements PropertyConverter { @Override public Boolean convert(String value, ConversionContext context) { -context.addSupportedFormats(getClass(), "yes (ignore case)", "y (ignore case)", "true (ignore case)", "t (ignore case)", "no (ignore case)", "n (ignore case)", "false (ignore case)", "f (ignore case)"); +context.addSupportedFormats(getClass(), "yes (ignore case)", "y (ignore case)", "true (ignore case)", "t (ignore case)", "1", "no (ignore case)", "n (ignore case)", "false (ignore case)", "f (ignore case)", "0"); String ignoreCaseValue = Objects.requireNonNull(value) .trim() .toLowerCase(Locale.ENGLISH); switch(ignoreCaseValue) { +case "1": case "yes": case "y": case "true": @@ -48,6 +49,7 @@ public class BooleanConverter implements PropertyConverter { case "n": case "false": case "f": +case "0": return Boolean.FALSE; default: LOG.finest("Unknown boolean value encountered: " + value); http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/c4285641/code/core/src/main/java/org/apache/tamaya/core/internal/converters/InstantConverter.java -- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/converters/InstantConverter.java b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/InstantConverter.java new file mode 100644 index 000..c0f2bf0 --- /dev/null +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/converters/InstantConverter.java @@ -0,0 +1,49 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.tamaya.core.internal.converters; + +import org.apache.tamaya.spi.ConversionContext; +import org.apache.tamaya.spi.PropertyConverter; + +import java.time.Instant; +import java.util.logging.Logger; + +/** + * Converter, converting from String to Boolean. + */ +public class InstantConverter implements PropertyConverter { + +private final Logger LOG = Logger.getLogger(getClass().getName()); + +@Override +public Instant convert(String value, ConversionContext context) { +context.addSupportedFormats(getClass(), Instant.now().toString()); +return Instant.parse(value); +} +
[3/4] incubator-tamaya git commit: TAMAYA-274: Simplified compiler settings, set version to 0.4-incubating-SNAPSHOT
TAMAYA-274: Simplified compiler settings, set version to 0.4-incubating-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/c32b45f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/c32b45f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/c32b45f4 Branch: refs/heads/java8 Commit: c32b45f41e13ff15edaa87d3e87c954522b3de7b Parents: fd6184b Author: anatoleAuthored: Wed Aug 9 00:22:29 2017 +0200 Committer: anatole Committed: Wed Aug 9 00:22:29 2017 +0200 -- examples/11-distributed/pom.xml | 5 ++--- pom.xml | 11 +-- 2 files changed, 7 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/c32b45f4/examples/11-distributed/pom.xml -- diff --git a/examples/11-distributed/pom.xml b/examples/11-distributed/pom.xml index 72e5ac1..0f0bfe9 100644 --- a/examples/11-distributed/pom.xml +++ b/examples/11-distributed/pom.xml @@ -31,9 +31,8 @@ jar -1.8 -${jdkVersion} -${jdkVersion} +1.8 +1.8 false true 0.3-incubating-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/c32b45f4/pom.xml -- diff --git a/pom.xml b/pom.xml index 337cb3b..8f79347 100644 --- a/pom.xml +++ b/pom.xml @@ -39,11 +39,10 @@ 2.5 false -1.8 5.0.0 ${osgi.version} -${jdkVersion} -${jdkVersion} +1.8 +1.8 false true false @@ -417,9 +416,9 @@ 3.6.0 true -${maven.compile.optimize} ${maven.compile.sourceLevel} ${maven.compile.targetLevel} +${maven.compile.optimize} ${project.build.sourceEncoding} ${maven.compile.deprecation} @@ -716,8 +715,8 @@ org.apache.maven.plugins maven-compiler-plugin -1.7 -1.7 +${maven.compile.sourceLevel} +${maven.compile.targetLevel}
[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: anatoleAuthored: Tue Aug 8 21:44:52 2017 +0200 Committer: anatole 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. org.apache.tamaya.ext tamaya-extensions-all -0.3-incubating-SNAPSHOT +0.4-incubating-SNAPSHOT .. 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. org.apache.tamaya.ext.examples examples -0.3-incubating-SNAPSHOT +0.4-incubating-SNAPSHOT 01-resources-example -0.3-incubating-SNAPSHOT +0.4-incubating-SNAPSHOT Apache Tamaya Resource Location Example This project contains a simple example using the resource location module. 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. org.apache.tamaya.ext.examples examples -0.3-incubating-SNAPSHOT +0.4-incubating-SNAPSHOT 02-resolver-example 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. org.apache.tamaya.ext.examples examples -0.3-incubating-SNAPSHOT +0.4-incubating-SNAPSHOT 03-injection-example -0.3-incubating-SNAPSHOT +0.4-incubating-SNAPSHOT Apache Tamaya Configuration Injection Example This project contains a simple illustrating how configuration values can be injected.
[3/4] incubator-tamaya-extensions git commit: TAMAYA-274: Simplified compiler settings, set version to 0.4-incubating-SNAPSHOT
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: anatoleAuthored: Wed Aug 9 00:21:01 2017 +0200 Committer: anatole 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. Apache Tamaya Event and dynamic Update Extensions jar - -1.7 - - org.apache.tamaya 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. Apache Tamaya Feature Check jar - -1.7 - - org.apache.tamaya 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. Apache Tamaya Adaptive Configuration Filtering jar - -1.7 - - org.apache.tamaya 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. Apache Tamaya Modules Formats Common jar - -1.7 - - org.apache.tamaya 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. jar 2015 - -1.7 - - org.apache.tamaya 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. 2016 -1.7 1.17 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
[2/4] incubator-tamaya-extensions git commit: Added latency for change test (sometimes failing).
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: anatoleAuthored: Tue Aug 8 21:46:22 2017 +0200 Committer: anatole 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-sandbox git commit: TAMAYA-274: Simplified compiler settings, set version to 0.4-incubating-SNAPSHOT
TAMAYA-274: Simplified compiler settings, 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/f30884f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/f30884f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/f30884f9 Branch: refs/heads/java8 Commit: f30884f9e0ec2902567fe4e823f6f87ac2c29f98 Parents: 1e2a184 Author: anatoleAuthored: Wed Aug 9 00:20:09 2017 +0200 Committer: anatole Committed: Wed Aug 9 00:20:09 2017 +0200 -- management/pom.xml| 4 metamodel/pom.xml | 4 .../apache/tamaya/osgi/InjectionKarafTest.java| 18 +- .../org/apache/tamaya/osgi/OSGIKarafTest.java | 12 ++-- pom.xml | 15 --- remote/pom.xml| 4 server/pom.xml| 1 - tamaya-sandbox.iml| 2 +- ui/pom.xml| 3 --- usagetracker/pom.xml | 4 validation/pom.xml| 4 vertx/pom.xml | 3 --- 12 files changed, 24 insertions(+), 50 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/f30884f9/management/pom.xml -- diff --git a/management/pom.xml b/management/pom.xml index 1ac279a..81f64c9 100644 --- a/management/pom.xml +++ b/management/pom.xml @@ -30,10 +30,6 @@ under the License. Apache Tamaya Modules - JMX Support jar - -1.7 - - org.apache.tamaya http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/f30884f9/metamodel/pom.xml -- diff --git a/metamodel/pom.xml b/metamodel/pom.xml index 1f8ae92..b462590 100644 --- a/metamodel/pom.xml +++ b/metamodel/pom.xml @@ -33,10 +33,6 @@ jar - -1.7 - - org.apache.tamaya http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/f30884f9/osgi/karaf-features/src/test/java/org/apache/tamaya/osgi/InjectionKarafTest.java -- diff --git a/osgi/karaf-features/src/test/java/org/apache/tamaya/osgi/InjectionKarafTest.java b/osgi/karaf-features/src/test/java/org/apache/tamaya/osgi/InjectionKarafTest.java index 14e83ed..d8a2366 100644 --- a/osgi/karaf-features/src/test/java/org/apache/tamaya/osgi/InjectionKarafTest.java +++ b/osgi/karaf-features/src/test/java/org/apache/tamaya/osgi/InjectionKarafTest.java @@ -70,7 +70,7 @@ public class InjectionKarafTest { .artifactId("tamaya-osgi-features") .type("xml") .classifier("features") -.version("0.3-incubating-SNAPSHOT"); +.version("0.4-incubating-SNAPSHOT"); return options( KarafDistributionOption.karafDistributionConfiguration() .frameworkUrl(CoreOptions.maven() @@ -94,16 +94,16 @@ public class InjectionKarafTest { "src/test/resources/org.ops4j.pax.logging.cfg")), mavenBundle("org.apache.geronimo.specs", "geronimo-annotation_1.2_spec", "1.0-alpha-1"), -mavenBundle("org.apache.tamaya", "tamaya-api", "0.3-incubating-SNAPSHOT"), -mavenBundle("org.apache.tamaya", "tamaya-core", "0.3-incubating-SNAPSHOT"), -mavenBundle("org.apache.tamaya.ext", "tamaya-spisupport", "0.3-incubating-SNAPSHOT"), -mavenBundle("org.apache.tamaya.ext", "tamaya-functions", "0.3-incubating-SNAPSHOT"), -mavenBundle("org.apache.tamaya.ext", "tamaya-osgi", "0.3-incubating-SNAPSHOT"), +mavenBundle("org.apache.tamaya", "tamaya-api", "0.4-incubating-SNAPSHOT"), +mavenBundle("org.apache.tamaya", "tamaya-core", "0.4-incubating-SNAPSHOT"), +mavenBundle("org.apache.tamaya.ext", "tamaya-spisupport", "0.4-incubating-SNAPSHOT"), +mavenBundle("org.apache.tamaya.ext", "tamaya-functions", "0.4-incubating-SNAPSHOT"), +mavenBundle("org.apache.tamaya.ext", "tamaya-osgi", "0.4-incubating-SNAPSHOT"), // injection libs mavenBundle("org.apache.geronimo.specs", "geronimo-atinject_1.0_spec", "1.0"), -mavenBundle("org.apache.tamaya.ext", "tamaya-injection-api",
[1/4] incubator-tamaya git commit: TAMAYA-274: Moved to Java 8, set version to 0.4-incubating-SNAPSHOT
Repository: incubator-tamaya Updated Branches: refs/heads/java8 0402fd349 -> c4285641a TAMAYA-274: Moved to Java 8, set version to 0.4-incubating-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/d659c1ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/d659c1ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/d659c1ae Branch: refs/heads/java8 Commit: d659c1ae3d03893f989cea41274364243e9837de Parents: 0402fd3 Author: anatoleAuthored: Tue Aug 8 21:44:51 2017 +0200 Committer: anatole Committed: Tue Aug 8 21:44:51 2017 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d659c1ae/pom.xml -- diff --git a/pom.xml b/pom.xml index c9cba10..337cb3b 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 2.5 false -1.7 +1.8 5.0.0 ${osgi.version} ${jdkVersion}
[4/4] incubator-tamaya-extensions git commit: TAMAYA-260: Added support for config_ordinal as alternative ordinal key.
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: anatoleAuthored: Wed Aug 9 00:21:48 2017 +0200 Committer: anatole 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, Ser private static final PropertySourceComparator INSTANCE = new PropertySourceComparator(); +private String alternativeOrdinalKey; + private PropertySourceComparator(){} /** @@ -58,9 +60,9 @@ public class PropertySourceComparator implements Comparator, 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, 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
[2/4] incubator-tamaya-sandbox git commit: TAMAYA-260: Implemented all basic microprofile features. Last 3 failres are to be discussed with MP folks.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/1e2a184f/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/matchers/AdditionalMatchers.java -- diff --git a/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/matchers/AdditionalMatchers.java b/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/matchers/AdditionalMatchers.java new file mode 100644 index 000..31024d2 --- /dev/null +++ b/microprofile/src/test/java/org/apache/tamaya/microprofile/imported/matchers/AdditionalMatchers.java @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2016-2017 Contributors to the Eclipse Foundation + * + * See the NOTICE file(s) distributed with this work for additional + * information regarding copyright ownership. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.tamaya.microprofile.imported.matchers; + +import org.hamcrest.BaseMatcher; +import org.hamcrest.Description; +import org.hamcrest.Matcher; + +import static org.hamcrest.Matchers.closeTo; + +/** + * + * @author Ondrej Mihalyi + */ +public final class AdditionalMatchers { + +private AdditionalMatchers() { +// utility class +} + +public static Matcher floatCloseTo(float value, float range) { +return new BaseMatcher() { + +private Matcher doubleMatcher = null; + +@Override +public boolean matches(Object item) { +if (item instanceof Float) { +return (doubleMatcher = closeTo(value, range)).matches(((Float)item).doubleValue()); +} +else { +return (doubleMatcher = closeTo(value, range)).matches(item); +} +} + +@Override +public void describeTo(Description description) { +doubleMatcher.describeTo(description); +} +}; +} + + +} http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/1e2a184f/microprofile/src/test/java/org/apache/tamaya/microprofile/tck/TamayaConfigArchiveProcessor.java -- diff --git a/microprofile/src/test/java/org/apache/tamaya/microprofile/tck/TamayaConfigArchiveProcessor.java b/microprofile/src/test/java/org/apache/tamaya/microprofile/tck/TamayaConfigArchiveProcessor.java new file mode 100644 index 000..4522fb8 --- /dev/null +++ b/microprofile/src/test/java/org/apache/tamaya/microprofile/tck/TamayaConfigArchiveProcessor.java @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.tamaya.microprofile.tck; + +import org.apache.tamaya.microprofile.MicroprofileAdapter; +import org.apache.tamaya.microprofile.MicroprofileConfigProviderResolver; +import org.eclipse.microprofile.config.spi.ConfigProviderResolver; +import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; +import org.jboss.arquillian.test.spi.TestClass; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.EmptyAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.resolver.api.maven.Maven; + +import java.io.File; + +/** + * Adds the whole Config implementation classes and resources to the + * Arqillian deployment archive. This is needed to have the container + * pick up the beans from within the impl for the TCK tests. + * + * @author mailto:strub...@yahoo.de;>Mark Struberg + */ +public class
[3/4] incubator-tamaya-sandbox git commit: TAMAYA-260: Implemented all basic microprofile features. Last 3 failres are to be discussed with MP folks.
TAMAYA-260: Implemented all basic microprofile features. Last 3 failres are to be discussed with MP folks. 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/1e2a184f Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/1e2a184f Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/1e2a184f Branch: refs/heads/java8 Commit: 1e2a184f80167576c6b884f004083bf5496cfe95 Parents: d9e2d54 Author: anatoleAuthored: Wed Aug 9 00:18:52 2017 +0200 Committer: anatole Committed: Wed Aug 9 00:18:52 2017 +0200 -- .../microprofile/MicroprofileAdapter.java | 1 + .../microprofile/MicroprofileConfigBuilder.java | 46 +++- .../MicroprofileConfigProviderResolver.java | 8 +- .../MicroprofileConfigurationProducer.java | 104 .../MicroprofileDefaultProperties.java | 33 +++ .../microprofile/TamayaPropertySource.java | 4 +- .../org.apache.tamaya.spi.PropertySource| 20 ++ .../MicroprofileConfigBuilderTest.java | 3 +- .../MicroprofileConfigProviderTest.java | 2 +- .../microprofile/MicroprofileConfigTest.java| 11 +- .../MPSystemPropertiesConfigSource.java | 34 --- .../AutoDiscoveredConfigSourceTest.java | 64 + .../imported/CDIPlainInjectionTest.java | 226 ++ .../imported/ConfigProviderTest.java| 143 +++ .../microprofile/imported/ConverterTest.java| 235 +++ .../imported/CustomConfigSourceTest.java| 61 + .../imported/OptionalValuesBean.java| 61 + .../imported/broken/ConfigOwner.java| 39 +++ .../imported/broken/CustomConverterBean.java| 46 ...MissingConverterOnInstanceInjectionTest.java | 62 + .../MissingValueOnInstanceInjectionTest.java| 61 + .../WrongConverterOnInstanceInjectionTest.java | 63 + .../CustomConfigSourceProvider.java | 53 + .../configsources/CustomDbConfigSource.java | 69 ++ .../configsources/SampleYamlConfigSource.java | 58 + .../microprofile/imported/converters/Duck.java | 36 +++ .../imported/converters/DuckConverter.java | 33 +++ .../microprofile/imported/converters/Pizza.java | 45 .../imported/converters/PizzaConverter.java | 33 +++ .../imported/matchers/AdditionalMatchers.java | 61 + .../tck/TamayaConfigArchiveProcessor.java | 69 ++ .../microprofile/tck/TamayaConfigExtension.java | 36 +++ .../META-INF/microprofile-config.properties | 100 ...eclipse.microprofile.config.spi.ConfigSource | 2 +- ...microprofile.config.spi.ConfigSourceProvider | 18 ++ jboss.arquillian.core.spi.LoadableExtension | 19 ++ microprofile/src/test/tck-suite.xml | 29 +++ microprofile/tck-suite.xml | 29 --- 38 files changed, 1938 insertions(+), 79 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/1e2a184f/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileAdapter.java -- diff --git a/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileAdapter.java b/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileAdapter.java index 20d5af0..8f5002c 100644 --- a/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileAdapter.java +++ b/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileAdapter.java @@ -75,6 +75,7 @@ public final class MicroprofileAdapter{ for(PropertySource ps:propertySources){ configSources.add(toConfigSource(ps)); } +Collections.reverse(configSources); return configSources; } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/1e2a184f/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java -- diff --git a/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java b/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java index 5e6b613..aacd31b 100644 --- a/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java +++ b/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java @@ -21,9 +21,14 @@ package org.apache.tamaya.microprofile; import org.apache.tamaya.ConfigurationProvider; import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.spi.ConfigurationContextBuilder; +import
[1/4] incubator-tamaya-sandbox git commit: TAMAYA-274: Moved to Java 8, set version to 0.4-incubating-SNAPSHOT
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: anatoleAuthored: Tue Aug 8 21:44:51 2017 +0200 Committer: anatole 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. org.apache.tamaya.ext tamaya-sandbox -0.3-incubating-SNAPSHOT +0.4-incubating-SNAPSHOT .. tamaya-commons-config_beta 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. org.apache.tamaya.ext tamaya-sandbox -0.3-incubating-SNAPSHOT +0.4-incubating-SNAPSHOT .. 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. org.apache.tamaya.ext tamaya-sandbox -0.3-incubating-SNAPSHOT +0.4-incubating-SNAPSHOT .. tamaya-sysprops_beta 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. org.apache.tamaya.ext tamaya-sandbox -0.3-incubating-SNAPSHOT +0.4-incubating-SNAPSHOT .. 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. org.apache.tamaya.ext tamaya-sandbox -0.3-incubating-SNAPSHOT +0.4-incubating-SNAPSHOT .. 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 @@ org.apache.tamaya.ext tamaya-sandbox -0.3-incubating-SNAPSHOT +0.4-incubating-SNAPSHOT .. http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/d9e2d541/jodatime/pom.xml
incubator-tamaya-sandbox git commit: TAMAYA-260: Fixed basic TCK integration.
Repository: incubator-tamaya-sandbox Updated Branches: refs/heads/java8 b04b841bf -> a3e01813f TAMAYA-260: Fixed basic TCK integration. 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/a3e01813 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/a3e01813 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/a3e01813 Branch: refs/heads/java8 Commit: a3e01813fdd47205ee5bd12353f94358ba633bae Parents: b04b841 Author: anatoleAuthored: Tue Aug 8 09:22:16 2017 +0200 Committer: anatole Committed: Tue Aug 8 09:22:16 2017 +0200 -- microprofile/src/test/resources/tck-suite.xml | 29 -- microprofile/tck-suite.xml| 29 ++ 2 files changed, 29 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/a3e01813/microprofile/src/test/resources/tck-suite.xml -- diff --git a/microprofile/src/test/resources/tck-suite.xml b/microprofile/src/test/resources/tck-suite.xml deleted file mode 100644 index 7efa750..000 --- a/microprofile/src/test/resources/tck-suite.xml +++ /dev/null @@ -1,29 +0,0 @@ -http://testng.org/testng-1.0.dtd; > - - - - - - - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/a3e01813/microprofile/tck-suite.xml -- diff --git a/microprofile/tck-suite.xml b/microprofile/tck-suite.xml new file mode 100644 index 000..7efa750 --- /dev/null +++ b/microprofile/tck-suite.xml @@ -0,0 +1,29 @@ +http://testng.org/testng-1.0.dtd; > + + + + + + + + + + + \ No newline at end of file
incubator-tamaya-sandbox git commit: TAMAYA-260: Now implementing official MP config 1.0 release.
Repository: incubator-tamaya-sandbox Updated Branches: refs/heads/java8 e52a5a3ac -> b04b841bf TAMAYA-260: Now implementing official MP config 1.0 release. 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/b04b841b Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/b04b841b Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/b04b841b Branch: refs/heads/java8 Commit: b04b841bfe84d3c4d0a9b8a5ff6833ed954b9cd5 Parents: e52a5a3 Author: anatoleAuthored: Tue Aug 8 09:12:48 2017 +0200 Committer: anatole Committed: Tue Aug 8 09:12:48 2017 +0200 -- microprofile/pom.xml| 65 +--- .../microprofile/MicroprofileAdapter.java | 38 +++-- .../microprofile/MicroprofileConfigBuilder.java | 11 ++ .../org/eclipse/microprofile/config/Config.java | 126 -- .../microprofile/config/ConfigProvider.java | 102 .../config/inject/ConfigProperty.java | 112 - .../config/inject/package-info.java | 40 - .../microprofile/config/package-info.java | 75 - .../microprofile/config/spi/ConfigBuilder.java | 83 -- .../config/spi/ConfigProviderResolver.java | 164 --- .../microprofile/config/spi/ConfigSource.java | 107 .../config/spi/ConfigSourceProvider.java| 58 --- .../microprofile/config/spi/Converter.java | 77 - .../microprofile/config/spi/package-info.java | 30 microprofile/src/test/resources/tck-suite.xml | 29 15 files changed, 102 insertions(+), 1015 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/b04b841b/microprofile/pom.xml -- diff --git a/microprofile/pom.xml b/microprofile/pom.xml index 1b5d808..123f7b8 100644 --- a/microprofile/pom.xml +++ b/microprofile/pom.xml @@ -38,24 +38,6 @@ under the License. 1.0 - - - -org.apache.maven.plugins -maven-compiler-plugin - -true -${maven.compile.optimize} -${maven.compile.sourceLevel} -${maven.compile.targetLevel} -${project.build.sourceEncoding} - ${maven.compile.deprecation} - - - - - - junit @@ -98,11 +80,48 @@ under the License. provided true - - - - - + +org.eclipse.microprofile.config +microprofile-config-api +1.0 + + +org.eclipse.microprofile.config +microprofile-config-tck +1.0 +test + + +org.testng +testng +6.9.9 +test + + + +tck + + +runTCK + + + + + +org.apache.maven.plugins +maven-surefire-plugin +2.19.1 + + +tck-suite.xml + + + + + + + + http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/b04b841b/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileAdapter.java -- diff --git a/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileAdapter.java b/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileAdapter.java index 29f563c..20d5af0 100644 --- a/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileAdapter.java +++ b/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileAdapter.java @@ -42,9 +42,9 @@ public final class MicroprofileAdapter{ private MicroprofileAdapter(){} /** - * Converts a Tamaya {@link Configuration} into a Microprofile.io {@Config}. + * Converts a Tamaya {@link Configuration} into a Microprofile.io {@link Config}. * @param config the Tamaya {@link Configuration} instance, not null. - * @return the corresponding Microprofile.io {@Config} instance, never null. + * @return the corresponding Microprofile.io {@link Config} instance, never null.