Skip to content

Commit

Permalink
Merge pull request #1 from tdiesler/oidc4vc
Browse files Browse the repository at this point in the history
-- squashed cleanup
  • Loading branch information
Stefan Wiedemann authored Dec 6, 2023
2 parents 27f58a8 + 78a5bd9 commit 5f07e0e
Show file tree
Hide file tree
Showing 4 changed files with 94 additions and 199 deletions.
27 changes: 8 additions & 19 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
~ limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand All @@ -42,11 +41,9 @@

<jboss.repo.nexusUrl>https://s01.oss.sonatype.org/</jboss.repo.nexusUrl>
<jboss.releases.repo.id>jboss-releases-repository</jboss.releases.repo.id>
<jboss.releases.repo.url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
</jboss.releases.repo.url>
<jboss.releases.repo.url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</jboss.releases.repo.url>
<jboss.snapshots.repo.id>jboss-snapshots-repository</jboss.snapshots.repo.id>
<jboss.snapshots.repo.url>https://s01.oss.sonatype.org/content/repositories/snapshots/
</jboss.snapshots.repo.url>
<jboss.snapshots.repo.url>https://s01.oss.sonatype.org/content/repositories/snapshots/</jboss.snapshots.repo.url>

<quarkus.version>3.2.7.Final</quarkus.version>
<quarkus.build.version>3.2.7.Final</quarkus.build.version>
Expand Down Expand Up @@ -112,10 +109,8 @@
<jboss-servlet-api_4.0_spec>2.0.0.Final</jboss-servlet-api_4.0_spec>
<jboss.logmanager>2.1.19.Final</jboss.logmanager>
<jboss.marshalling.version>2.0.11.Final</jboss.marshalling.version>
<jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>2.0.1.Final
</jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>
<jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>2.0.0.Final
</jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>
<jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>2.0.1.Final</jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>
<jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>2.0.0.Final</jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>
<log4j.version>1.2.17</log4j.version>
<resteasy-legacy.version>4.7.7.Final</resteasy-legacy.version>
<resteasy.version>6.2.4.Final</resteasy.version>
Expand Down Expand Up @@ -210,9 +205,7 @@
<surefire.memory.Xmx>2048m</surefire.memory.Xmx>
<surefire.memory.metaspace>96m</surefire.memory.metaspace>
<surefire.memory.metaspace.max>512m</surefire.memory.metaspace.max>
<surefire.memory.settings>-Xms${surefire.memory.Xms} -Xmx${surefire.memory.Xmx}
-XX:MetaspaceSize=${surefire.memory.metaspace} -XX:MaxMetaspaceSize=${surefire.memory.metaspace.max}
</surefire.memory.settings>
<surefire.memory.settings>-Xms${surefire.memory.Xms} -Xmx${surefire.memory.Xmx} -XX:MetaspaceSize=${surefire.memory.metaspace} -XX:MaxMetaspaceSize=${surefire.memory.metaspace.max}</surefire.memory.settings>
<surefire.system.args></surefire.system.args>

<!-- Tomcat versions -->
Expand All @@ -230,8 +223,7 @@
<!-- WildFly Galleon Build related properties -->
<org.wildfly.galleon-plugins.version>6.4.2.Final</org.wildfly.galleon-plugins.version>
<org.jboss.galleon.version>5.1.0.Final</org.jboss.galleon.version>
<org.wildfly.maven.plugins.licenses-plugin.version>2.3.1.Final
</org.wildfly.maven.plugins.licenses-plugin.version>
<org.wildfly.maven.plugins.licenses-plugin.version>2.3.1.Final</org.wildfly.maven.plugins.licenses-plugin.version>

<!-- Galleon -->
<galleon.fork.embedded>true</galleon.fork.embedded>
Expand Down Expand Up @@ -1789,10 +1781,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-plugin.version}</version>
<configuration>
<argLine>-Djava.awt.headless=true ${surefire.memory.settings} ${surefire.system.args}
-Duser.language=en -Duser.region=US -XX:+ExitOnOutOfMemoryError
-XX:+HeapDumpOnOutOfMemoryError
</argLine>
<argLine>-Djava.awt.headless=true ${surefire.memory.settings} ${surefire.system.args} -Duser.language=en -Duser.region=US -XX:+ExitOnOutOfMemoryError -XX:+HeapDumpOnOutOfMemoryError</argLine>
<runOrder>alphabetical</runOrder>
<failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>
</configuration>
Expand Down
8 changes: 4 additions & 4 deletions quarkus/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-http</artifactId>
<exclusions>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-uri-template</artifactId>
</exclusion>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-uri-template</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
11 changes: 4 additions & 7 deletions services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
Expand Down Expand Up @@ -361,8 +361,7 @@
<scanProfiles>admin</scanProfiles>
<outputDirectory>${project.build.directory}/apidocs-rest/swagger/apidocs</outputDirectory>
<infoTitle>Keycloak Admin REST API</infoTitle>
<infoDescription>This is a REST API reference for the Keycloak Admin REST API.
</infoDescription>
<infoDescription>This is a REST API reference for the Keycloak Admin REST API.</infoDescription>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -390,17 +389,15 @@
<modelTests>false</modelTests>
<verbose>false</verbose>
</globalProperties>
<inputSpec>${project.build.directory}/apidocs-rest/swagger/apidocs/openapi.yaml
</inputSpec>
<inputSpec>${project.build.directory}/apidocs-rest/swagger/apidocs/openapi.yaml</inputSpec>
<output>${project.basedir}/target/docs/asciidoc/</output>
<generatorName>asciidoc</generatorName>
<generateApiDocumentation>true</generateApiDocumentation>
<generateModelDocumentation>true</generateModelDocumentation>
<generateSupportingFiles>true</generateSupportingFiles>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<templateDirectory>src/docs/openapi-generator-templates/keycloak-admin-api
</templateDirectory>
<templateDirectory>src/docs/openapi-generator-templates/keycloak-admin-api</templateDirectory>
<configOptions>
<useIntroduction>true</useIntroduction>
<delegatePattern>false</delegatePattern>
Expand Down
Loading

0 comments on commit 5f07e0e

Please sign in to comment.