diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 794e3c4e0ad635..3b538879b85006 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -40,7 +40,7 @@
1.2
1.0
1.13.1
- 2.11.1
+ 2.12.0
3.2.1
3.0.5
2.2.0
@@ -76,7 +76,7 @@
2.0.0.Final
9.3
2.11.0
- 15.1.0.Final
+ 15.0.0.Final
3.0-alpha-2
3.3.0
2.1.0
@@ -156,7 +156,7 @@
3.2.0
4.2.0
1.0.10
- 9.2.1
+ 9.2.0
1.0.11
4.15.0
1.31
@@ -885,16 +885,6 @@
quarkus-keycloak-admin-client-reactive-deployment
${project.version}
-
- io.quarkus
- quarkus-keycloak-admin-client-common
- ${project.version}
-
-
- io.quarkus
- quarkus-keycloak-admin-client-common-deployment
- ${project.version}
-
io.quarkus
quarkus-flyway
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java
index 46030d8daf6a8c..c9ea61d5ae4af0 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java
@@ -404,7 +404,7 @@ ReadResult run() {
// we always have to set the map entry ourselves
Field field = matched.findField();
Converter> converter = getConverter(config, field, ConverterType.of(field));
- map.put(key, config.convertValue(configValue.getNameProfiled(), configValue.getValue(), converter));
+ map.put(key, config.convertValue(configValue, converter));
allBuildTimeValues.put(configValue.getNameProfiled(), configValue.getValue());
continue;
}
@@ -437,7 +437,7 @@ ReadResult run() {
// we always have to set the map entry ourselves
Field field = matched.findField();
Converter> converter = getConverter(config, field, ConverterType.of(field));
- map.put(key, config.convertValue(configValue.getNameProfiled(), configValue.getValue(), converter));
+ map.put(key, config.convertValue(configValue, converter));
// cache the resolved value
allBuildTimeValues.put(configValue.getNameProfiled(), configValue.getValue());
buildTimeRunTimeValues.put(configValue.getNameProfiled(), configValue.getValue());
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigMappingCreator.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigMappingCreator.java
index 7cedbcb1c47e68..276b55345b2fe8 100644
--- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigMappingCreator.java
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigMappingCreator.java
@@ -1,16 +1,19 @@
package io.quarkus.arc.runtime;
-import static io.smallrye.config.inject.ConfigMappingInjectionBean.getPrefixFromInjectionPoint;
-
+import java.lang.annotation.Annotation;
import java.util.Map;
+import java.util.Optional;
import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.InjectionPoint;
import org.eclipse.microprofile.config.ConfigProvider;
+import org.eclipse.microprofile.config.inject.ConfigProperties;
import io.quarkus.arc.BeanCreator;
import io.quarkus.arc.impl.InjectionPointProvider;
+import io.smallrye.config.ConfigMapping;
import io.smallrye.config.SmallRyeConfig;
public class ConfigMappingCreator implements BeanCreator
io.quarkus
- quarkus-resteasy
+ quarkus-resteasy-reactive
io.quarkus
- quarkus-resteasy-jackson
+ quarkus-resteasy-reactive-jackson
@@ -80,7 +80,6 @@
test
-
io.quarkus
@@ -110,7 +109,7 @@
io.quarkus
- quarkus-resteasy-deployment
+ quarkus-resteasy-reactive-deployment
${project.version}
pom
test
@@ -123,7 +122,7 @@
io.quarkus
- quarkus-resteasy-jackson-deployment
+ quarkus-resteasy-reactive-jackson-deployment
${project.version}
pom
test
diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigResource.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigResource.java
index b8f2e3003ff644..8cb380f7d6f49e 100644
--- a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigResource.java
+++ b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigResource.java
@@ -8,6 +8,8 @@
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.eclipse.microprofile.config.ConfigProvider;
+
import io.quarkus.runtime.annotations.RegisterForReflection;
import io.smallrye.config.SmallRyeConfig;
@@ -29,6 +31,12 @@ public Response profiles() {
return Response.ok(config.getProfiles()).build();
}
+ @GET
+ @Path("/uuid")
+ public Response uuid() {
+ return Response.ok(ConfigProvider.getConfig().getConfigValue("quarkus.uuid")).build();
+ }
+
@RegisterForReflection(targets = {
org.eclipse.microprofile.config.ConfigValue.class,
io.smallrye.config.ConfigValue.class
diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/QuarkusConfigTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/QuarkusConfigTest.java
new file mode 100644
index 00000000000000..ad4d81df86e096
--- /dev/null
+++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/QuarkusConfigTest.java
@@ -0,0 +1,31 @@
+package io.quarkus.it.smallrye.config;
+
+import static io.restassured.RestAssured.given;
+import static javax.ws.rs.core.Response.Status.OK;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class QuarkusConfigTest {
+ @Test
+ void uuid() {
+ given()
+ .get("/config/{name}", "quarkus.uuid")
+ .then()
+ .statusCode(OK.getStatusCode())
+ .body("value", is(notNullValue()))
+ .body("configSourceName", equalTo("DefaultValuesConfigSource"));
+
+ given()
+ .get("/config/uuid")
+ .then()
+ .statusCode(OK.getStatusCode())
+ .body("value", is(notNullValue()))
+ .body("configSourceName", equalTo("DefaultValuesConfigSource"));
+ }
+}
diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ServerResourceTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ServerResourceTest.java
index 060c3bb661708c..63bfed5338bfc5 100644
--- a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ServerResourceTest.java
+++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ServerResourceTest.java
@@ -10,25 +10,13 @@
import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.hasSize;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import io.quarkus.test.junit.QuarkusTest;
-import io.restassured.RestAssured;
import io.restassured.http.Header;
@QuarkusTest
class ServerResourceTest {
- @BeforeAll
- static void beforeAll() {
- RestAssured.filters(
- (requestSpec, responseSpec, ctx) -> {
- requestSpec.header(new Header(CONTENT_TYPE, APPLICATION_JSON));
- requestSpec.header(new Header(ACCEPT, APPLICATION_JSON));
- return ctx.next(requestSpec, responseSpec);
- });
- }
-
@Test
void mapping() {
given()
@@ -99,7 +87,10 @@ void info() {
@Test
void invalid() {
- given().get("/server/validator/{prefix}", "cloud")
+ given()
+ .header(new Header(CONTENT_TYPE, APPLICATION_JSON))
+ .header(new Header(ACCEPT, APPLICATION_JSON))
+ .get("/server/validator/{prefix}", "cloud")
.then()
.statusCode(OK.getStatusCode())
.body("errors", hasSize(9))