From 0199769c467232ecd93093b552b808b911076842 Mon Sep 17 00:00:00 2001 From: Thierry Monney Date: Wed, 31 May 2023 17:31:29 +0200 Subject: [PATCH] Upgrade to MicroProfile 5.0 Use MicroProfile 5.0 and therefore MicroProfile Config 3.0 * The references to javax.* packages are replaced with the new jakarta.* ones * The Arquillian tests now use SmallRye Config as the MP config implementation instead of the Glassfish one since the latter was never updated to Jakarta EE * Java 11 is now the baseline. This is actually required because SmallRye Config uses Java 11, but it makes little sense to stay on Java 8 when moving to Jakarta EE anyway * The Thorntail example is also removed since it was never upgraded to Jakarta EE Additionally library dependencies and Maven plugin versions are upraged to the latest applicable versions. Fixes #40 --- config-events/pom.xml | 2 +- .../config/event/ChangeEventNotifier.java | 10 +- .../config/event/KeyFilter.java | 4 +- .../config/event/SourceFilter.java | 4 +- .../config/event/TypeFilter.java | 4 +- .../config/event/regex/RegexFilter.java | 4 +- .../event/regex/RegexFilterInterceptor.java | 8 +- .../src/main/resources/META-INF/beans.xml | 4 +- config-example/pom.xml | 125 ++---------------- .../config/example/ApplicationConfig.java | 4 +- .../config/example/EventChangeListener.java | 6 +- .../config/example/ExampleService.java | 24 ++-- .../src/main/openliberty/config/server.xml | 2 +- .../src/main/webapp/WEB-INF/beans.xml | 7 +- configconverter-json/pom.xml | 2 +- .../converter/json/JsonArrayConverter.java | 8 +- .../converter/json/JsonObjectConverter.java | 8 +- configconverter-list/pom.xml | 2 +- .../config/converter/list/ArrayConverter.java | 2 +- .../config/converter/list/ListConverter.java | 2 +- configsource-base/pom.xml | 2 +- configsource-consul/pom.xml | 8 +- configsource-db/pom.xml | 10 +- configsource-etcd/pom.xml | 2 +- .../src/main/resources/META-INF/beans.xml | 4 +- configsource-filebase/pom.xml | 2 +- .../src/main/resources/META-INF/beans.xml | 4 +- configsource-json/pom.xml | 6 +- .../config/source/json/JsonConfigSource.java | 12 +- .../src/main/resources/META-INF/beans.xml | 4 +- .../DisabledWhenEnabledKeyIsFalseTest.java | 8 +- .../EnabledWhenEnabledKeyIsMissingTest.java | 8 +- .../json/EnabledWhenEnabledKeyIsTrueTest.java | 8 +- .../config/source/json/ListTest.java | 8 +- configsource-memory/pom.xml | 2 +- .../config/source/memory/MemoryConfigApi.java | 28 ++-- .../src/main/resources/META-INF/beans.xml | 4 +- configsource-properties/pom.xml | 2 +- .../src/main/resources/META-INF/beans.xml | 4 +- .../DisabledWhenEnabledKeyIsFalseTest.java | 7 +- .../EnabledWhenEnabledKeyIsMissingTest.java | 8 +- .../EnabledWhenEnabledKeyIsTrueTest.java | 7 +- .../config/source/properties/ListTest.java | 8 +- configsource-providers/pom.xml | 2 +- .../config/cdi/ConfigSourceMap.java | 2 +- .../config/cdi/ConfigSourceMapProvider.java | 8 +- .../config/cdi/ConfigSourceProvider.java | 8 +- .../org/microprofileext/config/cdi/Name.java | 4 +- .../src/main/resources/META-INF/beans.xml | 4 +- configsource-typesafeconfig/pom.xml | 10 +- configsource-xml/pom.xml | 2 +- .../src/main/resources/META-INF/beans.xml | 4 +- .../DisabledWhenEnabledKeyIsFalseTest.java | 8 +- .../EnabledWhenEnabledKeyIsMissingTest.java | 8 +- .../xml/EnabledWhenEnabledKeyIsTrueTest.java | 8 +- .../config/source/xml/ListTest.java | 8 +- configsource-yaml/pom.xml | 4 +- .../src/main/resources/META-INF/beans.xml | 4 +- .../DisabledWhenEnabledKeyIsFalseTest.java | 8 +- .../EnabledWhenEnabledKeyIsMissingTest.java | 8 +- .../yaml/EnabledWhenEnabledKeyIsTrueTest.java | 8 +- .../config/source/yaml/ListTest.java | 8 +- pom.xml | 40 +++--- 63 files changed, 181 insertions(+), 363 deletions(-) diff --git a/config-events/pom.xml b/config-events/pom.xml index 05018b0..b9c5373 100644 --- a/config-events/pom.xml +++ b/config-events/pom.xml @@ -4,7 +4,7 @@ org.microprofile-ext config-ext - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT org.microprofile-ext.config-ext diff --git a/config-events/src/main/java/org/microprofileext/config/event/ChangeEventNotifier.java b/config-events/src/main/java/org/microprofileext/config/event/ChangeEventNotifier.java index 8560ace..882d6cc 100644 --- a/config-events/src/main/java/org/microprofileext/config/event/ChangeEventNotifier.java +++ b/config-events/src/main/java/org/microprofileext/config/event/ChangeEventNotifier.java @@ -6,11 +6,11 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Initialized; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Initialized; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; /** * Easy way to fire a change event diff --git a/config-events/src/main/java/org/microprofileext/config/event/KeyFilter.java b/config-events/src/main/java/org/microprofileext/config/event/KeyFilter.java index 2b53895..50c7b16 100644 --- a/config-events/src/main/java/org/microprofileext/config/event/KeyFilter.java +++ b/config-events/src/main/java/org/microprofileext/config/event/KeyFilter.java @@ -2,11 +2,11 @@ import java.lang.annotation.Documented; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import javax.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.util.AnnotationLiteral; /** * Filter the event on the key diff --git a/config-events/src/main/java/org/microprofileext/config/event/SourceFilter.java b/config-events/src/main/java/org/microprofileext/config/event/SourceFilter.java index 47e5434..1691819 100644 --- a/config-events/src/main/java/org/microprofileext/config/event/SourceFilter.java +++ b/config-events/src/main/java/org/microprofileext/config/event/SourceFilter.java @@ -2,11 +2,11 @@ import java.lang.annotation.Documented; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import javax.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.util.AnnotationLiteral; /** * Filter by config source diff --git a/config-events/src/main/java/org/microprofileext/config/event/TypeFilter.java b/config-events/src/main/java/org/microprofileext/config/event/TypeFilter.java index 07d3aab..856f511 100644 --- a/config-events/src/main/java/org/microprofileext/config/event/TypeFilter.java +++ b/config-events/src/main/java/org/microprofileext/config/event/TypeFilter.java @@ -2,11 +2,11 @@ import java.lang.annotation.Documented; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import javax.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.util.AnnotationLiteral; /** * filter by change type diff --git a/config-events/src/main/java/org/microprofileext/config/event/regex/RegexFilter.java b/config-events/src/main/java/org/microprofileext/config/event/regex/RegexFilter.java index c31be63..1e59e7a 100644 --- a/config-events/src/main/java/org/microprofileext/config/event/regex/RegexFilter.java +++ b/config-events/src/main/java/org/microprofileext/config/event/regex/RegexFilter.java @@ -5,8 +5,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; /** * an interceptor that match the value to a regular expression diff --git a/config-events/src/main/java/org/microprofileext/config/event/regex/RegexFilterInterceptor.java b/config-events/src/main/java/org/microprofileext/config/event/regex/RegexFilterInterceptor.java index 2e35120..5ce50a5 100644 --- a/config-events/src/main/java/org/microprofileext/config/event/regex/RegexFilterInterceptor.java +++ b/config-events/src/main/java/org/microprofileext/config/event/regex/RegexFilterInterceptor.java @@ -5,10 +5,10 @@ import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.microprofileext.config.event.ChangeEvent; @RegexFilter(value = "") diff --git a/config-events/src/main/resources/META-INF/beans.xml b/config-events/src/main/resources/META-INF/beans.xml index 1c97df0..a0cd39d 100644 --- a/config-events/src/main/resources/META-INF/beans.xml +++ b/config-events/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/config-example/pom.xml b/config-example/pom.xml index a7477a5..c62b757 100644 --- a/config-example/pom.xml +++ b/config-example/pom.xml @@ -5,7 +5,7 @@ org.microprofile-ext.config-ext config-example war - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT Microprofile Config Extensions :: Example A basic Example of these extensions @@ -13,9 +13,9 @@ false UTF-8 - 1.8 - 1.8 - 4.0.1 + 11 + 11 + 5.0 file:${basedir}${file.separator}src${file.separator}main${file.separator}resources${file.separator}examples${file.separator}config.yaml,file:${basedir}${file.separator}src${file.separator}main${file.separator}resources${file.separator}examples${file.separator}config_prod.yaml,http://localhost/config.yaml @@ -89,7 +89,7 @@ org.microprofile-ext.openapi-ext openapi-ui - 1.1.4 + 2.0.0 runtime @@ -100,112 +100,7 @@ - - - - thorntail - - - thorntail - - - - - 2.3.0.Final - ${basedir}${file.separator}src${file.separator}main${file.separator}resources - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.0.0 - - - add-resource - generate-resources - - add-resource - - - - - - ${thorntail.configDir} - ${project.build.directory} - true - - project*.yml - *.properties - - - - - - - - - - - io.thorntail - thorntail-maven-plugin - ${thorntail.version} - - - 2 - pre-integration-test - - package - - - - - - /${project.build.finalName} - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - 1 - post-integration-test - - exec - - - java - - -jar - ${project.build.directory}${file.separator}${project.build.finalName}-thorntail.jar - -s - ${project.build.directory}${file.separator}project-defaults.yml - -Sdev - -Dconfigsource.yaml.pollForChanges=true - - -Dconfigsource.yaml.url=${config.yaml} - -Dconfigsource.json.url=${config.json} - -Dconfigsource.xml.url=${config.xml} - -Dconfigsource.properties.url=${config.properties} - - - - - - - - - - - - payara @@ -217,8 +112,8 @@ - 1.0.2 - 5.184 + 1.4.0 + 6.2023.2 ${java.io.tmpdir}${file.separator}${project.artifactId}${file.separator}payara-micro ${basedir}${file.separator}src${file.separator}main${file.separator}payara-micro${file.separator}config ${payara-micro.installDir}${file.separator}logs @@ -332,13 +227,13 @@ org.microprofileext.config FINEST - 18.0.0.4 + 22.0.0.13 8080 8443 ${java.io.tmpdir}${file.separator}${project.artifactId}${file.separator}openliberty ${basedir}${file.separator}src${file.separator}main${file.separator}openliberty${file.separator}config ${openliberty.installDir}${file.separator}wlp${file.separator}usr${file.separator}servers${file.separator}defaultServer${file.separator}logs - 2.6 + 2.7 @@ -347,7 +242,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.4.0 add-resource diff --git a/config-example/src/main/java/org/microprofileext/config/example/ApplicationConfig.java b/config-example/src/main/java/org/microprofileext/config/example/ApplicationConfig.java index 6834ce2..279dd06 100644 --- a/config-example/src/main/java/org/microprofileext/config/example/ApplicationConfig.java +++ b/config-example/src/main/java/org/microprofileext/config/example/ApplicationConfig.java @@ -1,7 +1,7 @@ package org.microprofileext.config.example; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; import org.eclipse.microprofile.openapi.annotations.OpenAPIDefinition; import org.eclipse.microprofile.openapi.annotations.info.Contact; import org.eclipse.microprofile.openapi.annotations.info.Info; diff --git a/config-example/src/main/java/org/microprofileext/config/example/EventChangeListener.java b/config-example/src/main/java/org/microprofileext/config/example/EventChangeListener.java index 2477a09..0b8ac65 100644 --- a/config-example/src/main/java/org/microprofileext/config/example/EventChangeListener.java +++ b/config-example/src/main/java/org/microprofileext/config/example/EventChangeListener.java @@ -2,9 +2,9 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.spi.EventMetadata; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.EventMetadata; import org.microprofileext.config.event.ChangeEvent; import org.microprofileext.config.event.Type; import org.microprofileext.config.event.KeyFilter; diff --git a/config-example/src/main/java/org/microprofileext/config/example/ExampleService.java b/config-example/src/main/java/org/microprofileext/config/example/ExampleService.java index 023e8d9..376dd45 100644 --- a/config-example/src/main/java/org/microprofileext/config/example/ExampleService.java +++ b/config-example/src/main/java/org/microprofileext/config/example/ExampleService.java @@ -1,18 +1,18 @@ package org.microprofileext.config.example; import java.util.logging.Logger; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.inject.Provider; -import javax.json.Json; -import javax.json.JsonArrayBuilder; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.inject.Provider; +import jakarta.json.Json; +import jakarta.json.JsonArrayBuilder; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.config.spi.ConfigSource; diff --git a/config-example/src/main/openliberty/config/server.xml b/config-example/src/main/openliberty/config/server.xml index 893377d..c987796 100644 --- a/config-example/src/main/openliberty/config/server.xml +++ b/config-example/src/main/openliberty/config/server.xml @@ -3,7 +3,7 @@ - microProfile-1.4 + microProfile-5.0 - - - + \ No newline at end of file diff --git a/configconverter-json/pom.xml b/configconverter-json/pom.xml index 0e0cde9..5d339f2 100644 --- a/configconverter-json/pom.xml +++ b/configconverter-json/pom.xml @@ -4,7 +4,7 @@ org.microprofile-ext config-ext - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT org.microprofile-ext.config-ext diff --git a/configconverter-json/src/main/java/org/microprofileext/config/converter/json/JsonArrayConverter.java b/configconverter-json/src/main/java/org/microprofileext/config/converter/json/JsonArrayConverter.java index 8b6605f..47afcc2 100644 --- a/configconverter-json/src/main/java/org/microprofileext/config/converter/json/JsonArrayConverter.java +++ b/configconverter-json/src/main/java/org/microprofileext/config/converter/json/JsonArrayConverter.java @@ -1,9 +1,9 @@ package org.microprofileext.config.converter.json; import java.io.StringReader; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonReader; import org.eclipse.microprofile.config.spi.Converter; /** @@ -22,7 +22,7 @@ public JsonArray convert(String input) throws IllegalArgumentException { } /** - * Not to sure about this, got an javax.json.stream.JsonParsingException in Wildfly with a value of org.eclipse.microprofile.config.configproperty.unconfigureddvalue + * Not to sure about this, got an jakarta.json.stream.JsonParsingException in Wildfly with a value of org.eclipse.microprofile.config.configproperty.unconfigureddvalue **/ private boolean isNullOrEmpty(String input){ return input==null || input.isEmpty() || input.equals(UNCONFIGURED_VALUE); diff --git a/configconverter-json/src/main/java/org/microprofileext/config/converter/json/JsonObjectConverter.java b/configconverter-json/src/main/java/org/microprofileext/config/converter/json/JsonObjectConverter.java index 00e5714..7d2faff 100644 --- a/configconverter-json/src/main/java/org/microprofileext/config/converter/json/JsonObjectConverter.java +++ b/configconverter-json/src/main/java/org/microprofileext/config/converter/json/JsonObjectConverter.java @@ -1,9 +1,9 @@ package org.microprofileext.config.converter.json; import java.io.StringReader; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.eclipse.microprofile.config.spi.Converter; /** @@ -22,7 +22,7 @@ public JsonObject convert(String input) throws IllegalArgumentException { } /** - * Not to sure about this, got an javax.json.stream.JsonParsingException in Wildfly with a value of org.eclipse.microprofile.config.configproperty.unconfigureddvalue + * Not to sure about this, got an jakarta.json.stream.JsonParsingException in Wildfly with a value of org.eclipse.microprofile.config.configproperty.unconfigureddvalue **/ private boolean isNullOrEmpty(String input){ return input==null || input.isEmpty() || input.equals(UNCONFIGURED_VALUE); diff --git a/configconverter-list/pom.xml b/configconverter-list/pom.xml index 09ee943..3cc1b90 100644 --- a/configconverter-list/pom.xml +++ b/configconverter-list/pom.xml @@ -4,7 +4,7 @@ org.microprofile-ext config-ext - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT org.microprofile-ext.config-ext diff --git a/configconverter-list/src/main/java/org/microprofileext/config/converter/list/ArrayConverter.java b/configconverter-list/src/main/java/org/microprofileext/config/converter/list/ArrayConverter.java index e0234b4..2855a17 100644 --- a/configconverter-list/src/main/java/org/microprofileext/config/converter/list/ArrayConverter.java +++ b/configconverter-list/src/main/java/org/microprofileext/config/converter/list/ArrayConverter.java @@ -19,7 +19,7 @@ public String[] convert(String input) throws IllegalArgumentException { } /** - * Not to sure about this, got an javax.json.stream.JsonParsingException in Wildfly with a value of org.eclipse.microprofile.config.configproperty.unconfigureddvalue + * Not to sure about this, got an jakarta.json.stream.JsonParsingException in Wildfly with a value of org.eclipse.microprofile.config.configproperty.unconfigureddvalue **/ private boolean isNullOrEmpty(String input){ return input==null || input.isEmpty() || input.equals(UNCONFIGURED_VALUE); diff --git a/configconverter-list/src/main/java/org/microprofileext/config/converter/list/ListConverter.java b/configconverter-list/src/main/java/org/microprofileext/config/converter/list/ListConverter.java index 5145883..7eec3fb 100644 --- a/configconverter-list/src/main/java/org/microprofileext/config/converter/list/ListConverter.java +++ b/configconverter-list/src/main/java/org/microprofileext/config/converter/list/ListConverter.java @@ -21,7 +21,7 @@ public List convert(String input) throws IllegalArgumentException { } /** - * Not to sure about this, got an javax.json.stream.JsonParsingException in Wildfly with a value of org.eclipse.microprofile.config.configproperty.unconfigureddvalue + * Not to sure about this, got an jakarta.json.stream.JsonParsingException in Wildfly with a value of org.eclipse.microprofile.config.configproperty.unconfigureddvalue **/ private boolean isNullOrEmpty(String input){ return input==null || input.isEmpty() || input.equals(UNCONFIGURED_VALUE); diff --git a/configsource-base/pom.xml b/configsource-base/pom.xml index 21acd90..dd1abce 100644 --- a/configsource-base/pom.xml +++ b/configsource-base/pom.xml @@ -4,7 +4,7 @@ org.microprofile-ext config-ext - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT org.microprofile-ext.config-ext diff --git a/configsource-consul/pom.xml b/configsource-consul/pom.xml index d204425..bfe2c5e 100644 --- a/configsource-consul/pom.xml +++ b/configsource-consul/pom.xml @@ -4,7 +4,7 @@ org.microprofile-ext config-ext - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT org.microprofile-ext.config-ext @@ -14,7 +14,7 @@ A config that gets the values from an Consul server - 5.7.0 + 5.9.3 @@ -38,13 +38,13 @@ org.mockito mockito-core - 3.6.0 + 5.3.1 test org.mock-server mockserver-junit-jupiter - 5.11.2 + 5.15.0 test diff --git a/configsource-db/pom.xml b/configsource-db/pom.xml index bcd1dce..d43ff4c 100644 --- a/configsource-db/pom.xml +++ b/configsource-db/pom.xml @@ -3,7 +3,7 @@ org.microprofile-ext config-ext - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT org.microprofile-ext.config-ext @@ -13,7 +13,7 @@ A config that get the values from a datasource - 5.7.0 + 5.9.3 @@ -32,7 +32,7 @@ org.mockito mockito-core - 3.6.0 + 5.3.1 test @@ -43,12 +43,12 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.1 + 3.1.0 org.jacoco jacoco-maven-plugin - 0.8.2 + 0.8.10 diff --git a/configsource-etcd/pom.xml b/configsource-etcd/pom.xml index c0c2f1e..1754997 100644 --- a/configsource-etcd/pom.xml +++ b/configsource-etcd/pom.xml @@ -4,7 +4,7 @@ org.microprofile-ext config-ext - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT org.microprofile-ext.config-ext diff --git a/configsource-etcd/src/main/resources/META-INF/beans.xml b/configsource-etcd/src/main/resources/META-INF/beans.xml index 1c97df0..a0cd39d 100644 --- a/configsource-etcd/src/main/resources/META-INF/beans.xml +++ b/configsource-etcd/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/configsource-filebase/pom.xml b/configsource-filebase/pom.xml index 79ab964..631dd77 100644 --- a/configsource-filebase/pom.xml +++ b/configsource-filebase/pom.xml @@ -4,7 +4,7 @@ org.microprofile-ext config-ext - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT org.microprofile-ext.config-ext diff --git a/configsource-filebase/src/main/resources/META-INF/beans.xml b/configsource-filebase/src/main/resources/META-INF/beans.xml index 1c97df0..a0cd39d 100644 --- a/configsource-filebase/src/main/resources/META-INF/beans.xml +++ b/configsource-filebase/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/configsource-json/pom.xml b/configsource-json/pom.xml index 9b294c7..5ec13c5 100644 --- a/configsource-json/pom.xml +++ b/configsource-json/pom.xml @@ -4,7 +4,7 @@ org.microprofile-ext config-ext - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT org.microprofile-ext.config-ext @@ -23,8 +23,8 @@ org.glassfish - javax.json - 1.1.4 + jakarta.json + 2.0.1 test diff --git a/configsource-json/src/main/java/org/microprofileext/config/source/json/JsonConfigSource.java b/configsource-json/src/main/java/org/microprofileext/config/source/json/JsonConfigSource.java index ea27aaf..151533f 100644 --- a/configsource-json/src/main/java/org/microprofileext/config/source/json/JsonConfigSource.java +++ b/configsource-json/src/main/java/org/microprofileext/config/source/json/JsonConfigSource.java @@ -8,12 +8,12 @@ import java.util.Map; import java.util.TreeMap; import java.util.logging.Logger; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonException; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonValue; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonException; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; +import jakarta.json.JsonValue; import org.microprofileext.config.source.base.file.AbstractUrlBasedSource; /** diff --git a/configsource-json/src/main/resources/META-INF/beans.xml b/configsource-json/src/main/resources/META-INF/beans.xml index 1c97df0..a0cd39d 100644 --- a/configsource-json/src/main/resources/META-INF/beans.xml +++ b/configsource-json/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/configsource-json/src/test/java/org/microprofileext/config/source/json/DisabledWhenEnabledKeyIsFalseTest.java b/configsource-json/src/test/java/org/microprofileext/config/source/json/DisabledWhenEnabledKeyIsFalseTest.java index bf89915..59936df 100644 --- a/configsource-json/src/test/java/org/microprofileext/config/source/json/DisabledWhenEnabledKeyIsFalseTest.java +++ b/configsource-json/src/test/java/org/microprofileext/config/source/json/DisabledWhenEnabledKeyIsFalseTest.java @@ -1,10 +1,8 @@ package org.microprofileext.config.source.json; import java.util.NoSuchElementException; -import javax.enterprise.inject.spi.Extension; -import javax.inject.Inject; -import org.apache.geronimo.config.ConfigImpl; -import org.apache.geronimo.config.cdi.ConfigExtension; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.ConfigSource; import org.jboss.arquillian.container.test.api.Deployment; @@ -26,9 +24,7 @@ public class DisabledWhenEnabledKeyIsFalseTest { @Deployment public static JavaArchive createDeployment() { return ShrinkWrap.create(JavaArchive.class) - .addPackages(true, ConfigImpl.class.getPackage()) .addPackages(true, Config.class.getPackage()) - .addAsServiceProviderAndClasses(Extension.class, ConfigExtension.class) .addAsServiceProviderAndClasses(ConfigSource.class, JsonConfigSource.class) .addAsResource(DisabledWhenEnabledKeyIsFalseTest.class.getClassLoader().getResource("config-disabled.properties"), "META-INF/microprofile-config.properties") .addAsManifestResource("META-INF/beans.xml"); diff --git a/configsource-json/src/test/java/org/microprofileext/config/source/json/EnabledWhenEnabledKeyIsMissingTest.java b/configsource-json/src/test/java/org/microprofileext/config/source/json/EnabledWhenEnabledKeyIsMissingTest.java index 518c515..a954bfe 100644 --- a/configsource-json/src/test/java/org/microprofileext/config/source/json/EnabledWhenEnabledKeyIsMissingTest.java +++ b/configsource-json/src/test/java/org/microprofileext/config/source/json/EnabledWhenEnabledKeyIsMissingTest.java @@ -15,10 +15,8 @@ */ package org.microprofileext.config.source.json; -import javax.enterprise.inject.spi.Extension; -import javax.inject.Inject; -import org.apache.geronimo.config.ConfigImpl; -import org.apache.geronimo.config.cdi.ConfigExtension; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.ConfigSource; @@ -41,9 +39,7 @@ public class EnabledWhenEnabledKeyIsMissingTest { @Deployment public static JavaArchive createDeployment() { return ShrinkWrap.create(JavaArchive.class) - .addPackages(true, ConfigImpl.class.getPackage()) .addPackages(true, Config.class.getPackage()) - .addAsServiceProviderAndClasses(Extension.class, ConfigExtension.class) .addAsServiceProviderAndClasses(ConfigSource.class, JsonConfigSource.class) .addAsResource(EnabledWhenEnabledKeyIsMissingTest.class.getClassLoader().getResource("config-empty.properties"), "META-INF/microprofile-config.properties") .addAsManifestResource("META-INF/beans.xml"); diff --git a/configsource-json/src/test/java/org/microprofileext/config/source/json/EnabledWhenEnabledKeyIsTrueTest.java b/configsource-json/src/test/java/org/microprofileext/config/source/json/EnabledWhenEnabledKeyIsTrueTest.java index 9562954..0915d5d 100644 --- a/configsource-json/src/test/java/org/microprofileext/config/source/json/EnabledWhenEnabledKeyIsTrueTest.java +++ b/configsource-json/src/test/java/org/microprofileext/config/source/json/EnabledWhenEnabledKeyIsTrueTest.java @@ -15,10 +15,8 @@ */ package org.microprofileext.config.source.json; -import javax.enterprise.inject.spi.Extension; -import javax.inject.Inject; -import org.apache.geronimo.config.ConfigImpl; -import org.apache.geronimo.config.cdi.ConfigExtension; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.ConfigSource; @@ -41,9 +39,7 @@ public class EnabledWhenEnabledKeyIsTrueTest { @Deployment public static JavaArchive createDeployment() { return ShrinkWrap.create(JavaArchive.class) - .addPackages(true, ConfigImpl.class.getPackage()) .addPackages(true, Config.class.getPackage()) - .addAsServiceProviderAndClasses(Extension.class, ConfigExtension.class) .addAsServiceProviderAndClasses(ConfigSource.class, JsonConfigSource.class) .addAsResource(EnabledWhenEnabledKeyIsTrueTest.class.getClassLoader().getResource("config-enabled.properties"), "META-INF/microprofile-config.properties") .addAsManifestResource("META-INF/beans.xml"); diff --git a/configsource-json/src/test/java/org/microprofileext/config/source/json/ListTest.java b/configsource-json/src/test/java/org/microprofileext/config/source/json/ListTest.java index f690d60..5c525f3 100644 --- a/configsource-json/src/test/java/org/microprofileext/config/source/json/ListTest.java +++ b/configsource-json/src/test/java/org/microprofileext/config/source/json/ListTest.java @@ -2,10 +2,8 @@ import java.util.List; import java.util.Set; -import javax.enterprise.inject.spi.Extension; -import javax.inject.Inject; -import org.apache.geronimo.config.ConfigImpl; -import org.apache.geronimo.config.cdi.ConfigExtension; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.config.spi.ConfigSource; @@ -46,9 +44,7 @@ public class ListTest { @Deployment public static JavaArchive createDeployment() { return ShrinkWrap.create(JavaArchive.class) - .addPackages(true, ConfigImpl.class.getPackage()) .addPackages(true, Config.class.getPackage()) - .addAsServiceProviderAndClasses(Extension.class, ConfigExtension.class) .addAsServiceProviderAndClasses(ConfigSource.class, JsonConfigSource.class) .addAsManifestResource("META-INF/beans.xml"); } diff --git a/configsource-memory/pom.xml b/configsource-memory/pom.xml index ecd09c5..a923a23 100644 --- a/configsource-memory/pom.xml +++ b/configsource-memory/pom.xml @@ -4,7 +4,7 @@ org.microprofile-ext config-ext - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT org.microprofile-ext.config-ext diff --git a/configsource-memory/src/main/java/org/microprofileext/config/source/memory/MemoryConfigApi.java b/configsource-memory/src/main/java/org/microprofileext/config/source/memory/MemoryConfigApi.java index 5864388..0c4aa14 100644 --- a/configsource-memory/src/main/java/org/microprofileext/config/source/memory/MemoryConfigApi.java +++ b/configsource-memory/src/main/java/org/microprofileext/config/source/memory/MemoryConfigApi.java @@ -3,20 +3,20 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.config.spi.ConfigSource; diff --git a/configsource-memory/src/main/resources/META-INF/beans.xml b/configsource-memory/src/main/resources/META-INF/beans.xml index 1c97df0..a0cd39d 100644 --- a/configsource-memory/src/main/resources/META-INF/beans.xml +++ b/configsource-memory/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/configsource-properties/pom.xml b/configsource-properties/pom.xml index 61aab93..dc615ab 100644 --- a/configsource-properties/pom.xml +++ b/configsource-properties/pom.xml @@ -4,7 +4,7 @@ org.microprofile-ext config-ext - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT org.microprofile-ext.config-ext diff --git a/configsource-properties/src/main/resources/META-INF/beans.xml b/configsource-properties/src/main/resources/META-INF/beans.xml index 1c97df0..a0cd39d 100644 --- a/configsource-properties/src/main/resources/META-INF/beans.xml +++ b/configsource-properties/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/configsource-properties/src/test/java/org/microprofileext/config/source/properties/DisabledWhenEnabledKeyIsFalseTest.java b/configsource-properties/src/test/java/org/microprofileext/config/source/properties/DisabledWhenEnabledKeyIsFalseTest.java index 38d19d3..5a8ef95 100644 --- a/configsource-properties/src/test/java/org/microprofileext/config/source/properties/DisabledWhenEnabledKeyIsFalseTest.java +++ b/configsource-properties/src/test/java/org/microprofileext/config/source/properties/DisabledWhenEnabledKeyIsFalseTest.java @@ -16,10 +16,7 @@ package org.microprofileext.config.source.properties; import java.util.NoSuchElementException; -import javax.enterprise.inject.spi.Extension; -import javax.inject.Inject; -import org.apache.geronimo.config.ConfigImpl; -import org.apache.geronimo.config.cdi.ConfigExtension; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.ConfigSource; import org.jboss.arquillian.container.test.api.Deployment; @@ -41,9 +38,7 @@ public class DisabledWhenEnabledKeyIsFalseTest { @Deployment public static JavaArchive createDeployment() { return ShrinkWrap.create(JavaArchive.class) - .addPackages(true, ConfigImpl.class.getPackage()) .addPackages(true, Config.class.getPackage()) - .addAsServiceProviderAndClasses(Extension.class, ConfigExtension.class) .addAsServiceProviderAndClasses(ConfigSource.class, PropertiesConfigSource.class) .addAsResource(DisabledWhenEnabledKeyIsFalseTest.class.getClassLoader().getResource("config-disabled.properties"), "META-INF/microprofile-config.properties") .addAsManifestResource("META-INF/beans.xml"); diff --git a/configsource-properties/src/test/java/org/microprofileext/config/source/properties/EnabledWhenEnabledKeyIsMissingTest.java b/configsource-properties/src/test/java/org/microprofileext/config/source/properties/EnabledWhenEnabledKeyIsMissingTest.java index 8f11910..878ea45 100644 --- a/configsource-properties/src/test/java/org/microprofileext/config/source/properties/EnabledWhenEnabledKeyIsMissingTest.java +++ b/configsource-properties/src/test/java/org/microprofileext/config/source/properties/EnabledWhenEnabledKeyIsMissingTest.java @@ -15,11 +15,9 @@ */ package org.microprofileext.config.source.properties; -import javax.enterprise.inject.spi.Extension; -import javax.inject.Inject; -import org.apache.geronimo.config.ConfigImpl; -import org.apache.geronimo.config.cdi.ConfigExtension; +import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; + import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.ConfigSource; import org.jboss.arquillian.container.test.api.Deployment; @@ -41,9 +39,7 @@ public class EnabledWhenEnabledKeyIsMissingTest { @Deployment public static JavaArchive createDeployment() { return ShrinkWrap.create(JavaArchive.class) - .addPackages(true, ConfigImpl.class.getPackage()) .addPackages(true, Config.class.getPackage()) - .addAsServiceProviderAndClasses(Extension.class, ConfigExtension.class) .addAsServiceProviderAndClasses(ConfigSource.class, PropertiesConfigSource.class) .addAsResource(EnabledWhenEnabledKeyIsMissingTest.class.getClassLoader().getResource("config-empty.properties"), "META-INF/microprofile-config.properties") .addAsManifestResource("META-INF/beans.xml"); diff --git a/configsource-properties/src/test/java/org/microprofileext/config/source/properties/EnabledWhenEnabledKeyIsTrueTest.java b/configsource-properties/src/test/java/org/microprofileext/config/source/properties/EnabledWhenEnabledKeyIsTrueTest.java index c26a76c..f8b06eb 100644 --- a/configsource-properties/src/test/java/org/microprofileext/config/source/properties/EnabledWhenEnabledKeyIsTrueTest.java +++ b/configsource-properties/src/test/java/org/microprofileext/config/source/properties/EnabledWhenEnabledKeyIsTrueTest.java @@ -15,10 +15,7 @@ */ package org.microprofileext.config.source.properties; -import javax.enterprise.inject.spi.Extension; -import javax.inject.Inject; -import org.apache.geronimo.config.ConfigImpl; -import org.apache.geronimo.config.cdi.ConfigExtension; +import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.ConfigSource; @@ -41,9 +38,7 @@ public class EnabledWhenEnabledKeyIsTrueTest { @Deployment public static JavaArchive createDeployment() { return ShrinkWrap.create(JavaArchive.class) - .addPackages(true, ConfigImpl.class.getPackage()) .addPackages(true, Config.class.getPackage()) - .addAsServiceProviderAndClasses(Extension.class, ConfigExtension.class) .addAsServiceProviderAndClasses(ConfigSource.class, PropertiesConfigSource.class) .addAsResource(EnabledWhenEnabledKeyIsTrueTest.class.getClassLoader().getResource("config-enabled.properties"), "META-INF/microprofile-config.properties") .addAsManifestResource("META-INF/beans.xml"); diff --git a/configsource-properties/src/test/java/org/microprofileext/config/source/properties/ListTest.java b/configsource-properties/src/test/java/org/microprofileext/config/source/properties/ListTest.java index 33ee1ae..f18487c 100644 --- a/configsource-properties/src/test/java/org/microprofileext/config/source/properties/ListTest.java +++ b/configsource-properties/src/test/java/org/microprofileext/config/source/properties/ListTest.java @@ -2,10 +2,8 @@ import java.util.List; import java.util.Set; -import javax.enterprise.inject.spi.Extension; -import javax.inject.Inject; -import org.apache.geronimo.config.ConfigImpl; -import org.apache.geronimo.config.cdi.ConfigExtension; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.config.spi.ConfigSource; @@ -46,9 +44,7 @@ public class ListTest { @Deployment public static JavaArchive createDeployment() { return ShrinkWrap.create(JavaArchive.class) - .addPackages(true, ConfigImpl.class.getPackage()) .addPackages(true, Config.class.getPackage()) - .addAsServiceProviderAndClasses(Extension.class, ConfigExtension.class) .addAsServiceProviderAndClasses(ConfigSource.class, PropertiesConfigSource.class) .addAsManifestResource("META-INF/beans.xml"); } diff --git a/configsource-providers/pom.xml b/configsource-providers/pom.xml index f34d858..15b7c27 100644 --- a/configsource-providers/pom.xml +++ b/configsource-providers/pom.xml @@ -4,7 +4,7 @@ org.microprofile-ext config-ext - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT org.microprofile-ext.config-ext diff --git a/configsource-providers/src/main/java/org/microprofileext/config/cdi/ConfigSourceMap.java b/configsource-providers/src/main/java/org/microprofileext/config/cdi/ConfigSourceMap.java index 6a2f64e..12c77a5 100644 --- a/configsource-providers/src/main/java/org/microprofileext/config/cdi/ConfigSourceMap.java +++ b/configsource-providers/src/main/java/org/microprofileext/config/cdi/ConfigSourceMap.java @@ -4,7 +4,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Mark a map that contains the configsources diff --git a/configsource-providers/src/main/java/org/microprofileext/config/cdi/ConfigSourceMapProvider.java b/configsource-providers/src/main/java/org/microprofileext/config/cdi/ConfigSourceMapProvider.java index 4eeebea..c8b3565 100644 --- a/configsource-providers/src/main/java/org/microprofileext/config/cdi/ConfigSourceMapProvider.java +++ b/configsource-providers/src/main/java/org/microprofileext/config/cdi/ConfigSourceMapProvider.java @@ -3,10 +3,10 @@ import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.ConfigSource; diff --git a/configsource-providers/src/main/java/org/microprofileext/config/cdi/ConfigSourceProvider.java b/configsource-providers/src/main/java/org/microprofileext/config/cdi/ConfigSourceProvider.java index f65e155..245e15d 100644 --- a/configsource-providers/src/main/java/org/microprofileext/config/cdi/ConfigSourceProvider.java +++ b/configsource-providers/src/main/java/org/microprofileext/config/cdi/ConfigSourceProvider.java @@ -4,10 +4,10 @@ import java.util.Map; import java.util.Set; import java.util.logging.Logger; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.spi.ConfigSource; /** diff --git a/configsource-providers/src/main/java/org/microprofileext/config/cdi/Name.java b/configsource-providers/src/main/java/org/microprofileext/config/cdi/Name.java index f52d097..e5abc04 100644 --- a/configsource-providers/src/main/java/org/microprofileext/config/cdi/Name.java +++ b/configsource-providers/src/main/java/org/microprofileext/config/cdi/Name.java @@ -4,8 +4,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; /** * The define the name of a config source diff --git a/configsource-providers/src/main/resources/META-INF/beans.xml b/configsource-providers/src/main/resources/META-INF/beans.xml index 1c97df0..a0cd39d 100644 --- a/configsource-providers/src/main/resources/META-INF/beans.xml +++ b/configsource-providers/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/configsource-typesafeconfig/pom.xml b/configsource-typesafeconfig/pom.xml index e9725ed..e8f6944 100644 --- a/configsource-typesafeconfig/pom.xml +++ b/configsource-typesafeconfig/pom.xml @@ -4,7 +4,7 @@ org.microprofile-ext config-ext - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT org.microprofile-ext.config-ext @@ -14,8 +14,8 @@ A config that gets the values from a TypeSafe Config configuration source - 5.3.2 - 1.3.2 + 5.9.3 + 1.9.3 @@ -28,7 +28,7 @@ com.typesafe config - 1.4.1 + 1.4.2 @@ -46,7 +46,7 @@ org.mockito mockito-core - 2.23.4 + 5.3.1 test diff --git a/configsource-xml/pom.xml b/configsource-xml/pom.xml index 9965d11..bee6ba3 100644 --- a/configsource-xml/pom.xml +++ b/configsource-xml/pom.xml @@ -4,7 +4,7 @@ org.microprofile-ext config-ext - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT org.microprofile-ext.config-ext diff --git a/configsource-xml/src/main/resources/META-INF/beans.xml b/configsource-xml/src/main/resources/META-INF/beans.xml index 1c97df0..a0cd39d 100644 --- a/configsource-xml/src/main/resources/META-INF/beans.xml +++ b/configsource-xml/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/configsource-xml/src/test/java/org/microprofileext/config/source/xml/DisabledWhenEnabledKeyIsFalseTest.java b/configsource-xml/src/test/java/org/microprofileext/config/source/xml/DisabledWhenEnabledKeyIsFalseTest.java index 5e058fd..a696cf0 100644 --- a/configsource-xml/src/test/java/org/microprofileext/config/source/xml/DisabledWhenEnabledKeyIsFalseTest.java +++ b/configsource-xml/src/test/java/org/microprofileext/config/source/xml/DisabledWhenEnabledKeyIsFalseTest.java @@ -1,10 +1,8 @@ package org.microprofileext.config.source.xml; import java.util.NoSuchElementException; -import javax.enterprise.inject.spi.Extension; -import javax.inject.Inject; -import org.apache.geronimo.config.ConfigImpl; -import org.apache.geronimo.config.cdi.ConfigExtension; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.ConfigSource; import org.jboss.arquillian.container.test.api.Deployment; @@ -26,9 +24,7 @@ public class DisabledWhenEnabledKeyIsFalseTest { @Deployment public static JavaArchive createDeployment() { return ShrinkWrap.create(JavaArchive.class) - .addPackages(true, ConfigImpl.class.getPackage()) .addPackages(true, Config.class.getPackage()) - .addAsServiceProviderAndClasses(Extension.class, ConfigExtension.class) .addAsServiceProviderAndClasses(ConfigSource.class, XmlConfigSource.class) .addAsResource(DisabledWhenEnabledKeyIsFalseTest.class.getClassLoader().getResource("config-disabled.properties"), "META-INF/microprofile-config.properties") .addAsManifestResource("META-INF/beans.xml"); diff --git a/configsource-xml/src/test/java/org/microprofileext/config/source/xml/EnabledWhenEnabledKeyIsMissingTest.java b/configsource-xml/src/test/java/org/microprofileext/config/source/xml/EnabledWhenEnabledKeyIsMissingTest.java index 5576364..19d1ef0 100644 --- a/configsource-xml/src/test/java/org/microprofileext/config/source/xml/EnabledWhenEnabledKeyIsMissingTest.java +++ b/configsource-xml/src/test/java/org/microprofileext/config/source/xml/EnabledWhenEnabledKeyIsMissingTest.java @@ -1,9 +1,7 @@ package org.microprofileext.config.source.xml; -import javax.enterprise.inject.spi.Extension; -import javax.inject.Inject; -import org.apache.geronimo.config.ConfigImpl; -import org.apache.geronimo.config.cdi.ConfigExtension; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.ConfigSource; @@ -26,9 +24,7 @@ public class EnabledWhenEnabledKeyIsMissingTest { @Deployment public static JavaArchive createDeployment() { return ShrinkWrap.create(JavaArchive.class) - .addPackages(true, ConfigImpl.class.getPackage()) .addPackages(true, Config.class.getPackage()) - .addAsServiceProviderAndClasses(Extension.class, ConfigExtension.class) .addAsServiceProviderAndClasses(ConfigSource.class, XmlConfigSource.class) .addAsResource(EnabledWhenEnabledKeyIsMissingTest.class.getClassLoader().getResource("config-empty.properties"), "META-INF/microprofile-config.properties") .addAsManifestResource("META-INF/beans.xml"); diff --git a/configsource-xml/src/test/java/org/microprofileext/config/source/xml/EnabledWhenEnabledKeyIsTrueTest.java b/configsource-xml/src/test/java/org/microprofileext/config/source/xml/EnabledWhenEnabledKeyIsTrueTest.java index ad41353..ed8b822 100644 --- a/configsource-xml/src/test/java/org/microprofileext/config/source/xml/EnabledWhenEnabledKeyIsTrueTest.java +++ b/configsource-xml/src/test/java/org/microprofileext/config/source/xml/EnabledWhenEnabledKeyIsTrueTest.java @@ -1,9 +1,7 @@ package org.microprofileext.config.source.xml; -import javax.enterprise.inject.spi.Extension; -import javax.inject.Inject; -import org.apache.geronimo.config.ConfigImpl; -import org.apache.geronimo.config.cdi.ConfigExtension; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.ConfigSource; @@ -26,9 +24,7 @@ public class EnabledWhenEnabledKeyIsTrueTest { @Deployment public static JavaArchive createDeployment() { return ShrinkWrap.create(JavaArchive.class) - .addPackages(true, ConfigImpl.class.getPackage()) .addPackages(true, Config.class.getPackage()) - .addAsServiceProviderAndClasses(Extension.class, ConfigExtension.class) .addAsServiceProviderAndClasses(ConfigSource.class, XmlConfigSource.class) .addAsResource(EnabledWhenEnabledKeyIsTrueTest.class.getClassLoader().getResource("config-enabled.properties"), "META-INF/microprofile-config.properties") .addAsManifestResource("META-INF/beans.xml"); diff --git a/configsource-xml/src/test/java/org/microprofileext/config/source/xml/ListTest.java b/configsource-xml/src/test/java/org/microprofileext/config/source/xml/ListTest.java index ceed3f3..5f54cfa 100644 --- a/configsource-xml/src/test/java/org/microprofileext/config/source/xml/ListTest.java +++ b/configsource-xml/src/test/java/org/microprofileext/config/source/xml/ListTest.java @@ -2,10 +2,8 @@ import java.util.List; import java.util.Set; -import javax.enterprise.inject.spi.Extension; -import javax.inject.Inject; -import org.apache.geronimo.config.ConfigImpl; -import org.apache.geronimo.config.cdi.ConfigExtension; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.config.spi.ConfigSource; @@ -46,9 +44,7 @@ public class ListTest { @Deployment public static JavaArchive createDeployment() { return ShrinkWrap.create(JavaArchive.class) - .addPackages(true, ConfigImpl.class.getPackage()) .addPackages(true, Config.class.getPackage()) - .addAsServiceProviderAndClasses(Extension.class, ConfigExtension.class) .addAsServiceProviderAndClasses(ConfigSource.class, XmlConfigSource.class) .addAsManifestResource("META-INF/beans.xml"); } diff --git a/configsource-yaml/pom.xml b/configsource-yaml/pom.xml index e86b9ee..1062680 100644 --- a/configsource-yaml/pom.xml +++ b/configsource-yaml/pom.xml @@ -4,7 +4,7 @@ org.microprofile-ext config-ext - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT org.microprofile-ext.config-ext @@ -17,7 +17,7 @@ org.yaml snakeyaml - 1.28 + 2.0 diff --git a/configsource-yaml/src/main/resources/META-INF/beans.xml b/configsource-yaml/src/main/resources/META-INF/beans.xml index 1c97df0..a0cd39d 100644 --- a/configsource-yaml/src/main/resources/META-INF/beans.xml +++ b/configsource-yaml/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/configsource-yaml/src/test/java/org/microprofileext/config/source/yaml/DisabledWhenEnabledKeyIsFalseTest.java b/configsource-yaml/src/test/java/org/microprofileext/config/source/yaml/DisabledWhenEnabledKeyIsFalseTest.java index f00513a..404e844 100644 --- a/configsource-yaml/src/test/java/org/microprofileext/config/source/yaml/DisabledWhenEnabledKeyIsFalseTest.java +++ b/configsource-yaml/src/test/java/org/microprofileext/config/source/yaml/DisabledWhenEnabledKeyIsFalseTest.java @@ -1,10 +1,8 @@ package org.microprofileext.config.source.yaml; import java.util.NoSuchElementException; -import javax.enterprise.inject.spi.Extension; -import javax.inject.Inject; -import org.apache.geronimo.config.ConfigImpl; -import org.apache.geronimo.config.cdi.ConfigExtension; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.ConfigSource; import org.jboss.arquillian.container.test.api.Deployment; @@ -26,9 +24,7 @@ public class DisabledWhenEnabledKeyIsFalseTest { @Deployment public static JavaArchive createDeployment() { return ShrinkWrap.create(JavaArchive.class) - .addPackages(true, ConfigImpl.class.getPackage()) .addPackages(true, Config.class.getPackage()) - .addAsServiceProviderAndClasses(Extension.class, ConfigExtension.class) .addAsServiceProviderAndClasses(ConfigSource.class, YamlConfigSource.class) .addAsResource(DisabledWhenEnabledKeyIsFalseTest.class.getClassLoader().getResource("config-disabled.properties"), "META-INF/microprofile-config.properties") .addAsManifestResource("META-INF/beans.xml"); diff --git a/configsource-yaml/src/test/java/org/microprofileext/config/source/yaml/EnabledWhenEnabledKeyIsMissingTest.java b/configsource-yaml/src/test/java/org/microprofileext/config/source/yaml/EnabledWhenEnabledKeyIsMissingTest.java index a308e74..4a9a3f1 100644 --- a/configsource-yaml/src/test/java/org/microprofileext/config/source/yaml/EnabledWhenEnabledKeyIsMissingTest.java +++ b/configsource-yaml/src/test/java/org/microprofileext/config/source/yaml/EnabledWhenEnabledKeyIsMissingTest.java @@ -1,9 +1,7 @@ package org.microprofileext.config.source.yaml; -import javax.enterprise.inject.spi.Extension; -import javax.inject.Inject; -import org.apache.geronimo.config.ConfigImpl; -import org.apache.geronimo.config.cdi.ConfigExtension; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.ConfigSource; @@ -26,9 +24,7 @@ public class EnabledWhenEnabledKeyIsMissingTest { @Deployment public static JavaArchive createDeployment() { return ShrinkWrap.create(JavaArchive.class) - .addPackages(true, ConfigImpl.class.getPackage()) .addPackages(true, Config.class.getPackage()) - .addAsServiceProviderAndClasses(Extension.class, ConfigExtension.class) .addAsServiceProviderAndClasses(ConfigSource.class, YamlConfigSource.class) .addAsResource(EnabledWhenEnabledKeyIsMissingTest.class.getClassLoader().getResource("config-empty.properties"), "META-INF/microprofile-config.properties") .addAsManifestResource("META-INF/beans.xml"); diff --git a/configsource-yaml/src/test/java/org/microprofileext/config/source/yaml/EnabledWhenEnabledKeyIsTrueTest.java b/configsource-yaml/src/test/java/org/microprofileext/config/source/yaml/EnabledWhenEnabledKeyIsTrueTest.java index ba448f3..de3be6b 100644 --- a/configsource-yaml/src/test/java/org/microprofileext/config/source/yaml/EnabledWhenEnabledKeyIsTrueTest.java +++ b/configsource-yaml/src/test/java/org/microprofileext/config/source/yaml/EnabledWhenEnabledKeyIsTrueTest.java @@ -1,9 +1,7 @@ package org.microprofileext.config.source.yaml; -import javax.enterprise.inject.spi.Extension; -import javax.inject.Inject; -import org.apache.geronimo.config.ConfigImpl; -import org.apache.geronimo.config.cdi.ConfigExtension; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.ConfigSource; @@ -26,9 +24,7 @@ public class EnabledWhenEnabledKeyIsTrueTest { @Deployment public static JavaArchive createDeployment() { return ShrinkWrap.create(JavaArchive.class) - .addPackages(true, ConfigImpl.class.getPackage()) .addPackages(true, Config.class.getPackage()) - .addAsServiceProviderAndClasses(Extension.class, ConfigExtension.class) .addAsServiceProviderAndClasses(ConfigSource.class, YamlConfigSource.class) .addAsResource(EnabledWhenEnabledKeyIsTrueTest.class.getClassLoader().getResource("config-enabled.properties"), "META-INF/microprofile-config.properties") .addAsManifestResource("META-INF/beans.xml"); diff --git a/configsource-yaml/src/test/java/org/microprofileext/config/source/yaml/ListTest.java b/configsource-yaml/src/test/java/org/microprofileext/config/source/yaml/ListTest.java index 27e9b93..429c267 100644 --- a/configsource-yaml/src/test/java/org/microprofileext/config/source/yaml/ListTest.java +++ b/configsource-yaml/src/test/java/org/microprofileext/config/source/yaml/ListTest.java @@ -2,10 +2,8 @@ import java.util.List; import java.util.Set; -import javax.enterprise.inject.spi.Extension; -import javax.inject.Inject; -import org.apache.geronimo.config.ConfigImpl; -import org.apache.geronimo.config.cdi.ConfigExtension; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.inject.Inject; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.config.spi.ConfigSource; @@ -46,9 +44,7 @@ public class ListTest { @Deployment public static JavaArchive createDeployment() { return ShrinkWrap.create(JavaArchive.class) - .addPackages(true, ConfigImpl.class.getPackage()) .addPackages(true, Config.class.getPackage()) - .addAsServiceProviderAndClasses(Extension.class, ConfigExtension.class) .addAsServiceProviderAndClasses(ConfigSource.class, YamlConfigSource.class) .addAsManifestResource("META-INF/beans.xml"); } diff --git a/pom.xml b/pom.xml index 547fe62..97e266c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.microprofile-ext config-ext - 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT pom Microprofile Config Extensions @@ -62,9 +62,9 @@ UTF-8 - 1.8 - 1.8 - 4.0.1 + 11 + 11 + 5.0 @@ -82,7 +82,7 @@ org.jboss.arquillian arquillian-bom - 1.6.0.Final + 1.7.0.Final import pom @@ -102,13 +102,13 @@ org.jboss.weld weld-core-impl - 2.4.8.Final + 4.0.3.Final test org.jboss.arquillian.container arquillian-weld-embedded - 2.0.1.Final + 3.0.1.Final test @@ -123,15 +123,15 @@ test - org.apache.geronimo.config - geronimo-config-impl - 1.2.2 + io.smallrye.config + smallrye-config + 3.2.1 test org.assertj assertj-core - 3.19.0 + 3.24.2 test @@ -175,7 +175,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.13 true ossrh @@ -187,7 +187,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -200,9 +200,9 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.5.0 - 8 + 11 @@ -231,16 +231,6 @@ - - jdk11plus - - [11,) - - - --add-modules java.se - 8 - -