keycloak-aplcache
Changes
distribution/adapters/wildfly-adapter/pom.xml 115(+105 -10)
distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml 40(+0 -40)
distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml 37(+0 -37)
distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-subsystem/main/module.xml 33(+0 -33)
distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-authz-client/main/module.xml 42(+0 -42)
distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml 38(+0 -38)
distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml 35(+0 -35)
distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-servlet-oauth-client/main/module.xml 36(+0 -36)
distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml 48(+0 -48)
distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml 49(+0 -49)
distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-elytron-oidc-adapter/main/module.xml 51(+0 -51)
distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-subsystem/main/module.xml 43(+0 -43)
distribution/server-dist/pom.xml 30(+6 -24)
distribution/server-overlay/assembly.xml 58(+45 -13)
distribution/server-overlay/pom.xml 144(+62 -82)
distribution/server-provisioning.xml 7(+5 -2)
pom.xml 8(+7 -1)
Details
distribution/adapters/wildfly-adapter/pom.xml 115(+105 -10)
diff --git a/distribution/adapters/wildfly-adapter/pom.xml b/distribution/adapters/wildfly-adapter/pom.xml
index 420b02a..082292a 100644
--- a/distribution/adapters/wildfly-adapter/pom.xml
+++ b/distribution/adapters/wildfly-adapter/pom.xml
@@ -17,21 +17,116 @@
<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>
- <artifactId>keycloak-parent</artifactId>
+ <artifactId>keycloak-adapters-distribution-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>3.2.0.CR1-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
</parent>
- <name>Keycloak Wildfly Adapter</name>
- <description/>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>keycloak-wildfly-adapter-dist-pom</artifactId>
+ <artifactId>keycloak-wildfly-adapter-dist</artifactId>
<packaging>pom</packaging>
+ <name>Keycloak Adapter Overlay Distribution</name>
+ <description/>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-adapter-feature-pack</artifactId>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.wildfly.build</groupId>
+ <artifactId>wildfly-server-provisioning-maven-plugin</artifactId>
+ <version>${build-tools.version}</version>
+ <executions>
+ <execution>
+ <id>server-provisioning</id>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <config-file>server-provisioning.xml</config-file>
+ <overlay>true</overlay>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>assemble</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>${assemblyFile}</descriptor>
+ </descriptors>
+ <recompressZippedFiles>true</recompressZippedFiles>
+ <finalName>${project.build.finalName}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <workDirectory>${project.build.directory}/assembly/work</workDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>community</id>
+ <activation>
+ <property>
+ <name>!product</name>
+ </property>
+ </activation>
+ <properties>
+ <build-tools.version>${wildfly.build-tools.version}</build-tools.version>
+ <assemblyFile>assembly.xml</assemblyFile>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>wf11</id>
+ <properties>
+ <build-tools.version>${wildfly11.build-tools.version}</build-tools.version>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>product</id>
+ <activation>
+ <property>
+ <name>product</name>
+ </property>
+ </activation>
+ <properties>
+ <build-tools.version>${eap.build-tools.version}</build-tools.version>
+ <assemblyFile>assembly.xml</assemblyFile>
+ <profileExcludes>%regex[(providers.*)|(docs/contrib.*)|(docs/examples.*)|(docs/schema.*)]</profileExcludes>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-dist</artifactId>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>${product.name}-${product.filename.version}-eap7-adapter</finalName>
+ </build>
+ </profile>
+ </profiles>
- <modules>
- <module>wildfly-modules</module>
- <module>wildfly-adapter-zip</module>
- </modules>
</project>
distribution/server-dist/pom.xml 30(+6 -24)
diff --git a/distribution/server-dist/pom.xml b/distribution/server-dist/pom.xml
index e538b7d..40ef670 100755
--- a/distribution/server-dist/pom.xml
+++ b/distribution/server-dist/pom.xml
@@ -35,6 +35,11 @@
<artifactId>keycloak-server-feature-pack</artifactId>
<type>zip</type>
</dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-client-cli-dist</artifactId>
+ <type>zip</type>
+ </dependency>
</dependencies>
<build>
@@ -51,7 +56,7 @@
</goals>
<phase>compile</phase>
<configuration>
- <config-file>server-provisioning.xml</config-file>
+ <config-file>../server-provisioning.xml</config-file>
</configuration>
</execution>
</executions>
@@ -79,29 +84,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-client-cli-dist</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-client-cli-dist</artifactId>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/unpacked</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
distribution/server-overlay/assembly.xml 58(+45 -13)
diff --git a/distribution/server-overlay/assembly.xml b/distribution/server-overlay/assembly.xml
index c2b5275..7a0fee0 100755
--- a/distribution/server-overlay/assembly.xml
+++ b/distribution/server-overlay/assembly.xml
@@ -27,35 +27,67 @@
<fileSets>
<fileSet>
- <directory>${project.build.directory}/cli</directory>
+ <directory>target/${project.build.finalName}</directory>
+ <outputDirectory/>
+ <filtered>true</filtered>
<includes>
- <include>*.cli</include>
+ <include>**/module.xml</include>
</includes>
- <outputDirectory>bin</outputDirectory>
</fileSet>
<fileSet>
- <directory>${project.build.directory}/unpacked/${serverDistDir}</directory>
+ <directory>target/${project.build.finalName}</directory>
<outputDirectory/>
- <includes>
- <include>**/**</include>
- </includes>
+ <filtered>false</filtered>
<excludes>
- <exclude>modules/**</exclude>
+ <exclude>bin/*.sh</exclude>
+ <exclude>module.xml</exclude>
+ <exclude>welcome-content/**</exclude>
+ <exclude>appclient/**</exclude>
+ <exclude>bin/appclient.*</exclude>
+ <exclude>copyright.txt</exclude>
+ <exclude>README.txt</exclude>
+ <exclude>themes/**</exclude>
+ <exclude>version.txt</exclude>
+ <exclude>${profileExcludes}</exclude>
</excludes>
</fileSet>
<fileSet>
- <directory>${project.build.directory}/unpacked/${serverDistDir}/modules/system/layers/keycloak</directory>
- <outputDirectory>modules/system/${identityType}/keycloak</outputDirectory>
+ <directory>target/${project.build.finalName}</directory>
+ <outputDirectory/>
+ <includes>
+ <include>bin/*.sh</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>target/${project.build.finalName}</directory>
+ <outputDirectory/>
+ <includes>
+ <include>themes/**</include>
+ </includes>
+ <fileMode>0444</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/welcome-content</directory>
+ <outputDirectory>welcome-content</outputDirectory>
<includes>
- <include>**/**</include>
+ <include>*.*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/modules</directory>
+ <outputDirectory>modules</outputDirectory>
+ <includes>
+ <include>layers.conf</include>
</includes>
</fileSet>
</fileSets>
<files>
<file>
- <source>target/README.txt</source>
- <outputDirectory></outputDirectory>
+ <source>src/main/version.txt</source>
+ <outputDirectory/>
+ <filtered>true</filtered>
</file>
</files>
distribution/server-overlay/pom.xml 144(+62 -82)
diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml
index 54923a3..c8bbf49 100755
--- a/distribution/server-overlay/pom.xml
+++ b/distribution/server-overlay/pom.xml
@@ -32,67 +32,32 @@
<dependencies>
<dependency>
<groupId>org.keycloak</groupId>
- <artifactId>keycloak-server-dist</artifactId>
+ <artifactId>keycloak-server-feature-pack</artifactId>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-client-cli-dist</artifactId>
<type>zip</type>
</dependency>
</dependencies>
- <properties>
- <commonFilesToInclude>
- ${serverDistDir}/modules/system/layers/keycloak/**,
- ${serverDistDir}/themes/**,
- ${serverDistDir}/providers/**,
- ${serverDistDir}/License.html,
- ${serverDistDir}/bin/client/keycloak*,
- ${serverDistDir}/bin/*keycloak*,
- ${serverDistDir}/bin/kc*,
- ${serverDistDir}/bin/federation-sssd-setup.sh,
- ${serverDistDir}/bin/migrate*
- </commonFilesToInclude>
- </properties>
-
<build>
- <finalName>keycloak-overlay-${project.version}</finalName>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
+ <groupId>org.wildfly.build</groupId>
+ <artifactId>wildfly-server-provisioning-maven-plugin</artifactId>
+ <version>${build-tools.version}</version>
<executions>
<execution>
- <id>unpack</id>
- <phase>compile</phase>
+ <id>server-provisioning</id>
<goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-wildfly-server-subsystem</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <includes>cli/*.cli</includes>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>unpack-server-dist</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>unpack</goal>
+ <goal>build</goal>
</goals>
+ <phase>compile</phase>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-server-dist</artifactId>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/unpacked</outputDirectory>
- <includes>${filesToInclude}</includes>
- </artifactItem>
- </artifactItems>
+ <config-file>../server-provisioning.xml</config-file>
+ <overlay>true</overlay>
</configuration>
</execution>
</executions>
@@ -121,29 +86,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assemble</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- <recompressZippedFiles>true</recompressZippedFiles>
- <finalName>${project.build.finalName}</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <workDirectory>${project.build.directory}/assembly/work</workDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<inherited>false</inherited>
<executions>
@@ -179,10 +121,32 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>assemble</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>${assemblyFile}</descriptor>
+ </descriptors>
+ <recompressZippedFiles>true</recompressZippedFiles>
+ <finalName>${project.build.finalName}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <workDirectory>${project.build.directory}/assembly/work</workDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
-
<profiles>
<profile>
<id>community</id>
@@ -192,9 +156,18 @@
</property>
</activation>
<properties>
- <identityType>add-ons</identityType>
- <serverDistDir>keycloak-${project.version}</serverDistDir>
- <filesToInclude>${commonFilesToInclude}</filesToInclude>
+ <build-tools.version>${wildfly.build-tools.version}</build-tools.version>
+ <assemblyFile>assembly.xml</assemblyFile>
+ </properties>
+ <build>
+ <finalName>keycloak-overlay-${project.version}</finalName>
+ </build>
+ </profile>
+
+ <profile>
+ <id>wf11</id>
+ <properties>
+ <build-tools.version>${wildfly11.build-tools.version}</build-tools.version>
</properties>
</profile>
@@ -206,13 +179,20 @@
</property>
</activation>
<properties>
- <identityType>layers</identityType>
- <serverDistDir>${product.name}-${product.filename.version}</serverDistDir>
- <filesToInclude>
- ${commonFilesToInclude},
- ${serverDistDir}/bin/product.conf,
- ${serverDistDir}/modules/layers.conf</filesToInclude>
+ <build-tools.version>${eap.build-tools.version}</build-tools.version>
+ <assemblyFile>assembly.xml</assemblyFile>
+ <profileExcludes>%regex[(providers.*)|(docs/contrib.*)|(docs/examples.*)|(docs/schema.*)]</profileExcludes>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.wildfly</groupId>
+ <artifactId>wildfly-dist</artifactId>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>${product.name}-overlay-${product.filename.version}</finalName>
+ </build>
</profile>
</profiles>
diff --git a/distribution/server-overlay/src/main/version.txt b/distribution/server-overlay/src/main/version.txt
new file mode 100644
index 0000000..c9db8ca
--- /dev/null
+++ b/distribution/server-overlay/src/main/version.txt
@@ -0,0 +1 @@
+${product.name.full} - Version ${product.version}
pom.xml 8(+7 -1)
diff --git a/pom.xml b/pom.xml
index 48072ba..6774018 100755
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<!-- WildFly -->
<jboss.as.version>7.2.0.Final</jboss.as.version>
<wildfly.version>10.0.0.Final</wildfly.version>
- <wildfly.build-tools.version>1.1.3.Final</wildfly.build-tools.version>
+ <wildfly.build-tools.version>1.2.2.Final</wildfly.build-tools.version>
<wildfly11.version>11.0.0.Alpha1</wildfly11.version> <!-- for testing with wf11 pre-releases -->
<wildfly11.build-tools.version>1.1.8.Final</wildfly11.build-tools.version>
<eap.version>7.1.0.Beta1-redhat-2</eap.version>
@@ -1249,6 +1249,12 @@
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
+ <artifactId>keycloak-adapter-feature-pack</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
<artifactId>keycloak-saml-tomcat6-adapter-dist</artifactId>
<version>${project.version}</version>
<type>zip</type>