You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/12/09 13:03:26 UTC
[camel] branch master updated: CAMEL-14268: Upgrade to
smallrye-config 1.5
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 04dfa37 CAMEL-14268: Upgrade to smallrye-config 1.5
04dfa37 is described below
commit 04dfa37420ddc4b0e848bbbba66b601d756d7a01
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 9 14:03:05 2019 +0100
CAMEL-14268: Upgrade to smallrye-config 1.5
---
components/camel-microprofile-config/pom.xml | 2 +-
.../config/CamelMicroProfilePropertiesSourceTest.java | 12 +++++++++++-
parent/pom.xml | 2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/components/camel-microprofile-config/pom.xml b/components/camel-microprofile-config/pom.xml
index 9927b3b..4bb6dd5 100644
--- a/components/camel-microprofile-config/pom.xml
+++ b/components/camel-microprofile-config/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<groupId>io.smallrye</groupId>
- <artifactId>smallrye-config-1.3</artifactId>
+ <artifactId>smallrye-config</artifactId>
<version>${smallrye-config-version}</version>
<scope>test</scope>
</dependency>
diff --git a/components/camel-microprofile-config/src/test/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSourceTest.java b/components/camel-microprofile-config/src/test/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSourceTest.java
index 270eb36..2505af4 100644
--- a/components/camel-microprofile-config/src/test/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSourceTest.java
+++ b/components/camel-microprofile-config/src/test/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSourceTest.java
@@ -34,6 +34,8 @@ import org.junit.Test;
public class CamelMicroProfilePropertiesSourceTest extends CamelTestSupport {
+ private Config config;
+
@Override
protected CamelContext createCamelContext() throws Exception {
// setup MPC
@@ -44,7 +46,7 @@ public class CamelMicroProfilePropertiesSourceTest extends CamelTestSupport {
// create PMC config source and register it so we can use it for testing
final PropertiesConfigSource pcs = new PropertiesConfigSource(prop, "my-smallrye-config");
- final Config config = new SmallRyeConfigBuilder().withSources(pcs).build();
+ config = new SmallRyeConfigBuilder().withSources(pcs).build();
ConfigProviderResolver.instance().registerConfig(config, CamelMicroProfilePropertiesSourceTest.class.getClassLoader());
@@ -52,6 +54,14 @@ public class CamelMicroProfilePropertiesSourceTest extends CamelTestSupport {
}
@Override
+ public void tearDown() throws Exception {
+ if (config != null) {
+ ConfigProviderResolver.instance().releaseConfig(config);
+ }
+ super.tearDown();
+ }
+
+ @Override
protected void bindToRegistry(Registry registry) throws Exception {
Properties prop = new Properties();
prop.put("who", "Camel");
diff --git a/parent/pom.xml b/parent/pom.xml
index 700b2bd..e46920f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -567,7 +567,7 @@
<slf4j-api-version>1.7.29</slf4j-api-version>
<slf4j-version>1.7.29</slf4j-version>
<smack-version>4.3.4</smack-version>
- <smallrye-config-version>1.0.0</smallrye-config-version>
+ <smallrye-config-version>1.5.0</smallrye-config-version>
<smallrye-metrics-version>2.3.1</smallrye-metrics-version>
<smallrye-health-version>2.1.0</smallrye-health-version>
<snakeyaml-version>1.25</snakeyaml-version>