Repository: incubator-tamaya Updated Branches: refs/heads/configjsr e56c7c979 -> 97bd06a71
TAMAYA-325: Fake JSR API JAR with jitpack Also get tests passing once the jar is in. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/97bd06a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/97bd06a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/97bd06a7 Branch: refs/heads/configjsr Commit: 97bd06a717e64f9410bc194ed4eb6424351833d8 Parents: e56c7c9 Author: William Lieurance <[email protected]> Authored: Thu Jan 25 01:42:21 2018 -0600 Committer: William Lieurance <[email protected]> Committed: Thu Jan 25 01:42:21 2018 -0600 ---------------------------------------------------------------------- .../apache/tamaya/base/DefaultConfigBuilder.java | 8 ++++++++ .../apache/tamaya/spi/TamayaConfigBuilder.java | 1 - pom.xml | 18 +++++++++++++----- 3 files changed, 21 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/97bd06a7/code/base/src/main/java/org/apache/tamaya/base/DefaultConfigBuilder.java ---------------------------------------------------------------------- diff --git a/code/base/src/main/java/org/apache/tamaya/base/DefaultConfigBuilder.java b/code/base/src/main/java/org/apache/tamaya/base/DefaultConfigBuilder.java index 2eb851a..5a71ba4 100644 --- a/code/base/src/main/java/org/apache/tamaya/base/DefaultConfigBuilder.java +++ b/code/base/src/main/java/org/apache/tamaya/base/DefaultConfigBuilder.java @@ -30,6 +30,7 @@ import javax.config.spi.ConfigSource; import javax.config.spi.Converter; import java.lang.reflect.Type; import java.util.*; +import javax.config.spi.ConfigBuilder; /** * Default implementation of {@link TamayaConfigBuilder}. @@ -246,6 +247,12 @@ public class DefaultConfigBuilder implements TamayaConfigBuilder { } @Override + public <T> ConfigBuilder withConverter(Class<T> type, int i, Converter<T> cnvrtr) { + this.converterManager.addConverter(type, cnvrtr); + return this; + } + + @Override public TamayaConfigBuilder sortFilter(Comparator<Filter> comparator) { this.filterManager.sortFilter(comparator); return this; @@ -302,4 +309,5 @@ public class DefaultConfigBuilder implements TamayaConfigBuilder { } }; } + } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/97bd06a7/code/base/src/main/java/org/apache/tamaya/spi/TamayaConfigBuilder.java ---------------------------------------------------------------------- diff --git a/code/base/src/main/java/org/apache/tamaya/spi/TamayaConfigBuilder.java b/code/base/src/main/java/org/apache/tamaya/spi/TamayaConfigBuilder.java index e48a6bd..43559ba 100644 --- a/code/base/src/main/java/org/apache/tamaya/spi/TamayaConfigBuilder.java +++ b/code/base/src/main/java/org/apache/tamaya/spi/TamayaConfigBuilder.java @@ -326,7 +326,6 @@ public interface TamayaConfigBuilder extends ConfigBuilder, ConfigContextSupplie @Override TamayaConfigBuilder withConverters(Converter<?>... converters); - @Override <T> TamayaConfigBuilder withConverter(Class<T> type, Converter<T> converter); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/97bd06a7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3a292d5..12f758f 100644 --- a/pom.xml +++ b/pom.xml @@ -205,13 +205,20 @@ <module>distribution</module> </modules> + <repositories> + <repository> + <id>jitpack.io</id> + <url>https://jitpack.io</url> + </repository> + </repositories> + <dependencyManagement> <dependencies> <!-- Config API --> <dependency> - <groupId>javax.config</groupId> - <artifactId>javaconfig-api</artifactId> - <version>1.0-SNAPSHOT</version> + <groupId>com.github.eclipse</groupId> + <artifactId>ConfigJSR</artifactId> + <version>6280ed4149055eee9a5f583dda0d75b2a41c4498</version> </dependency> <!-- test support --> <dependency> @@ -302,8 +309,9 @@ <dependencies> <dependency> - <groupId>javax.config</groupId> - <artifactId>javaconfig-api</artifactId> + <groupId>com.github.eclipse</groupId> + <artifactId>ConfigJSR</artifactId> + <version>6280ed4149055eee9a5f583dda0d75b2a41c4498</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId>
