Use a default Java version from root POM (#29927)
Signed-off-by: Jon Koops <jonkoops@gmail.com>
This commit is contained in:
parent
f3a138cd74
commit
df18629ffe
38 changed files with 65 additions and 212 deletions
|
@ -14,6 +14,8 @@
|
||||||
<name>Keycloak SAML Client Adapter Core Jakarta</name>
|
<name>Keycloak SAML Client Adapter Core Jakarta</name>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
<!-- We still need to support EAP 8, set the Java version to 11. -->
|
||||||
|
<maven.compiler.release>11</maven.compiler.release>
|
||||||
<timestamp>${maven.build.timestamp}</timestamp>
|
<timestamp>${maven.build.timestamp}</timestamp>
|
||||||
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
|
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,8 @@
|
||||||
|
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
<!-- We still need to support EAP 8, set the Java version to 11. -->
|
||||||
|
<maven.compiler.release>11</maven.compiler.release>
|
||||||
<timestamp>${maven.build.timestamp}</timestamp>
|
<timestamp>${maven.build.timestamp}</timestamp>
|
||||||
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
|
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
|
@ -36,13 +36,13 @@ import org.keycloak.saml.processing.web.util.PostBindingUtil;
|
||||||
import org.w3c.dom.Document;
|
import org.w3c.dom.Document;
|
||||||
import org.w3c.dom.Node;
|
import org.w3c.dom.Node;
|
||||||
|
|
||||||
import javax.xml.soap.MessageFactory;
|
import jakarta.xml.soap.MessageFactory;
|
||||||
import javax.xml.soap.SOAPBody;
|
import jakarta.xml.soap.SOAPBody;
|
||||||
import javax.xml.soap.SOAPEnvelope;
|
import jakarta.xml.soap.SOAPEnvelope;
|
||||||
import javax.xml.soap.SOAPException;
|
import jakarta.xml.soap.SOAPException;
|
||||||
import javax.xml.soap.SOAPHeader;
|
import jakarta.xml.soap.SOAPHeader;
|
||||||
import javax.xml.soap.SOAPHeaderElement;
|
import jakarta.xml.soap.SOAPHeaderElement;
|
||||||
import javax.xml.soap.SOAPMessage;
|
import jakarta.xml.soap.SOAPMessage;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
|
* @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
|
||||||
|
|
|
@ -36,6 +36,8 @@
|
||||||
Reason is the transition to Jakarta APIs.
|
Reason is the transition to Jakarta APIs.
|
||||||
-->
|
-->
|
||||||
<properties>
|
<properties>
|
||||||
|
<!-- We still need to support EAP 8, set the Java version to 11. -->
|
||||||
|
<maven.compiler.release>11</maven.compiler.release>
|
||||||
<jakarta-transformer-sources>${project.basedir}/../wildfly-elytron/src</jakarta-transformer-sources>
|
<jakarta-transformer-sources>${project.basedir}/../wildfly-elytron/src</jakarta-transformer-sources>
|
||||||
<jakarta-transformer-target>${project.basedir}/src</jakarta-transformer-target>
|
<jakarta-transformer-target>${project.basedir}/src</jakarta-transformer-target>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
|
@ -36,6 +36,8 @@
|
||||||
Reason is the transition to Jakarta APIs.
|
Reason is the transition to Jakarta APIs.
|
||||||
-->
|
-->
|
||||||
<properties>
|
<properties>
|
||||||
|
<!-- We still need to support EAP 8, set the Java version to 11. -->
|
||||||
|
<maven.compiler.release>11</maven.compiler.release>
|
||||||
<jakarta-transformer-sources>${project.basedir}/../wildfly-subsystem/src</jakarta-transformer-sources>
|
<jakarta-transformer-sources>${project.basedir}/../wildfly-subsystem/src</jakarta-transformer-sources>
|
||||||
<jakarta-transformer-target>${project.basedir}/src</jakarta-transformer-target>
|
<jakarta-transformer-target>${project.basedir}/src</jakarta-transformer-target>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
|
@ -31,6 +31,8 @@
|
||||||
<description/>
|
<description/>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
<!-- We still need to support EAP 8, set the Java version to 11. -->
|
||||||
|
<maven.compiler.release>11</maven.compiler.release>
|
||||||
<keycloak.osgi.export>
|
<keycloak.osgi.export>
|
||||||
org.keycloak.adapters.spi.*
|
org.keycloak.adapters.spi.*
|
||||||
</keycloak.osgi.export>
|
</keycloak.osgi.export>
|
||||||
|
|
|
@ -30,6 +30,11 @@
|
||||||
<name>Common JBoss/Wildfly Core Classes</name>
|
<name>Common JBoss/Wildfly Core Classes</name>
|
||||||
<description/>
|
<description/>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<!-- We still need to support EAP 8, set the Java version to 11. -->
|
||||||
|
<maven.compiler.release>11</maven.compiler.release>
|
||||||
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jboss.logging</groupId>
|
<groupId>org.jboss.logging</groupId>
|
||||||
|
|
|
@ -31,6 +31,8 @@
|
||||||
<description/>
|
<description/>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
<!-- We still need to support EAP 8, set the Java version to 11. -->
|
||||||
|
<maven.compiler.release>11</maven.compiler.release>
|
||||||
<keycloak.osgi.export>
|
<keycloak.osgi.export>
|
||||||
org.keycloak.adapters.undertow.*
|
org.keycloak.adapters.undertow.*
|
||||||
</keycloak.osgi.export>
|
</keycloak.osgi.export>
|
||||||
|
|
|
@ -32,6 +32,8 @@
|
||||||
<description>Common library and dependencies shared with server and all adapters</description>
|
<description>Common library and dependencies shared with server and all adapters</description>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
<!-- We still need to support EAP 8, set the Java version to 11. -->
|
||||||
|
<maven.compiler.release>11</maven.compiler.release>
|
||||||
<timestamp>${maven.build.timestamp}</timestamp>
|
<timestamp>${maven.build.timestamp}</timestamp>
|
||||||
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
|
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
|
||||||
<keycloak.osgi.export>
|
<keycloak.osgi.export>
|
||||||
|
|
|
@ -32,6 +32,8 @@
|
||||||
<description/>
|
<description/>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
<!-- We still need to support EAP 8, set the Java version to 11. -->
|
||||||
|
<maven.compiler.release>11</maven.compiler.release>
|
||||||
<timestamp>${maven.build.timestamp}</timestamp>
|
<timestamp>${maven.build.timestamp}</timestamp>
|
||||||
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
|
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
|
||||||
<keycloak.osgi.export>
|
<keycloak.osgi.export>
|
||||||
|
|
|
@ -30,6 +30,11 @@
|
||||||
<name>Keycloak Crypto Default</name>
|
<name>Keycloak Crypto Default</name>
|
||||||
<description/>
|
<description/>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<!-- We still need to support EAP 8, set the Java version to 11. -->
|
||||||
|
<maven.compiler.release>11</maven.compiler.release>
|
||||||
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
|
|
|
@ -30,12 +30,6 @@
|
||||||
<name>Keycloak Crypto FIPS 140-2 Integration</name>
|
<name>Keycloak Crypto FIPS 140-2 Integration</name>
|
||||||
<description/>
|
<description/>
|
||||||
|
|
||||||
<properties>
|
|
||||||
<maven.compiler.release>17</maven.compiler.release>
|
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
|
|
|
@ -31,7 +31,6 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<javadoc.branding>Keycloak ${project.version}</javadoc.branding>
|
<javadoc.branding>Keycloak ${project.version}</javadoc.branding>
|
||||||
<maven.compiler.release>17</maven.compiler.release>
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -81,7 +80,6 @@
|
||||||
<maxmemory>2400m</maxmemory>
|
<maxmemory>2400m</maxmemory>
|
||||||
<encoding>UTF-8</encoding>
|
<encoding>UTF-8</encoding>
|
||||||
<includeDependencySources>true</includeDependencySources>
|
<includeDependencySources>true</includeDependencySources>
|
||||||
<source>${maven.compiler.source}</source>
|
|
||||||
<failOnError>true</failOnError>
|
<failOnError>true</failOnError>
|
||||||
<includeTransitiveDependencySources>true</includeTransitiveDependencySources>
|
<includeTransitiveDependencySources>true</includeTransitiveDependencySources>
|
||||||
<dependencySourceIncludes>
|
<dependencySourceIncludes>
|
||||||
|
|
|
@ -48,7 +48,6 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-plugin-plugin</artifactId>
|
<artifactId>maven-plugin-plugin</artifactId>
|
||||||
<version>${maven.plugins.version}</version>
|
|
||||||
<configuration>
|
<configuration>
|
||||||
<goalPrefix>header</goalPrefix>
|
<goalPrefix>header</goalPrefix>
|
||||||
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
|
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
|
||||||
|
|
|
@ -29,9 +29,6 @@
|
||||||
<version.install.plugin>2.5.2</version.install.plugin>
|
<version.install.plugin>2.5.2</version.install.plugin>
|
||||||
<version.surefire.plugin>2.22.2</version.surefire.plugin>
|
<version.surefire.plugin>2.22.2</version.surefire.plugin>
|
||||||
<version.plexus.utils>4.0.0</version.plexus.utils>
|
<version.plexus.utils>4.0.0</version.plexus.utils>
|
||||||
|
|
||||||
<maven.compiler.target>1.8</maven.compiler.target>
|
|
||||||
<maven.compiler.source>1.8</maven.compiler.source>
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
@ -64,15 +61,6 @@
|
||||||
<build>
|
<build>
|
||||||
<pluginManagement>
|
<pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
<version>${version.compiler.plugin}</version>
|
|
||||||
<configuration>
|
|
||||||
<source>${maven.compiler.target}</source>
|
|
||||||
<target>${maven.compiler.source}</target>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
|
|
|
@ -41,9 +41,6 @@
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-resources-plugin</artifactId>
|
<artifactId>maven-resources-plugin</artifactId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.0</version>
|
||||||
|
|
|
@ -31,12 +31,6 @@
|
||||||
<description>Keycloak Guides Maven Plugin</description>
|
<description>Keycloak Guides Maven Plugin</description>
|
||||||
<packaging>maven-plugin</packaging>
|
<packaging>maven-plugin</packaging>
|
||||||
|
|
||||||
<properties>
|
|
||||||
<maven.compiler.release>17</maven.compiler.release>
|
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.maven</groupId>
|
<groupId>org.apache.maven</groupId>
|
||||||
|
|
|
@ -29,12 +29,6 @@
|
||||||
<name>Keycloak LDAP UserStoreProvider</name>
|
<name>Keycloak LDAP UserStoreProvider</name>
|
||||||
<description />
|
<description />
|
||||||
|
|
||||||
<properties>
|
|
||||||
<maven.compiler.release>17</maven.compiler.release>
|
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
|
|
|
@ -9,12 +9,6 @@
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<properties>
|
|
||||||
<maven.compiler.release>17</maven.compiler.release>
|
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<artifactId>keycloak-sssd-federation</artifactId>
|
<artifactId>keycloak-sssd-federation</artifactId>
|
||||||
<name>Keycloak SSSD Federation</name>
|
<name>Keycloak SSSD Federation</name>
|
||||||
<description/>
|
<description/>
|
||||||
|
@ -46,6 +40,7 @@
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
|
|
|
@ -23,11 +23,6 @@
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<version>999.0.0-SNAPSHOT</version>
|
<version>999.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
|
||||||
<maven.compiler.release>17</maven.compiler.release>
|
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|
|
@ -30,10 +30,6 @@
|
||||||
<description/>
|
<description/>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.release>17</maven.compiler.release>
|
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
|
||||||
|
|
||||||
<keycloak.connectionsJpa.driver>org.h2.Driver</keycloak.connectionsJpa.driver>
|
<keycloak.connectionsJpa.driver>org.h2.Driver</keycloak.connectionsJpa.driver>
|
||||||
<keycloak.connectionsJpa.database>keycloak</keycloak.connectionsJpa.database>
|
<keycloak.connectionsJpa.database>keycloak</keycloak.connectionsJpa.database>
|
||||||
<keycloak.connectionsJpa.user>sa</keycloak.connectionsJpa.user>
|
<keycloak.connectionsJpa.user>sa</keycloak.connectionsJpa.user>
|
||||||
|
|
|
@ -15,11 +15,7 @@
|
||||||
<artifactId>keycloak-operator</artifactId>
|
<artifactId>keycloak-operator</artifactId>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<compiler-plugin.version>3.8.1</compiler-plugin.version>
|
|
||||||
<maven.compiler.parameters>true</maven.compiler.parameters>
|
<maven.compiler.parameters>true</maven.compiler.parameters>
|
||||||
<maven.compiler.release>17</maven.compiler.release>
|
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
<quarkus.container-image.group>keycloak</quarkus.container-image.group>
|
<quarkus.container-image.group>keycloak</quarkus.container-image.group>
|
||||||
|
@ -155,10 +151,6 @@
|
||||||
<artifactId>quarkus-maven-plugin</artifactId>
|
<artifactId>quarkus-maven-plugin</artifactId>
|
||||||
<version>${quarkus.build.version}</version>
|
<version>${quarkus.build.version}</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
<version>${compiler-plugin.version}</version>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</pluginManagement>
|
</pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
|
73
pom.xml
73
pom.xml
|
@ -35,6 +35,12 @@
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
<!-- Maven -->
|
||||||
|
<maven.version>3.9.8</maven.version>
|
||||||
|
<maven.compiler.source>17</maven.compiler.source>
|
||||||
|
<maven.compiler.target>17</maven.compiler.target>
|
||||||
|
<maven.compiler.release>17</maven.compiler.release>
|
||||||
|
|
||||||
<project.version.npm>999.0.0-SNAPSHOT</project.version.npm>
|
<project.version.npm>999.0.0-SNAPSHOT</project.version.npm>
|
||||||
|
|
||||||
<asciidoctor.plugin.version>1.5.8</asciidoctor.plugin.version>
|
<asciidoctor.plugin.version>1.5.8</asciidoctor.plugin.version>
|
||||||
|
@ -183,8 +189,7 @@
|
||||||
<assertj-core.version>3.22.0</assertj-core.version>
|
<assertj-core.version>3.22.0</assertj-core.version>
|
||||||
|
|
||||||
<!-- Maven Plugins -->
|
<!-- Maven Plugins -->
|
||||||
<maven.version>3.9.8</maven.version>
|
<maven.plugins.version>3.13.1</maven.plugins.version>
|
||||||
<maven.plugins.version>3.11.0</maven.plugins.version>
|
|
||||||
<replacer.plugin.version>1.4.1</replacer.plugin.version>
|
<replacer.plugin.version>1.4.1</replacer.plugin.version>
|
||||||
<jboss.as.plugin.version>7.5.Final</jboss.as.plugin.version>
|
<jboss.as.plugin.version>7.5.Final</jboss.as.plugin.version>
|
||||||
<jmeter.plugin.version>1.9.0</jmeter.plugin.version>
|
<jmeter.plugin.version>1.9.0</jmeter.plugin.version>
|
||||||
|
@ -207,7 +212,11 @@
|
||||||
<surefire.memory.metaspace>96m</surefire.memory.metaspace>
|
<surefire.memory.metaspace>96m</surefire.memory.metaspace>
|
||||||
<surefire.memory.metaspace.max>512m</surefire.memory.metaspace.max>
|
<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>
|
<!-- See: https://github.com/keycloak/keycloak/issues/9899 -->
|
||||||
|
<surefire.system.args>
|
||||||
|
--add-opens=java.base/java.lang=ALL-UNNAMED
|
||||||
|
--add-opens=java.base/java.util=ALL-UNNAMED
|
||||||
|
</surefire.system.args>
|
||||||
|
|
||||||
<!-- webauthn support -->
|
<!-- webauthn support -->
|
||||||
<webauthn4j.version>0.21.5.RELEASE</webauthn4j.version>
|
<webauthn4j.version>0.21.5.RELEASE</webauthn4j.version>
|
||||||
|
@ -1542,6 +1551,15 @@
|
||||||
<createChecksum>true</createChecksum>
|
<createChecksum>true</createChecksum>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<doclint>none</doclint>
|
||||||
|
<failOnError>false</failOnError>
|
||||||
|
<excludePackageNames>cx.*:org.freedesktop*:org.jvnet*</excludePackageNames>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.lazerycode.jmeter</groupId>
|
<groupId>com.lazerycode.jmeter</groupId>
|
||||||
<artifactId>jmeter-maven-plugin</artifactId>
|
<artifactId>jmeter-maven-plugin</artifactId>
|
||||||
|
@ -1733,19 +1751,6 @@
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
|
||||||
<id>jdk9</id>
|
|
||||||
<activation>
|
|
||||||
<jdk>[9,)</jdk>
|
|
||||||
</activation>
|
|
||||||
<properties>
|
|
||||||
<surefire.system.args>
|
|
||||||
--add-opens=java.base/java.lang=ALL-UNNAMED
|
|
||||||
--add-opens=java.base/java.util=ALL-UNNAMED
|
|
||||||
</surefire.system.args>
|
|
||||||
</properties>
|
|
||||||
</profile>
|
|
||||||
|
|
||||||
<profile>
|
<profile>
|
||||||
<id>testsuite</id>
|
<id>testsuite</id>
|
||||||
<activation>
|
<activation>
|
||||||
|
@ -1836,42 +1841,6 @@
|
||||||
</modules>
|
</modules>
|
||||||
</profile>
|
</profile>
|
||||||
|
|
||||||
<profile>
|
|
||||||
<id>doclint-java8-disable</id>
|
|
||||||
<activation>
|
|
||||||
<jdk>[1.8,)</jdk>
|
|
||||||
</activation>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-javadoc-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
<doclint>none</doclint>
|
|
||||||
<failOnError>false</failOnError>
|
|
||||||
<excludePackageNames>cx.*:org.freedesktop*:org.jvnet*</excludePackageNames>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</profile>
|
|
||||||
|
|
||||||
<profile>
|
|
||||||
<id>built-with-jdk-9-or-later</id>
|
|
||||||
<activation>
|
|
||||||
<!-- only activate this on JDK 9 or later as this option is unknown for JDK 8, and as it is not necessary for JDK 8 -->
|
|
||||||
<!-- support for running with JDK 8 is still necessary for some downstream integration tests -->
|
|
||||||
<jdk>(9,)</jdk>
|
|
||||||
</activation>
|
|
||||||
<properties>
|
|
||||||
<!-- Minimum Java version supported for running Keycloak -->
|
|
||||||
<!-- maven.compiler.target and maven.compiler.source already set to 1.8 in the parent pom -->
|
|
||||||
<!-- other modules will configure a higher Java version (for example, Quarkus) -->
|
|
||||||
<maven.compiler.release>8</maven.compiler.release>
|
|
||||||
</properties>
|
|
||||||
</profile>
|
|
||||||
|
|
||||||
<profile>
|
<profile>
|
||||||
<id>nexus-staging</id>
|
<id>nexus-staging</id>
|
||||||
<build>
|
<build>
|
||||||
|
|
|
@ -181,6 +181,7 @@
|
||||||
</testResources>
|
</testResources>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<configuration>
|
<configuration>
|
||||||
<annotationProcessorPaths>
|
<annotationProcessorPaths>
|
||||||
|
|
|
@ -32,24 +32,8 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
|
|
||||||
<maven.compiler.release>17</maven.compiler.release>
|
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<build>
|
|
||||||
<pluginManagement>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
<version>${maven.compiler.plugin.version}</version>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</pluginManagement>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>config-api</module>
|
<module>config-api</module>
|
||||||
<module>runtime</module>
|
<module>runtime</module>
|
||||||
|
|
|
@ -631,6 +631,7 @@
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<configuration>
|
<configuration>
|
||||||
<annotationProcessorPaths>
|
<annotationProcessorPaths>
|
||||||
|
|
|
@ -31,6 +31,8 @@
|
||||||
<description/>
|
<description/>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
<!-- We still need to support EAP 8, set the Java version to 11. -->
|
||||||
|
<maven.compiler.release>11</maven.compiler.release>
|
||||||
<timestamp>${maven.build.timestamp}</timestamp>
|
<timestamp>${maven.build.timestamp}</timestamp>
|
||||||
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
|
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
|
@ -31,6 +31,8 @@
|
||||||
<description/>
|
<description/>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
<!-- We still need to support EAP 8, set the Java version to 11. -->
|
||||||
|
<maven.compiler.release>11</maven.compiler.release>
|
||||||
<timestamp>${maven.build.timestamp}</timestamp>
|
<timestamp>${maven.build.timestamp}</timestamp>
|
||||||
<skip.security-manager.tests>true</skip.security-manager.tests>
|
<skip.security-manager.tests>true</skip.security-manager.tests>
|
||||||
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
|
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
|
||||||
|
|
|
@ -30,12 +30,6 @@
|
||||||
<name>Keycloak Server SPI</name>
|
<name>Keycloak Server SPI</name>
|
||||||
<description/>
|
<description/>
|
||||||
|
|
||||||
<properties>
|
|
||||||
<maven.compiler.release>17</maven.compiler.release>
|
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>jakarta.transaction</groupId>
|
<groupId>jakarta.transaction</groupId>
|
||||||
|
|
|
@ -32,10 +32,6 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<version.swagger.doclet>1.1.2</version.swagger.doclet>
|
<version.swagger.doclet>1.1.2</version.swagger.doclet>
|
||||||
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
|
|
||||||
<maven.compiler.release>17</maven.compiler.release>
|
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
|
@ -32,12 +32,6 @@
|
||||||
<name>Keycloak Test Parent</name>
|
<name>Keycloak Test Parent</name>
|
||||||
<description>Keycloak Test Parent</description>
|
<description>Keycloak Test Parent</description>
|
||||||
|
|
||||||
<properties>
|
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
|
||||||
<maven.compiler.release>17</maven.compiler.release>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>base</module>
|
<module>base</module>
|
||||||
<module>framework</module>
|
<module>framework</module>
|
||||||
|
|
|
@ -17,20 +17,8 @@
|
||||||
<module>undertow-adapter-spi-jakarta</module>
|
<module>undertow-adapter-spi-jakarta</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<properties>
|
|
||||||
<ant.jvm.args>-Dnone</ant.jvm.args>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<profiles>
|
|
||||||
<profile>
|
|
||||||
<id>jdk17+</id>
|
|
||||||
<activation>
|
|
||||||
<jdk>[17,)</jdk>
|
|
||||||
</activation>
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- For more information, see https://github.com/apache/ant/pull/200 -->
|
<!-- For more information, see https://github.com/apache/ant/pull/200 -->
|
||||||
<ant.jvm.args>-Djava.security.manager=allow</ant.jvm.args>
|
<ant.jvm.args>-Djava.security.manager=allow</ant.jvm.args>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
|
||||||
</profiles>
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -33,10 +33,6 @@
|
||||||
<properties>
|
<properties>
|
||||||
<js-adapter.version>${project.version}</js-adapter.version>
|
<js-adapter.version>${project.version}</js-adapter.version>
|
||||||
<js-adapter.file.path>${project.basedir}/target/classes/javascript</js-adapter.file.path>
|
<js-adapter.file.path>${project.basedir}/target/classes/javascript</js-adapter.file.path>
|
||||||
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
|
|
||||||
<maven.compiler.release>17</maven.compiler.release>
|
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
|
@ -45,10 +45,6 @@
|
||||||
<mvel.version>2.5.2.Final</mvel.version>
|
<mvel.version>2.5.2.Final</mvel.version>
|
||||||
<systemrules.version>1.19.0</systemrules.version>
|
<systemrules.version>1.19.0</systemrules.version>
|
||||||
<common.resources>${basedir}/../../servers/auth-server/common</common.resources>
|
<common.resources>${basedir}/../../servers/auth-server/common</common.resources>
|
||||||
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
|
|
||||||
<maven.compiler.release>17</maven.compiler.release>
|
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -451,10 +447,6 @@
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
<version>${maven-compiler-plugin.version}</version>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
|
|
||||||
</build>
|
</build>
|
||||||
|
@ -823,10 +815,6 @@
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
<version>${maven-compiler-plugin.version}</version>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</profile>
|
</profile>
|
||||||
|
|
|
@ -15,9 +15,6 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<exclude.sssd>**/sssd/**/*Test.java</exclude.sssd>
|
<exclude.sssd>**/sssd/**/*Test.java</exclude.sssd>
|
||||||
<maven.compiler.release>11</maven.compiler.release>
|
|
||||||
<maven.compiler.target>11</maven.compiler.target>
|
|
||||||
<maven.compiler.source>11</maven.compiler.source>
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
|
@ -14,9 +14,6 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<firefoxUserPreferences>${project.build.directory}/dependency/firefox-user-preferences.js</firefoxUserPreferences>
|
<firefoxUserPreferences>${project.build.directory}/dependency/firefox-user-preferences.js</firefoxUserPreferences>
|
||||||
<maven.compiler.release>17</maven.compiler.release>
|
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
|
@ -77,7 +77,7 @@
|
||||||
<auth.server.keystore>${auth.server.config.dir}/keycloak.jks</auth.server.keystore>
|
<auth.server.keystore>${auth.server.config.dir}/keycloak.jks</auth.server.keystore>
|
||||||
<auth.server.keystore.password>secret</auth.server.keystore.password>
|
<auth.server.keystore.password>secret</auth.server.keystore.password>
|
||||||
<auth.server.keystore.type>jks</auth.server.keystore.type>
|
<auth.server.keystore.type>jks</auth.server.keystore.type>
|
||||||
<auth.server.jvm.args.extra/>
|
<auth.server.jvm.args.extra>${default.modular.jvm.options}</auth.server.jvm.args.extra>
|
||||||
|
|
||||||
<auth.server.jboss.artifactId>integration-arquillian-servers-auth-server-${auth.server}</auth.server.jboss.artifactId>
|
<auth.server.jboss.artifactId>integration-arquillian-servers-auth-server-${auth.server}</auth.server.jboss.artifactId>
|
||||||
<auth.server.jboss.skip.unpack>${auth.server.undertow}</auth.server.jboss.skip.unpack>
|
<auth.server.jboss.skip.unpack>${auth.server.undertow}</auth.server.jboss.skip.unpack>
|
||||||
|
@ -132,7 +132,7 @@
|
||||||
<app.server.truststore.password>secret</app.server.truststore.password>
|
<app.server.truststore.password>secret</app.server.truststore.password>
|
||||||
<app.server.keystore>${app.server.keystore.dir}/adapter.jks</app.server.keystore>
|
<app.server.keystore>${app.server.keystore.dir}/adapter.jks</app.server.keystore>
|
||||||
<app.server.keystore.password>secret</app.server.keystore.password>
|
<app.server.keystore.password>secret</app.server.keystore.password>
|
||||||
<app.server.jvm.args.extra/>
|
<app.server.jvm.args.extra>${default.modular.jvm.options}</app.server.jvm.args.extra>
|
||||||
|
|
||||||
<cache.server.legacy>false</cache.server.legacy>
|
<cache.server.legacy>false</cache.server.legacy>
|
||||||
<cache.server.home>${containers.home}/cache-server-${cache.server}</cache.server.home>
|
<cache.server.home>${containers.home}/cache-server-${cache.server}</cache.server.home>
|
||||||
|
@ -1898,26 +1898,6 @@
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
|
|
||||||
<profile>
|
|
||||||
<id>java11-auth-server</id>
|
|
||||||
<activation>
|
|
||||||
<jdk>[11,)</jdk>
|
|
||||||
</activation>
|
|
||||||
<properties>
|
|
||||||
<auth.server.jvm.args.extra>${default.modular.jvm.options}</auth.server.jvm.args.extra>
|
|
||||||
</properties>
|
|
||||||
</profile>
|
|
||||||
|
|
||||||
<profile>
|
|
||||||
<id>java11-app-server</id>
|
|
||||||
<activation>
|
|
||||||
<jdk>[11,)</jdk>
|
|
||||||
</activation>
|
|
||||||
<properties>
|
|
||||||
<app.server.jvm.args.extra>${default.modular.jvm.options}</app.server.jvm.args.extra>
|
|
||||||
</properties>
|
|
||||||
</profile>
|
|
||||||
|
|
||||||
<profile>
|
<profile>
|
||||||
<id>java7-app-server</id>
|
<id>java7-app-server</id>
|
||||||
<properties>
|
<properties>
|
||||||
|
|
|
@ -15,10 +15,6 @@
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.release>17</maven.compiler.release>
|
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
|
||||||
|
|
||||||
<keycloak.connectionsJpa.driver>org.h2.Driver</keycloak.connectionsJpa.driver>
|
<keycloak.connectionsJpa.driver>org.h2.Driver</keycloak.connectionsJpa.driver>
|
||||||
<keycloak.connectionsJpa.database>keycloak</keycloak.connectionsJpa.database>
|
<keycloak.connectionsJpa.database>keycloak</keycloak.connectionsJpa.database>
|
||||||
<keycloak.connectionsJpa.user>sa</keycloak.connectionsJpa.user>
|
<keycloak.connectionsJpa.user>sa</keycloak.connectionsJpa.user>
|
||||||
|
|
Loading…
Reference in a new issue