diff --git a/pom.xml b/pom.xml index f4e0738..2f4ae93 100644 --- a/pom.xml +++ b/pom.xml @@ -2,6 +2,13 @@ 4.0.0 + + io.kokuwa.maven + maven-parent + 0.6.18 + + + io.kokuwa.keycloak keycloak-event-metrics 1.1.2-SNAPSHOT @@ -24,10 +31,12 @@ - stephan.schnabel + sschnabe Stephan Schnabel - https://schnabel.org - stephan@schnabel.org + https://github.com/sschnabe + stephan@grayc.de + GrayC GmbH + https://grayc.de Europe/Berlin @@ -46,16 +55,6 @@ github https://github.com/kokuwaio/keycloak-event-metrics/actions - - - sonatype-nexus - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - sonatype-nexus - https://oss.sonatype.org/content/repositories/snapshots/ - - @@ -63,47 +62,15 @@ - 2025-04-28T12:25:49Z - UTF-8 - ISO-8859-1 + 17 + 17 - 17 - ${maven.compiler.release} - ${maven.compiler.release} - -Xlint:all - true - true - true - - true - - true - java.,javax.,jakarta.,org. - ${project.basedir}/src/eclipse/formatter.xml + deploy,site,ossrh,release - + - 3.4.1 - 3.14.0 - 3.1.4 - 3.2.7 - 3.1.4 - 3.4.2 - 3.11.2 - 3.1.1 - 3.3.1 - 3.21.0 - 3.3.1 - 3.5.3 - 3.5.1 - 1.4.0 - 2.18.0 - 1.7.0 - 2.26.0 - 1.12.0 - 26.2.5 ${version.org.keycloak} 1.18.3 @@ -221,136 +188,12 @@ - ${project.artifactId} ${project.basedir}/src/test/resources true - - - - org.apache.maven.plugins - maven-clean-plugin - ${version.org.apache.maven.plugins.clean} - - - org.apache.maven.plugins - maven-compiler-plugin - ${version.org.apache.maven.plugins.compiler} - - ${maven.compiler.compilerArgument} - - - - org.apache.maven.plugins - maven-deploy-plugin - ${version.org.apache.maven.plugins.deploy} - - - org.apache.maven.plugins - maven-failsafe-plugin - ${version.org.apache.maven.plugins.surefire} - - - org.apache.maven.plugins - maven-gpg-plugin - ${version.org.apache.maven.plugins.gpg} - - - org.apache.maven.plugins - maven-install-plugin - ${version.org.apache.maven.plugins.install} - - - org.apache.maven.plugins - maven-jar-plugin - ${version.org.apache.maven.plugins.jar} - - - org.apache.maven.plugins - maven-javadoc-plugin - ${version.org.apache.maven.plugins.javadoc} - - - org.apache.maven.plugins - maven-release-plugin - ${version.org.apache.maven.plugins.release} - - clean verify - check - deploy - deploy,release - true - @{prefix} prepare release @{releaseLabel} [CI SKIP] - @{project.version} - - - - org.apache.maven.plugins - maven-resources-plugin - ${version.org.apache.maven.plugins.resources} - - ${project.build.propertiesEncoding} - - - - org.apache.maven.plugins - maven-site-plugin - ${version.org.apache.maven.plugins.site} - - - org.apache.maven.plugins - maven-source-plugin - ${version.org.apache.maven.plugins.source} - - - org.apache.maven.plugins - maven-surefire-plugin - ${version.org.apache.maven.plugins.surefire} - - - org.codehaus.mojo - exec-maven-plugin - ${version.org.codehaus.mojo.exec} - - - org.codehaus.mojo - tidy-maven-plugin - ${version.org.codehaus.mojo.tidy} - - - org.codehaus.mojo - versions-maven-plugin - ${version.org.codehaus.mojo.versions} - - false - - ^.*-(alpha|beta|M)-?[0-9]+$ - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${version.org.sonatype.plugins.nexus} - - - net.revelc.code.formatter - formatter-maven-plugin - ${version.net.revelc.code.formatter} - - ${formatter.configFile} - - - - net.revelc.code - impsort-maven-plugin - ${version.net.revelc.code.impsort} - - - @@ -367,13 +210,13 @@ - + - org.apache.maven.plugins - maven-install-plugin + org.codehaus.mojo + flatten-maven-plugin - default-install + default @@ -384,136 +227,9 @@ - dev - - - !env.CI - - + release - - org.codehaus.mojo - tidy-maven-plugin - - - validate - - pom - - - - - - net.revelc.code - impsort-maven-plugin - - - validate - - sort - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - validate - - format - - - - - - - - - check - - - env.CI - - - - - - org.codehaus.mojo - tidy-maven-plugin - - - validate - - check - - - - - - net.revelc.code - impsort-maven-plugin - - - validate - - check - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - validate - - validate - - - - - - - - - deploy - - - env.CI - - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - javadoc-no-fork - - - - - - org.apache.maven.plugins maven-resources-plugin @@ -563,38 +279,5 @@ - - release - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - - sign - - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - sonatype-nexus - https://oss.sonatype.org/ - true - - - - - - diff --git a/src/eclipse/formatter.xml b/src/eclipse/formatter.xml deleted file mode 100644 index 61186a2..0000000 --- a/src/eclipse/formatter.xml +++ /dev/null @@ -1,404 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/java/io/kokuwa/keycloak/metrics/KeycloakIT.java b/src/test/java/io/kokuwa/keycloak/metrics/KeycloakIT.java index a9ffeaa..cd4ebf4 100644 --- a/src/test/java/io/kokuwa/keycloak/metrics/KeycloakIT.java +++ b/src/test/java/io/kokuwa/keycloak/metrics/KeycloakIT.java @@ -10,8 +10,6 @@ import java.time.Instant; import java.util.UUID; import java.util.function.Supplier; -import jakarta.ws.rs.NotAuthorizedException; - import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -20,6 +18,7 @@ import org.keycloak.events.EventType; import io.kokuwa.keycloak.metrics.junit.KeycloakClient; import io.kokuwa.keycloak.metrics.junit.KeycloakExtension; import io.kokuwa.keycloak.metrics.junit.Prometheus; +import jakarta.ws.rs.NotAuthorizedException; /** * Integration tests with Keycloak. @@ -88,7 +87,7 @@ public class KeycloakIT { () -> assertEquals(loginErrorBefore2 + 1, loginErrorAfter2, "login failure #2"), () -> assertEquals(0, loginErrorAfter3, "login failure #3"), () -> assertEquals(0, loginErrorAfter4, "login failure #4"), - () -> assertEquals(loginErrorBeforeUNKNOWN + 2, loginErrorAfterUNKNOWN, "login failure UNKNOWN")); + () -> assertEquals(loginErrorBeforeUNKNOWN + 2 , loginErrorAfterUNKNOWN, "login failure UNKNOWN")); } @DisplayName("user count") diff --git a/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakClient.java b/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakClient.java index b79ca14..029ffde 100644 --- a/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakClient.java +++ b/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakClient.java @@ -13,10 +13,6 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.MultivaluedHashMap; - import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.token.TokenService; @@ -28,6 +24,10 @@ import org.keycloak.representations.idm.UserRepresentation; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedHashMap; + /** * Client for keycloak. * diff --git a/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java b/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java index ada9013..df5bd0e 100644 --- a/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java +++ b/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java @@ -7,8 +7,6 @@ import java.time.Duration; import java.util.Properties; import java.util.Set; -import jakarta.ws.rs.client.ClientBuilder; - import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; @@ -20,6 +18,8 @@ import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.utility.MountableFile; +import jakarta.ws.rs.client.ClientBuilder; + /** * JUnit extension to start keycloak. *