diff --git a/deployment/pom.xml b/deployment/pom.xml index 1ddbc29..33227b3 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -27,7 +27,7 @@ io.quarkus - quarkus-resteasy-reactive-deployment + quarkus-rest-deployment test diff --git a/deployment/src/main/java/io/quarkiverse/kerberos/deployment/KerberosBuildStep.java b/deployment/src/main/java/io/quarkiverse/kerberos/deployment/KerberosBuildStep.java index 35d1216..5d27e0d 100644 --- a/deployment/src/main/java/io/quarkiverse/kerberos/deployment/KerberosBuildStep.java +++ b/deployment/src/main/java/io/quarkiverse/kerberos/deployment/KerberosBuildStep.java @@ -15,7 +15,7 @@ import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import io.quarkus.deployment.pkg.PackageConfig; +import io.quarkus.deployment.pkg.NativeConfig; public class KerberosBuildStep { @@ -55,8 +55,8 @@ public NativeImageResourceBundleBuildItem resourceBundleBuildItem() { @BuildStep(onlyIf = IsEnabled.class) @Record(ExecutionTime.RUNTIME_INIT) - public void register2(KerberosRecorder rec, PackageConfig packageConfig) throws Exception { - if (packageConfig.type.equals(PackageConfig.NATIVE)) { + public void register2(KerberosRecorder rec, NativeConfig nativeConfig) throws Exception { + if (nativeConfig.enabled()) { rec.registerProviderForNative(); } } diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 2f60d52..44bd29d 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -11,7 +11,7 @@ io.quarkus - quarkus-resteasy + quarkus-rest io.quarkiverse.kerberos @@ -88,7 +88,7 @@ - native + true diff --git a/integration-tests/src/main/java/io/quarkiverse/kerberos/it/FrontendResource.java b/integration-tests/src/main/java/io/quarkiverse/kerberos/it/FrontendResource.java index bf22d54..8a3edbb 100644 --- a/integration-tests/src/main/java/io/quarkiverse/kerberos/it/FrontendResource.java +++ b/integration-tests/src/main/java/io/quarkiverse/kerberos/it/FrontendResource.java @@ -9,10 +9,12 @@ import jakarta.ws.rs.GET; import jakarta.ws.rs.NotAuthorizedException; import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.HttpHeaders; import org.eclipse.microprofile.rest.client.inject.RestClient; import org.ietf.jgss.GSSContext; +import org.jboss.resteasy.reactive.ClientWebApplicationException; import io.quarkiverse.kerberos.client.KerberosClientSupport; @@ -52,7 +54,11 @@ public String getIdentityWithMultiStepNegotiation() throws Exception { @GET @Path("without-kerberos-support") public String getIdentityWithoutKerberosSupport() { - return identityServiceClient.getIdentity(); + try { + return identityServiceClient.getIdentity(); + } catch (ClientWebApplicationException ex) { + throw new WebApplicationException(ex.getResponse().getStatus()); + } } private class IdentityServiceAction implements PrivilegedExceptionAction { @@ -78,5 +84,5 @@ public String run() throws Exception { } throw new RuntimeException("Kerberos ticket can not be created"); } - }; + } } diff --git a/pom.xml b/pom.xml index 0296aad..df886b3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse quarkiverse-parent - 13 + 16 io.quarkiverse.kerberos quarkus-kerberos-parent @@ -24,13 +24,7 @@ HEAD - 3.8.1 - true - 11 - 11 - UTF-8 - UTF-8 - 3.1.0.Final + 3.12.2 2.0.0-M15 @@ -72,10 +66,6 @@ quarkus-maven-plugin ${quarkus.version} - - maven-compiler-plugin - ${compiler-plugin.version} -