From 56d68c17f538b436029de904ef67d3e81887b615 Mon Sep 17 00:00:00 2001 From: Bob McWhirter Date: Wed, 10 May 2017 10:21:12 -0400 Subject: [PATCH 1/8] KEYCLOAK-4933 Use a newer version of the server-provisioning-plugin. By using a newer version of the plugin, we can reduce the amount of build code that replicates the provisioning logic when building overlays. This applies to both: * Server distribution overlay * Adapter distribution overlay Both overlays are created purely by using the provisioning plugin and the feature-packs produced elsewhere in the build, along with the admin-cli artifact when appropriate. --- .../adapters/wildfly-adapter/assembly.xml | 78 +++++ .../cli/adapter-elytron-install-offline.cli | 0 .../cli/adapter-install-offline.cli | 0 distribution/adapters/wildfly-adapter/pom.xml | 115 +++++++- .../wildfly-adapter}/server-provisioning.xml | 6 +- .../wildfly-adapter-zip/assembly.xml | 70 ----- .../wildfly-adapter-zip/pom.xml | 107 ------- .../wildfly-modules/assembly.xml | 39 --- .../wildfly-adapter/wildfly-modules/build.xml | 94 ------ .../wildfly-adapter/wildfly-modules/lib.xml | 277 ------------------ .../wildfly-adapter/wildfly-modules/pom.xml | 203 ------------- .../keycloak-adapter-core/main/module.xml | 40 --- .../keycloak-adapter-spi/main/module.xml | 37 --- .../main/module.xml | 33 --- .../keycloak-authz-client/main/module.xml | 42 --- .../keycloak/keycloak-core/main/module.xml | 38 --- .../main/module.xml | 35 --- .../main/module.xml | 36 --- .../keycloak-undertow-adapter/main/module.xml | 48 --- .../keycloak-wildfly-adapter/main/module.xml | 49 ---- .../main/module.xml | 51 ---- .../main/module.xml | 43 --- distribution/server-dist/pom.xml | 30 +- distribution/server-overlay/assembly.xml | 58 +++- distribution/server-overlay/pom.xml | 146 ++++----- .../server-overlay/src/main/version.txt | 1 + .../module.xml => server-provisioning.xml} | 25 +- pom.xml | 8 +- 28 files changed, 316 insertions(+), 1393 deletions(-) create mode 100755 distribution/adapters/wildfly-adapter/assembly.xml rename distribution/adapters/wildfly-adapter/{wildfly-adapter-zip => }/cli/adapter-elytron-install-offline.cli (100%) rename distribution/adapters/wildfly-adapter/{wildfly-adapter-zip => }/cli/adapter-install-offline.cli (100%) rename distribution/{server-dist => adapters/wildfly-adapter}/server-provisioning.xml (85%) delete mode 100755 distribution/adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml delete mode 100755 distribution/adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml delete mode 100755 distribution/adapters/wildfly-adapter/wildfly-modules/assembly.xml delete mode 100755 distribution/adapters/wildfly-adapter/wildfly-modules/build.xml delete mode 100755 distribution/adapters/wildfly-adapter/wildfly-modules/lib.xml delete mode 100755 distribution/adapters/wildfly-adapter/wildfly-modules/pom.xml delete mode 100755 distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml delete mode 100755 distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml delete mode 100755 distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-subsystem/main/module.xml delete mode 100755 distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-authz-client/main/module.xml delete mode 100755 distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml delete mode 100755 distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml delete mode 100755 distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-servlet-oauth-client/main/module.xml delete mode 100755 distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml delete mode 100755 distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml delete mode 100755 distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-elytron-oidc-adapter/main/module.xml delete mode 100755 distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-subsystem/main/module.xml create mode 100644 distribution/server-overlay/src/main/version.txt rename distribution/{adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml => server-provisioning.xml} (59%) mode change 100755 => 100644 diff --git a/distribution/adapters/wildfly-adapter/assembly.xml b/distribution/adapters/wildfly-adapter/assembly.xml new file mode 100755 index 0000000000..cb9db53a00 --- /dev/null +++ b/distribution/adapters/wildfly-adapter/assembly.xml @@ -0,0 +1,78 @@ + + + + server-dist + + + zip + tar.gz + + + false + + + + target/${project.build.finalName} + + true + + **/module.xml + + + + target/${project.build.finalName} + + false + + docs/** + README.md + + + + target/${project.build.finalName} + + + bin/*.sh + + 0755 + + + target/${project.build.finalName} + + + themes/** + + 0444 + + + cli + bin + + *.* + + + + src/main/modules + modules + + layers.conf + + + + + diff --git a/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/cli/adapter-elytron-install-offline.cli b/distribution/adapters/wildfly-adapter/cli/adapter-elytron-install-offline.cli similarity index 100% rename from distribution/adapters/wildfly-adapter/wildfly-adapter-zip/cli/adapter-elytron-install-offline.cli rename to distribution/adapters/wildfly-adapter/cli/adapter-elytron-install-offline.cli diff --git a/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/cli/adapter-install-offline.cli b/distribution/adapters/wildfly-adapter/cli/adapter-install-offline.cli similarity index 100% rename from distribution/adapters/wildfly-adapter/wildfly-adapter-zip/cli/adapter-install-offline.cli rename to distribution/adapters/wildfly-adapter/cli/adapter-install-offline.cli diff --git a/distribution/adapters/wildfly-adapter/pom.xml b/distribution/adapters/wildfly-adapter/pom.xml index 420b02a953..082292acd2 100644 --- a/distribution/adapters/wildfly-adapter/pom.xml +++ b/distribution/adapters/wildfly-adapter/pom.xml @@ -17,21 +17,116 @@ + 4.0.0 - keycloak-parent + keycloak-adapters-distribution-parent org.keycloak 3.2.0.CR1-SNAPSHOT - ../../../pom.xml - Keycloak Wildfly Adapter - - 4.0.0 - keycloak-wildfly-adapter-dist-pom + keycloak-wildfly-adapter-dist pom + Keycloak Adapter Overlay Distribution + + + + + org.keycloak + keycloak-adapter-feature-pack + zip + + + + + + + org.wildfly.build + wildfly-server-provisioning-maven-plugin + ${build-tools.version} + + + server-provisioning + + build + + compile + + server-provisioning.xml + true + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + assemble + package + + single + + + + ${assemblyFile} + + true + ${project.build.finalName} + false + ${project.build.directory} + ${project.build.directory}/assembly/work + + + + + + + + + + community + + + !product + + + + ${wildfly.build-tools.version} + assembly.xml + + + + + wf11 + + ${wildfly11.build-tools.version} + + + + + product + + + product + + + + ${eap.build-tools.version} + assembly.xml + %regex[(providers.*)|(docs/contrib.*)|(docs/examples.*)|(docs/schema.*)] + + + + org.wildfly + wildfly-dist + zip + + + + ${product.name}-${product.filename.version}-eap7-adapter + + + - - wildfly-modules - wildfly-adapter-zip - diff --git a/distribution/server-dist/server-provisioning.xml b/distribution/adapters/wildfly-adapter/server-provisioning.xml similarity index 85% rename from distribution/server-dist/server-provisioning.xml rename to distribution/adapters/wildfly-adapter/server-provisioning.xml index 4ce4a6f1c9..5f4ff95073 100644 --- a/distribution/server-dist/server-provisioning.xml +++ b/distribution/adapters/wildfly-adapter/server-provisioning.xml @@ -14,8 +14,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + - + - \ No newline at end of file + diff --git a/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml b/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml deleted file mode 100755 index fcecc4845d..0000000000 --- a/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - war-dist - - - zip - tar.gz - - false - - - - ${project.build.directory}/unpacked - - org/keycloak/keycloak-common/** - org/keycloak/keycloak-core/** - org/keycloak/keycloak-adapter-core/** - org/keycloak/keycloak-adapter-spi/** - org/keycloak/keycloak-jboss-adapter-core/** - org/keycloak/keycloak-undertow-adapter/** - org/keycloak/keycloak-wildfly-adapter/** - org/keycloak/keycloak-wildfly-elytron-oidc-adapter/** - org/keycloak/keycloak-wildfly-subsystem/** - org/keycloak/keycloak-adapter-subsystem/** - org/keycloak/keycloak-servlet-oauth-client/** - - - org/keycloak/keycloak-authz-client/** - - - **/*.war - - modules/system/add-ons/keycloak - - - - - ../../shared-cli/adapter-install.cli - bin - - - cli/adapter-install-offline.cli - bin - - - ../../shared-cli/adapter-elytron-install.cli - bin - - - cli/adapter-elytron-install-offline.cli - bin - - - \ No newline at end of file diff --git a/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml b/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml deleted file mode 100755 index 9bc2b894a6..0000000000 --- a/distribution/adapters/wildfly-adapter/wildfly-adapter-zip/pom.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - 4.0.0 - - keycloak-parent - org.keycloak - 3.2.0.CR1-SNAPSHOT - ../../../../pom.xml - - - keycloak-wildfly-adapter-dist - pom - Keycloak Wildfly Adapter Distro - - - - - org.keycloak - keycloak-wildfly-modules - zip - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - prepare-package - - unpack - - - - - org.keycloak - keycloak-wildfly-modules - zip - ${project.build.directory}/unpacked - - - - - - - - maven-assembly-plugin - - - assemble - package - - single - - - - assembly.xml - - - target - - - target/assembly/work - - false - - - - - - - - - - product - - - product - - - - ${product.name}-${product.filename.version}-eap7-adapter - - - - - diff --git a/distribution/adapters/wildfly-adapter/wildfly-modules/assembly.xml b/distribution/adapters/wildfly-adapter/wildfly-modules/assembly.xml deleted file mode 100755 index 4acef09b9c..0000000000 --- a/distribution/adapters/wildfly-adapter/wildfly-modules/assembly.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - dist - - - zip - - false - - - - ../../ - - License.html - - - - - ${project.build.directory}/modules - - - - diff --git a/distribution/adapters/wildfly-adapter/wildfly-modules/build.xml b/distribution/adapters/wildfly-adapter/wildfly-modules/build.xml deleted file mode 100755 index 8e608a59ee..0000000000 --- a/distribution/adapters/wildfly-adapter/wildfly-modules/build.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/distribution/adapters/wildfly-adapter/wildfly-modules/lib.xml b/distribution/adapters/wildfly-adapter/wildfly-modules/lib.xml deleted file mode 100755 index 5794c22ec0..0000000000 --- a/distribution/adapters/wildfly-adapter/wildfly-modules/lib.xml +++ /dev/null @@ -1,277 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - "; - project.setProperty("current.maven.root", root); - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - "; - if(path.indexOf('${') != -1) { - throw "Module resource root not found, make sure it is listed in build/pom.xml" + path; - } - if(attributes.get("jandex") == "true" ) { - root = root + "\n\t"; - } - project.setProperty("current.resource.root", root); - ]]> - - - diff --git a/distribution/adapters/wildfly-adapter/wildfly-modules/pom.xml b/distribution/adapters/wildfly-adapter/wildfly-modules/pom.xml deleted file mode 100755 index ca097a3066..0000000000 --- a/distribution/adapters/wildfly-adapter/wildfly-modules/pom.xml +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - 4.0.0 - - - keycloak-parent - org.keycloak - 3.2.0.CR1-SNAPSHOT - ../../../../pom.xml - - - keycloak-wildfly-modules - - Keycloak Wildfly Modules - pom - - - org.keycloak - keycloak-common - - - org.keycloak - keycloak-core - - - org.keycloak - keycloak-adapter-spi - - - org.keycloak - keycloak-undertow-adapter-spi - - - org.keycloak - keycloak-adapter-core - - - org.keycloak - keycloak-jboss-adapter-core - - - org.keycloak - keycloak-undertow-adapter - - - org.keycloak - keycloak-wildfly-adapter - - - org.keycloak - keycloak-wildfly-elytron-oidc-adapter - - - org.keycloak - keycloak-wildfly-subsystem - - - org.keycloak - keycloak-servlet-oauth-client - - - org.apache.httpcomponents - httpmime - - - org.apache.httpcomponents - httpcore - - - - - org.keycloak - keycloak-authz-client - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - false - - - build-dist - - run - - compile - - - - - - - - - - - - org.jboss - jandex - 1.0.3.Final - - - ant-contrib - ant-contrib - 1.0b3 - - - ant - ant - - - - - org.apache.ant - ant-apache-bsf - 1.9.3 - - - org.apache.bsf - bsf-api - 3.1 - - - rhino - js - 1.7R2 - - - - - maven-assembly-plugin - - - assemble - package - - single - - - - assembly.xml - - - target - - - target/assembly/work - - false - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - copy-resources - - validate - - copy-resources - - - ${project.build.directory}/modules/org/keycloak/keycloak-adapter-subsystem - - - src/main/resources/modules/org/keycloak/keycloak-adapter-subsystem - true - - - - - - - - - - diff --git a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml b/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml deleted file mode 100755 index 84a08f02d9..0000000000 --- a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml b/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml deleted file mode 100755 index 6f50fa4f23..0000000000 --- a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-subsystem/main/module.xml b/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-subsystem/main/module.xml deleted file mode 100755 index 9cfb9349b5..0000000000 --- a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-subsystem/main/module.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-authz-client/main/module.xml b/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-authz-client/main/module.xml deleted file mode 100755 index 3cd1abd063..0000000000 --- a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-authz-client/main/module.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml b/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml deleted file mode 100755 index f40e1e3165..0000000000 --- a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml b/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml deleted file mode 100755 index 40186d743f..0000000000 --- a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-jboss-adapter-core/main/module.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-servlet-oauth-client/main/module.xml b/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-servlet-oauth-client/main/module.xml deleted file mode 100755 index 21b32bf898..0000000000 --- a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-servlet-oauth-client/main/module.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml b/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml deleted file mode 100755 index b3af92087a..0000000000 --- a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml b/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml deleted file mode 100755 index 64da990e28..0000000000 --- a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-elytron-oidc-adapter/main/module.xml b/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-elytron-oidc-adapter/main/module.xml deleted file mode 100755 index 1ca98391a2..0000000000 --- a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-elytron-oidc-adapter/main/module.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-subsystem/main/module.xml b/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-subsystem/main/module.xml deleted file mode 100755 index 9216ec70df..0000000000 --- a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-subsystem/main/module.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/distribution/server-dist/pom.xml b/distribution/server-dist/pom.xml index e538b7d037..40ef67043d 100755 --- a/distribution/server-dist/pom.xml +++ b/distribution/server-dist/pom.xml @@ -35,6 +35,11 @@ keycloak-server-feature-pack zip + + org.keycloak + keycloak-client-cli-dist + zip + @@ -51,7 +56,7 @@ compile - server-provisioning.xml + ../server-provisioning.xml @@ -79,29 +84,6 @@ - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-client-cli-dist - prepare-package - - unpack - - - - - org.keycloak - keycloak-client-cli-dist - zip - ${project.build.directory}/unpacked - - - - - - diff --git a/distribution/server-overlay/assembly.xml b/distribution/server-overlay/assembly.xml index c2b5275c51..7a0fee0226 100755 --- a/distribution/server-overlay/assembly.xml +++ b/distribution/server-overlay/assembly.xml @@ -27,35 +27,67 @@ - ${project.build.directory}/cli + target/${project.build.finalName} + + true - *.cli + **/module.xml - bin - ${project.build.directory}/unpacked/${serverDistDir} + target/${project.build.finalName} - - **/** - + false - modules/** + bin/*.sh + module.xml + welcome-content/** + appclient/** + bin/appclient.* + copyright.txt + README.txt + themes/** + version.txt + ${profileExcludes} - ${project.build.directory}/unpacked/${serverDistDir}/modules/system/layers/keycloak - modules/system/${identityType}/keycloak + target/${project.build.finalName} + - **/** + bin/*.sh + + 0755 + + + target/${project.build.finalName} + + + themes/** + + 0444 + + + src/main/welcome-content + welcome-content + + *.* + + + + src/main/modules + modules + + layers.conf - target/README.txt - + src/main/version.txt + + true diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml index 54923a31f0..c8bbf4937b 100755 --- a/distribution/server-overlay/pom.xml +++ b/distribution/server-overlay/pom.xml @@ -32,67 +32,32 @@ org.keycloak - keycloak-server-dist + keycloak-server-feature-pack + zip + + + org.keycloak + keycloak-client-cli-dist zip - - - ${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* - - - - keycloak-overlay-${project.version} - org.apache.maven.plugins - maven-dependency-plugin + org.wildfly.build + wildfly-server-provisioning-maven-plugin + ${build-tools.version} - unpack + server-provisioning + + build + compile - - unpack - - - - org.keycloak - keycloak-wildfly-server-subsystem - ${project.version} - jar - cli/*.cli - ${project.build.directory} - - - - - - unpack-server-dist - prepare-package - - unpack - - - - - org.keycloak - keycloak-server-dist - zip - ${project.build.directory}/unpacked - ${filesToInclude} - - + ../server-provisioning.xml + true @@ -119,29 +84,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - - - assemble - package - - single - - - - assembly.xml - - true - ${project.build.finalName} - false - ${project.build.directory} - ${project.build.directory}/assembly/work - - - - org.apache.maven.plugins maven-antrun-plugin @@ -179,10 +121,32 @@ + + org.apache.maven.plugins + maven-assembly-plugin + + + assemble + package + + single + + + + ${assemblyFile} + + true + ${project.build.finalName} + false + ${project.build.directory} + ${project.build.directory}/assembly/work + + + + - community @@ -192,9 +156,18 @@ - add-ons - keycloak-${project.version} - ${commonFilesToInclude} + ${wildfly.build-tools.version} + assembly.xml + + + keycloak-overlay-${project.version} + + + + + wf11 + + ${wildfly11.build-tools.version} @@ -206,13 +179,20 @@ - layers - ${product.name}-${product.filename.version} - - ${commonFilesToInclude}, - ${serverDistDir}/bin/product.conf, - ${serverDistDir}/modules/layers.conf + ${eap.build-tools.version} + assembly.xml + %regex[(providers.*)|(docs/contrib.*)|(docs/examples.*)|(docs/schema.*)] + + + org.wildfly + wildfly-dist + zip + + + + ${product.name}-overlay-${product.filename.version} + diff --git a/distribution/server-overlay/src/main/version.txt b/distribution/server-overlay/src/main/version.txt new file mode 100644 index 0000000000..c9db8ca50e --- /dev/null +++ b/distribution/server-overlay/src/main/version.txt @@ -0,0 +1 @@ +${product.name.full} - Version ${product.version} diff --git a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml b/distribution/server-provisioning.xml old mode 100755 new mode 100644 similarity index 59% rename from distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml rename to distribution/server-provisioning.xml index 4afb80d502..4e4afd5426 --- a/distribution/adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-common/main/module.xml +++ b/distribution/server-provisioning.xml @@ -1,7 +1,3 @@ - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/pom.xml b/pom.xml index 48072ba177..6774018303 100755 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ 7.2.0.Final 10.0.0.Final - 1.1.3.Final + 1.2.2.Final 11.0.0.Alpha1 1.1.8.Final 7.1.0.Beta1-redhat-2 @@ -1247,6 +1247,12 @@ ${project.version} zip + + org.keycloak + keycloak-adapter-feature-pack + ${project.version} + zip + org.keycloak keycloak-saml-tomcat6-adapter-dist From 6d8a3f7a8b644ebd6b09000c5ec5670e3906caeb Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Tue, 16 May 2017 13:52:42 +0200 Subject: [PATCH 2/8] KEYCLOAK-4933 Fixes --- .../adapters/wildfly-adapter/assembly.xml | 25 +++++++--- .../adapter-feature-pack/pom.xml | 4 ++ .../keycloak/org/bouncycastle/main/module.xml | 29 ----------- .../keycloak-adapter-core/main/module.xml | 2 +- .../keycloak-adapter-spi/main/module.xml | 6 +-- .../keycloak-authz-client/main/module.xml | 28 +++++------ .../main/module.xml | 1 + .../keycloak-undertow-adapter/main/module.xml | 2 +- .../main/module.xml | 50 +++++++++++++++++++ .../main/module.xml | 2 +- distribution/server-overlay/assembly.xml | 20 ++++++++ distribution/server-overlay/pom.xml | 25 ++++++++++ pom.xml | 4 +- 13 files changed, 140 insertions(+), 58 deletions(-) delete mode 100644 distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/bouncycastle/main/module.xml create mode 100755 distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-wildfly-elytron-oidc-adapter/main/module.xml diff --git a/distribution/adapters/wildfly-adapter/assembly.xml b/distribution/adapters/wildfly-adapter/assembly.xml index cb9db53a00..ec09dcff14 100755 --- a/distribution/adapters/wildfly-adapter/assembly.xml +++ b/distribution/adapters/wildfly-adapter/assembly.xml @@ -59,13 +59,6 @@ 0444 - - cli - bin - - *.* - - src/main/modules modules @@ -74,5 +67,23 @@ + + + ../shared-cli/adapter-install.cli + bin + + + cli/adapter-install-offline.cli + bin + + + ../shared-cli/adapter-elytron-install.cli + bin + + + cli/adapter-elytron-install-offline.cli + bin + + diff --git a/distribution/feature-packs/adapter-feature-pack/pom.xml b/distribution/feature-packs/adapter-feature-pack/pom.xml index be9c989d96..0dbb9fc74e 100755 --- a/distribution/feature-packs/adapter-feature-pack/pom.xml +++ b/distribution/feature-packs/adapter-feature-pack/pom.xml @@ -39,6 +39,10 @@ org.keycloak keycloak-wildfly-adapter + + org.keycloak + keycloak-wildfly-elytron-oidc-adapter + org.keycloak keycloak-servlet-oauth-client diff --git a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/bouncycastle/main/module.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/bouncycastle/main/module.xml deleted file mode 100644 index 2c3a43a846..0000000000 --- a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/bouncycastle/main/module.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - diff --git a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-adapter-core/main/module.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-adapter-core/main/module.xml index 9603619bc0..14203f9080 100755 --- a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-adapter-core/main/module.xml +++ b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-adapter-core/main/module.xml @@ -29,7 +29,7 @@ - + diff --git a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-adapter-spi/main/module.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-adapter-spi/main/module.xml index ef2e0ed292..36ce0f1831 100755 --- a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-adapter-spi/main/module.xml +++ b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-adapter-spi/main/module.xml @@ -26,13 +26,13 @@ + + + - - - diff --git a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-authz-client/main/module.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-authz-client/main/module.xml index 67cc62c319..a367a6c7ce 100755 --- a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-authz-client/main/module.xml +++ b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-authz-client/main/module.xml @@ -3,20 +3,20 @@ diff --git a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-jboss-adapter-core/main/module.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-jboss-adapter-core/main/module.xml index 6f342169b2..82a92bd52a 100755 --- a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-jboss-adapter-core/main/module.xml +++ b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-jboss-adapter-core/main/module.xml @@ -29,6 +29,7 @@ + diff --git a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-undertow-adapter/main/module.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-undertow-adapter/main/module.xml index 9047bbc48d..6dcf78156b 100755 --- a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-undertow-adapter/main/module.xml +++ b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-undertow-adapter/main/module.xml @@ -33,7 +33,7 @@ - + diff --git a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-wildfly-elytron-oidc-adapter/main/module.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-wildfly-elytron-oidc-adapter/main/module.xml new file mode 100755 index 0000000000..c76489a62f --- /dev/null +++ b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-wildfly-elytron-oidc-adapter/main/module.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-wildfly-subsystem/main/module.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-wildfly-subsystem/main/module.xml index e99bfe56b5..025f15271b 100755 --- a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-wildfly-subsystem/main/module.xml +++ b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-wildfly-subsystem/main/module.xml @@ -21,8 +21,8 @@ - + diff --git a/distribution/server-overlay/assembly.xml b/distribution/server-overlay/assembly.xml index 7a0fee0226..4bf7726005 100755 --- a/distribution/server-overlay/assembly.xml +++ b/distribution/server-overlay/assembly.xml @@ -39,6 +39,10 @@ false + .installation + docs/** + domain/** + standalone/** bin/*.sh module.xml welcome-content/** @@ -81,6 +85,22 @@ layers.conf + + src/main + + + README.txt + + true + + + target/cli + bin + + *.cli + + true + diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml index c8bbf4937b..fcf151f814 100755 --- a/distribution/server-overlay/pom.xml +++ b/distribution/server-overlay/pom.xml @@ -44,6 +44,31 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + compile + + unpack + + + + + org.keycloak + keycloak-wildfly-server-subsystem + ${project.version} + jar + cli/*.cli + ${project.build.directory} + + + + + + org.wildfly.build wildfly-server-provisioning-maven-plugin diff --git a/pom.xml b/pom.xml index 6774018303..fb8700d7ad 100755 --- a/pom.xml +++ b/pom.xml @@ -46,9 +46,9 @@ 10.0.0.Final 1.2.2.Final 11.0.0.Alpha1 - 1.1.8.Final + 1.2.2.Final 7.1.0.Beta1-redhat-2 - 1.1.8.Final + 1.2.2.Final 2.0.10.Final 1.1.0.Beta32 From 2e83eda172d514976581eb85fb2be9764609b403 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Thu, 18 May 2017 10:22:27 +0200 Subject: [PATCH 3/8] KEYCLOAK-4477 Update to WildFly 11 --- distribution/adapters/wildfly-adapter/pom.xml | 7 - .../feature-packs/server-feature-pack/pom.xml | 74 ---------- .../configuration/domain/subsystems.xml | 79 ---------- .../configuration/domain/template.xml | 110 -------------- .../configuration/host/host-master.xml | 135 ----------------- .../configuration/host/host-slave.xml | 124 ---------------- .../configuration/host/host.xml | 137 ------------------ .../configuration/host/subsystems.xml | 26 ---- .../standalone/subsystems-ha.xml | 49 ------- .../configuration/standalone/subsystems.xml | 47 ------ .../configuration/standalone/template.xml | 90 ------------ .../configuration/domain/subsystems.xml | 126 ++++++++-------- .../configuration/domain/template.xml | 58 ++------ .../configuration/host/host-master.xml | 16 +- .../configuration/host/host-slave.xml | 17 ++- .../resources/configuration/host/host.xml | 18 ++- .../configuration/host/subsystems.xml | 2 + .../standalone/subsystems-ha.xml | 5 +- .../configuration/standalone/subsystems.xml | 47 +++--- .../configuration/standalone/template.xml | 45 +++--- distribution/server-dist/pom.xml | 7 - distribution/server-overlay/pom.xml | 7 - pom.xml | 4 +- 23 files changed, 156 insertions(+), 1074 deletions(-) delete mode 100755 distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/domain/subsystems.xml delete mode 100755 distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/domain/template.xml delete mode 100755 distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/host/host-master.xml delete mode 100755 distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/host/host-slave.xml delete mode 100755 distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/host/host.xml delete mode 100644 distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/host/subsystems.xml delete mode 100755 distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/standalone/subsystems-ha.xml delete mode 100755 distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/standalone/subsystems.xml delete mode 100644 distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/standalone/template.xml diff --git a/distribution/adapters/wildfly-adapter/pom.xml b/distribution/adapters/wildfly-adapter/pom.xml index 082292acd2..0f1338138f 100644 --- a/distribution/adapters/wildfly-adapter/pom.xml +++ b/distribution/adapters/wildfly-adapter/pom.xml @@ -97,13 +97,6 @@ - - wf11 - - ${wildfly11.build-tools.version} - - - product diff --git a/distribution/feature-packs/server-feature-pack/pom.xml b/distribution/feature-packs/server-feature-pack/pom.xml index f9003b371f..c4ab370da0 100644 --- a/distribution/feature-packs/server-feature-pack/pom.xml +++ b/distribution/feature-packs/server-feature-pack/pom.xml @@ -128,7 +128,6 @@ ${wildfly.build-tools.version} org.wildfly:wildfly-feature-pack - src/main/resources/configuration @@ -140,52 +139,6 @@ - - - wf11 - - - ${wildfly11.build-tools.version} - org.wildfly:wildfly-feature-pack - src/main/resources-wf11/configuration - - - - - org.wildfly - wildfly-feature-pack - ${wildfly11.version} - zip - - - - - - - maven-resources-plugin - - - copy-configuration-wf11 - validate - - copy-resources - - - target/resources/configuration - - - src/main/resources-wf11/configuration - true - - - - - - - - - - product @@ -197,7 +150,6 @@ ${eap.build-tools.version} org.jboss.eap:wildfly-feature-pack - src/main/resources-wf11/configuration @@ -208,32 +160,6 @@ zip - - - - - maven-resources-plugin - - - copy-configuration-wf11 - validate - - copy-resources - - - target/resources/configuration - - - src/main/resources-wf11/configuration - true - - - - - - - - diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/domain/subsystems.xml b/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/domain/subsystems.xml deleted file mode 100755 index ab9bfa9dcb..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/domain/subsystems.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - logging.xml - bean-validation.xml - core-management.xml - keycloak-datasources.xml - ee.xml - ejb3.xml - io.xml - keycloak-infinispan.xml - jaxrs.xml - jca.xml - jdr.xml - jmx.xml - jpa.xml - jsf.xml - mail.xml - naming.xml - remoting.xml - request-controller.xml - elytron.xml - security.xml - security-manager.xml - transactions.xml - undertow.xml - keycloak-server.xml - - - - logging.xml - bean-validation.xml - core-management.xml - keycloak-datasources.xml - ee.xml - ejb3.xml - io.xml - keycloak-infinispan.xml - jaxrs.xml - jca.xml - jdr.xml - jgroups.xml - jmx.xml - jpa.xml - jsf.xml - mail.xml - mod_cluster.xml - naming.xml - remoting.xml - request-controller.xml - elytron.xml - security.xml - security-manager.xml - transactions.xml - undertow.xml - keycloak-server.xml - - - logging.xml - io.xml - undertow-load-balancer.xml - - diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/domain/template.xml b/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/domain/template.xml deleted file mode 100755 index 5774706ac9..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/domain/template.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/host/host-master.xml b/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/host/host-master.xml deleted file mode 100755 index 095fcc4cc5..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/host/host-master.xml +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/host/host-slave.xml b/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/host/host-slave.xml deleted file mode 100755 index 3b1812ea6b..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/host/host-slave.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/host/host.xml b/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/host/host.xml deleted file mode 100755 index 6a4dba4ff1..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/host/host.xml +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/host/subsystems.xml b/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/host/subsystems.xml deleted file mode 100644 index 67bc4cda9c..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/host/subsystems.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - core-management.xml - jmx.xml - elytron.xml - - diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/standalone/subsystems-ha.xml b/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/standalone/subsystems-ha.xml deleted file mode 100755 index 9d9954de9b..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/standalone/subsystems-ha.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - logging.xml - bean-validation.xml - keycloak-datasources.xml - deployment-scanner.xml - ee.xml - ejb3.xml - io.xml - keycloak-infinispan.xml - jaxrs.xml - jca.xml - jdr.xml - jgroups.xml - jmx.xml - jpa.xml - jsf.xml - mail.xml - mod_cluster.xml - naming.xml - remoting.xml - request-controller.xml - security-manager.xml - elytron.xml - security.xml - transactions.xml - undertow.xml - keycloak-server.xml - - \ No newline at end of file diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/standalone/subsystems.xml b/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/standalone/subsystems.xml deleted file mode 100755 index 823b45cebc..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/standalone/subsystems.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - logging.xml - bean-validation.xml - keycloak-datasources2.xml - deployment-scanner.xml - ee.xml - ejb3.xml - io.xml - keycloak-infinispan2.xml - jaxrs.xml - jca.xml - jdr.xml - jmx.xml - jpa.xml - jsf.xml - mail.xml - naming.xml - remoting.xml - request-controller.xml - security-manager.xml - elytron.xml - security.xml - transactions.xml - undertow.xml - keycloak-server.xml - - diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/standalone/template.xml b/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/standalone/template.xml deleted file mode 100644 index 7b13afe79e..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources-wf11/configuration/standalone/template.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/subsystems.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/subsystems.xml index d2a8706699..ab9bfa9dcb 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/subsystems.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/subsystems.xml @@ -15,71 +15,65 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - - - - logging.xml - io.xml - jmx.xml - naming.xml - remoting.xml - request-controller.xml - security.xml - security-manager.xml - - - - logging.xml - bean-validation.xml - keycloak-datasources.xml - ee.xml - ejb3.xml - io.xml - keycloak-infinispan.xml - jaxrs.xml - jca.xml - jdr.xml - jmx.xml - jpa.xml - jsf.xml - mail.xml - naming.xml - remoting.xml - request-controller.xml - security.xml - security-manager.xml - transactions.xml - undertow.xml - keycloak-server.xml - - - - - logging.xml - bean-validation.xml - keycloak-datasources.xml - ee.xml - ejb3.xml - io.xml - keycloak-infinispan.xml - jaxrs.xml - jca.xml - jdr.xml - jgroups.xml - jmx.xml - jpa.xml - jsf.xml - mail.xml - mod_cluster.xml - naming.xml - remoting.xml - request-controller.xml - security.xml - security-manager.xml - transactions.xml - undertow.xml - keycloak-server.xml - + + logging.xml + bean-validation.xml + core-management.xml + keycloak-datasources.xml + ee.xml + ejb3.xml + io.xml + keycloak-infinispan.xml + jaxrs.xml + jca.xml + jdr.xml + jmx.xml + jpa.xml + jsf.xml + mail.xml + naming.xml + remoting.xml + request-controller.xml + elytron.xml + security.xml + security-manager.xml + transactions.xml + undertow.xml + keycloak-server.xml + + + + logging.xml + bean-validation.xml + core-management.xml + keycloak-datasources.xml + ee.xml + ejb3.xml + io.xml + keycloak-infinispan.xml + jaxrs.xml + jca.xml + jdr.xml + jgroups.xml + jmx.xml + jpa.xml + jsf.xml + mail.xml + mod_cluster.xml + naming.xml + remoting.xml + request-controller.xml + elytron.xml + security.xml + security-manager.xml + transactions.xml + undertow.xml + keycloak-server.xml + + + logging.xml + io.xml + undertow-load-balancer.xml + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/template.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/template.xml index e7b5885177..5774706ac9 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/template.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/template.xml @@ -17,7 +17,7 @@ ~ limitations under the License. --> - + @@ -60,31 +60,6 @@ --> - - - - - - - - - - - - - - - - - - - - - - - - - @@ -96,12 +71,8 @@ These default configurations require the binding specification to be done in host.xml. --> - - - - - - + + @@ -114,20 +85,19 @@ - - - - - - - - - + + + + + + + + @@ -135,12 +105,6 @@ - - - - - - diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-master.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-master.xml index f5d89ee791..095fcc4cc5 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-master.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-master.xml @@ -22,7 +22,7 @@ is also started by this host controller file. The other instance must be started via host-slave.xml --> - + @@ -39,6 +39,11 @@ + + + + + @@ -53,8 +58,8 @@ - - + + @@ -71,7 +76,8 @@ - + + @@ -98,6 +104,8 @@ diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-slave.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-slave.xml index f8695d71a0..3b1812ea6b 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-slave.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host-slave.xml @@ -17,7 +17,7 @@ ~ limitations under the License. --> - + @@ -27,7 +27,7 @@ - + @@ -39,6 +39,11 @@ + + + + + @@ -53,8 +58,8 @@ - - + + @@ -75,7 +80,7 @@ - + @@ -99,6 +104,8 @@ diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host.xml index a5c9afbdcc..6a4dba4ff1 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/host.xml @@ -23,7 +23,7 @@ via host-slave.xml --> - + @@ -40,6 +40,11 @@ + + + + + @@ -54,8 +59,8 @@ - - + + @@ -72,7 +77,8 @@ - + + @@ -80,6 +86,8 @@ + + @@ -99,6 +107,8 @@ diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/subsystems.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/subsystems.xml index ada31ffc20..67bc4cda9c 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/subsystems.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/host/subsystems.xml @@ -19,6 +19,8 @@ + core-management.xml jmx.xml + elytron.xml diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml index 997a7bfb0c..9d9954de9b 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml @@ -30,16 +30,17 @@ jaxrs.xml jca.xml jdr.xml - jgroups.xml + jgroups.xml jmx.xml jpa.xml jsf.xml mail.xml - mod_cluster.xml + mod_cluster.xml naming.xml remoting.xml request-controller.xml security-manager.xml + elytron.xml security.xml transactions.xml undertow.xml diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems.xml index 0e275394bd..823b45cebc 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems.xml @@ -19,28 +19,29 @@ - logging.xml - bean-validation.xml - keycloak-datasources.xml - deployment-scanner.xml - ee.xml - ejb3.xml - io.xml - keycloak-infinispan.xml - jaxrs.xml - jca.xml - jdr.xml - jmx.xml - jpa.xml - jsf.xml - mail.xml - naming.xml - remoting.xml - request-controller.xml - security-manager.xml - security.xml - transactions.xml - undertow.xml - keycloak-server.xml + logging.xml + bean-validation.xml + keycloak-datasources2.xml + deployment-scanner.xml + ee.xml + ejb3.xml + io.xml + keycloak-infinispan2.xml + jaxrs.xml + jca.xml + jdr.xml + jmx.xml + jpa.xml + jsf.xml + mail.xml + naming.xml + remoting.xml + request-controller.xml + security-manager.xml + elytron.xml + security.xml + transactions.xml + undertow.xml + keycloak-server.xml diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/template.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/template.xml index c0cc9e578a..7b13afe79e 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/template.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/template.xml @@ -1,23 +1,6 @@ - - - + @@ -27,7 +10,7 @@ - + @@ -35,8 +18,13 @@ + + + + + - + @@ -46,19 +34,20 @@ - - + + - + - - - + + + - + + @@ -98,4 +87,4 @@ - + \ No newline at end of file diff --git a/distribution/server-dist/pom.xml b/distribution/server-dist/pom.xml index 40ef67043d..64ea4f09e8 100755 --- a/distribution/server-dist/pom.xml +++ b/distribution/server-dist/pom.xml @@ -104,13 +104,6 @@ - - wf11 - - ${wildfly11.build-tools.version} - - - product diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml index fcf151f814..2ee5b40bfe 100755 --- a/distribution/server-overlay/pom.xml +++ b/distribution/server-overlay/pom.xml @@ -189,13 +189,6 @@ - - wf11 - - ${wildfly11.build-tools.version} - - - product diff --git a/pom.xml b/pom.xml index fb8700d7ad..493ebb183a 100755 --- a/pom.xml +++ b/pom.xml @@ -43,10 +43,8 @@ 7.2.0.Final - 10.0.0.Final + 11.0.0.Alpha1 1.2.2.Final - 11.0.0.Alpha1 - 1.2.2.Final 7.1.0.Beta1-redhat-2 1.2.2.Final 2.0.10.Final From 9ec3a8c3d97c79600bc6d9647c254bf02d980cce Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Fri, 19 May 2017 06:17:39 +0200 Subject: [PATCH 4/8] KEYCLOAK-4933 Fixes --- .../keycloak-adapter-subsystem/main/module.xml | 1 + .../feature-packs/server-feature-pack/assembly.xml | 10 ---------- distribution/server-overlay/assembly.xml | 2 +- distribution/server-overlay/pom.xml | 9 +++------ 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-adapter-subsystem/main/module.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-adapter-subsystem/main/module.xml index 6ab98b9645..b64b3afc43 100755 --- a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-adapter-subsystem/main/module.xml +++ b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-adapter-subsystem/main/module.xml @@ -22,6 +22,7 @@ + diff --git a/distribution/feature-packs/server-feature-pack/assembly.xml b/distribution/feature-packs/server-feature-pack/assembly.xml index c118dec8e7..c449b2fdce 100644 --- a/distribution/feature-packs/server-feature-pack/assembly.xml +++ b/distribution/feature-packs/server-feature-pack/assembly.xml @@ -28,9 +28,6 @@ target/${project.build.finalName} - - configuration/** - target/unpacked-themes/theme @@ -52,13 +49,6 @@ content/bin true - - ${configDir} - - **/** - - configuration - ../../../ diff --git a/distribution/server-overlay/assembly.xml b/distribution/server-overlay/assembly.xml index 4bf7726005..aa049fee69 100755 --- a/distribution/server-overlay/assembly.xml +++ b/distribution/server-overlay/assembly.xml @@ -89,7 +89,7 @@ src/main - README.txt + ${readmeInclude} true diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml index 2ee5b40bfe..d57c5380f8 100755 --- a/distribution/server-overlay/pom.xml +++ b/distribution/server-overlay/pom.xml @@ -43,6 +43,7 @@ + keycloak-overlay-${project.version} org.apache.maven.plugins @@ -183,10 +184,8 @@ ${wildfly.build-tools.version} assembly.xml + README.txt - - keycloak-overlay-${project.version} - @@ -200,6 +199,7 @@ ${eap.build-tools.version} assembly.xml %regex[(providers.*)|(docs/contrib.*)|(docs/examples.*)|(docs/schema.*)] + @@ -208,9 +208,6 @@ zip - - ${product.name}-overlay-${product.filename.version} - From cc42ea9332a06c92aa8e864b684ee658478cdbe3 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Fri, 19 May 2017 06:24:37 +0200 Subject: [PATCH 5/8] KEYCLOAK-4773 Remove 'providers' directory --- distribution/adapters/wildfly-adapter/pom.xml | 2 +- .../src/main/resources/content/providers/README.txt | 2 -- distribution/server-dist/pom.xml | 2 +- distribution/server-overlay/pom.xml | 2 +- .../src/main/resources/cli/default-keycloak-subsys-config.cli | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 distribution/feature-packs/server-feature-pack/src/main/resources/content/providers/README.txt diff --git a/distribution/adapters/wildfly-adapter/pom.xml b/distribution/adapters/wildfly-adapter/pom.xml index 0f1338138f..6090e9cb1e 100644 --- a/distribution/adapters/wildfly-adapter/pom.xml +++ b/distribution/adapters/wildfly-adapter/pom.xml @@ -107,7 +107,7 @@ ${eap.build-tools.version} assembly.xml - %regex[(providers.*)|(docs/contrib.*)|(docs/examples.*)|(docs/schema.*)] + %regex[(docs/contrib.*)|(docs/examples.*)|(docs/schema.*)] diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/content/providers/README.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/content/providers/README.txt deleted file mode 100644 index 20b281aefd..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/content/providers/README.txt +++ /dev/null @@ -1,2 +0,0 @@ -Any provider implementation jars and libraries in this folder will be loaded. See the providers section in the -documentation for more details. \ No newline at end of file diff --git a/distribution/server-dist/pom.xml b/distribution/server-dist/pom.xml index 64ea4f09e8..fd216303ff 100755 --- a/distribution/server-dist/pom.xml +++ b/distribution/server-dist/pom.xml @@ -114,7 +114,7 @@ ${eap.build-tools.version} assembly.xml - %regex[(providers.*)|(docs/contrib.*)|(docs/examples.*)|(docs/schema.*)] + %regex[(docs/contrib.*)|(docs/examples.*)|(docs/schema.*)] diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml index d57c5380f8..d3310bbe26 100755 --- a/distribution/server-overlay/pom.xml +++ b/distribution/server-overlay/pom.xml @@ -198,7 +198,7 @@ ${eap.build-tools.version} assembly.xml - %regex[(providers.*)|(docs/contrib.*)|(docs/examples.*)|(docs/schema.*)] + %regex[(docs/contrib.*)|(docs/examples.*)|(docs/schema.*)] diff --git a/wildfly/server-subsystem/src/main/resources/cli/default-keycloak-subsys-config.cli b/wildfly/server-subsystem/src/main/resources/cli/default-keycloak-subsys-config.cli index 071386c10e..f76cd45221 100644 --- a/wildfly/server-subsystem/src/main/resources/cli/default-keycloak-subsys-config.cli +++ b/wildfly/server-subsystem/src/main/resources/cli/default-keycloak-subsys-config.cli @@ -1,4 +1,4 @@ -/subsystem=keycloak-server:add(web-context=auth,master-realm-name=master,scheduled-task-interval=900,providers=[classpath:${jboss.home.dir}/providers/*]) +/subsystem=keycloak-server:add(web-context=auth,master-realm-name=master,scheduled-task-interval=900) /subsystem=keycloak-server/theme=defaults/:add(dir=${jboss.home.dir}/themes,staticMaxAge=2592000,cacheTemplates=true,cacheThemes=true) /subsystem=keycloak-server/spi=eventsStore/:add /subsystem=keycloak-server/spi=eventsStore/provider=jpa/:add(properties={exclude-events => "[\"REFRESH_TOKEN\"]"},enabled=true) From 43a625db28fa06b3b89c032098d87ee1cf67787d Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Fri, 19 May 2017 08:25:36 +0200 Subject: [PATCH 6/8] KEYCLOAK-4477 Fix update to WF 11 --- .../feature-packs/server-feature-pack/pom.xml | 671 +++++++++++++++++- .../keycloak/org/drools/main/module.xml | 2 +- .../jdt/core/compiler/ecj/main/module.xml | 37 - 3 files changed, 668 insertions(+), 42 deletions(-) delete mode 100644 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/eclipse/jdt/core/compiler/ecj/main/module.xml diff --git a/distribution/feature-packs/server-feature-pack/pom.xml b/distribution/feature-packs/server-feature-pack/pom.xml index c4ab370da0..2d39ad1063 100644 --- a/distribution/feature-packs/server-feature-pack/pom.xml +++ b/distribution/feature-packs/server-feature-pack/pom.xml @@ -29,23 +29,676 @@ Keycloak Feature Pack: Server pom + + + + org.jboss.integration-platform + jboss-integration-platform-bom + pom + import + ${version.jboss-integration-platform} + + + org.drools + drools-bom + pom + ${version.org.drools} + import + + + + + + aopalliance + aopalliance + + + * + * + + + + + com.google.zxing + core + + + * + * + + + + + com.google.zxing + javase + + + * + * + + + + + com.thoughtworks.xstream + xstream + + + * + * + + + + + org.antlr + antlr-runtime + + + * + * + + + + + org.apache.ant + ant + + + * + * + + + + + org.apache.ant + ant-launcher + + + * + * + + + + + org.apache.maven + maven-aether-provider + + + * + * + + + + + org.apache.maven + maven-artifact + + + * + * + + + + + org.apache.maven + maven-compat + + + * + * + + + + + org.apache.maven + maven-core + + + * + * + + + + + org.apache.maven + maven-model + + + * + * + + + + + org.apache.maven + maven-model-builder + + + * + * + + + + + org.apache.maven + maven-plugin-api + + + * + * + + + + + org.apache.maven + maven-repository-metadata + + + * + * + + + + + org.apache.maven + maven-settings + + + * + * + + + + + org.apache.maven + maven-settings-builder + + + * + * + + + + + org.apache.maven.wagon + wagon-http + + + * + * + + + + + org.apache.maven.wagon + wagon-http-shared + + + * + * + + + + + org.apache.maven.wagon + wagon-provider-api + + + * + * + + + + + org.codehaus.plexus + plexus-classworlds + + + * + * + + + + + org.codehaus.plexus + plexus-component-annotations + + + * + * + + + + + org.codehaus.plexus + plexus-interpolation + + + * + * + + + + + org.codehaus.plexus + plexus-utils + + + * + * + + + + + org.drools + drools-compiler + + + * + * + + + + + org.drools + drools-core + + + * + * + + + + + org.eclipse.aether + aether-api + + + * + * + + + + + org.eclipse.aether + aether-connector-basic + + + * + * + + + + + org.eclipse.aether + aether-impl + + + * + * + + + + + org.eclipse.aether + aether-spi + + + * + * + + + + + org.eclipse.aether + aether-transport-file + + + * + * + + + + + org.eclipse.aether + aether-transport-http + + + * + * + + + + + org.eclipse.aether + aether-transport-wagon + + + * + * + + + + + org.eclipse.aether + aether-util + + + * + * + + + + + org.eclipse.sisu + org.eclipse.sisu.inject + + + * + * + + + + + org.eclipse.sisu + org.eclipse.sisu.plexus + + + * + * + + + + + org.freemarker + freemarker + + + * + * + + + org.keycloak - keycloak-dependencies-server-all - pom + keycloak-authz-policy-common + + + * + * + + + + + org.keycloak + keycloak-authz-policy-drools + + + * + * + + + + + org.keycloak + keycloak-common + + + * + * + + + + + org.keycloak + keycloak-core + + + * + * + + + + + org.keycloak + keycloak-js-adapter + + + * + * + + + + + org.keycloak + keycloak-kerberos-federation + + + * + * + + + + + org.keycloak + keycloak-ldap-federation + + + * + * + + + + + org.keycloak + keycloak-model-infinispan + + + * + * + + + + + org.keycloak + keycloak-model-jpa + + + * + * + + + + + org.keycloak + keycloak-saml-core + + + * + * + + + + + org.keycloak + keycloak-saml-core-public + + + * + * + + + + + org.keycloak + keycloak-server-spi + + + * + * + + + + + org.keycloak + keycloak-server-spi-private + + + * + * + + + + + org.keycloak + keycloak-services + + + * + * + + + + + org.keycloak + keycloak-sssd-federation + + + * + * + + org.keycloak keycloak-wildfly-adduser + + + * + * + + org.keycloak keycloak-wildfly-extensions + + + * + * + + org.keycloak keycloak-wildfly-server-subsystem + + + * + * + + + + + org.kie + kie-api + + + * + * + + + + + org.kie + kie-ci + + + * + * + + + + + org.kie + kie-internal + + + * + * + + + + + org.liquibase + liquibase-core + + + * + * + + + + + org.mvel + mvel2 + + + * + * + + + + + org.sonatype.plexus + plexus-cipher + + + * + * + + + + + org.sonatype.plexus + plexus-sec-dispatcher + + + * + * + + + + + org.sonatype.sisu.inject + guice-servlet + + + * + * + + + + + org.sonatype.sisu + sisu-guice + no_aop + + + * + * + + + + + org.twitter4j + twitter4j-core + + + * + * + + @@ -126,7 +779,6 @@ - ${wildfly.build-tools.version} org.wildfly:wildfly-feature-pack @@ -135,6 +787,12 @@ org.wildfly wildfly-feature-pack zip + + + * + * + + @@ -148,7 +806,6 @@ - ${eap.build-tools.version} org.jboss.eap:wildfly-feature-pack @@ -158,6 +815,12 @@ wildfly-feature-pack ${eap.version} zip + + + * + * + + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/drools/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/drools/main/module.xml index 4c5af2f8c2..9c91f88d7e 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/drools/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/drools/main/module.xml @@ -37,6 +37,6 @@ - + diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/eclipse/jdt/core/compiler/ecj/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/eclipse/jdt/core/compiler/ecj/main/module.xml deleted file mode 100644 index 849fc353f5..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/eclipse/jdt/core/compiler/ecj/main/module.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - From a2af516df78e4553317a9f40067d9751890747eb Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Fri, 5 May 2017 11:07:34 +0200 Subject: [PATCH 7/8] KEYCLOAK-4855 [RHSSO] Compilation issues with Bouncycastle 1.56 --- common/src/main/java/org/keycloak/common/util/OCSPUtils.java | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/org/keycloak/common/util/OCSPUtils.java b/common/src/main/java/org/keycloak/common/util/OCSPUtils.java index 59eaab209d..9dedec7136 100644 --- a/common/src/main/java/org/keycloak/common/util/OCSPUtils.java +++ b/common/src/main/java/org/keycloak/common/util/OCSPUtils.java @@ -317,8 +317,8 @@ public final class OCSPUtils { } if (certs.size() > 0) { - X500Name responderName = basicOcspResponse.getResponderId().toASN1Object().getName(); - byte[] responderKey = basicOcspResponse.getResponderId().toASN1Object().getKeyHash(); + X500Name responderName = basicOcspResponse.getResponderId().toASN1Primitive().getName(); + byte[] responderKey = basicOcspResponse.getResponderId().toASN1Primitive().getKeyHash(); if (responderName != null) { logger.log(Level.INFO, "Responder Name: {0}", responderName.toString()); diff --git a/pom.xml b/pom.xml index 493ebb183a..5559502d34 100755 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 4.4.1 0.6 1.3.0.Final - 1.52 + 1.56 3.1.5 1.6.1 2011.1 From 0b6c9aa927e8cdd5cb973632ba4001baff1c5a15 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Fri, 19 May 2017 09:43:15 +0200 Subject: [PATCH 8/8] KEYCLOAK-4723 Refactor service dependencies for caches in KeycloakServerDeploymentProcessor --- pom.xml | 2 +- .../KeycloakServerDeploymentProcessor.java | 21 +++++-------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 5559502d34..e18f9da00d 100755 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ 1.2.2.Final 7.1.0.Beta1-redhat-2 1.2.2.Final - 2.0.10.Final + 3.0.0.Beta11 1.1.0.Beta32 1.0.0.Beta14 diff --git a/wildfly/server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakServerDeploymentProcessor.java b/wildfly/server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakServerDeploymentProcessor.java index d83cd189ea..53e97a5e58 100755 --- a/wildfly/server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakServerDeploymentProcessor.java +++ b/wildfly/server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/KeycloakServerDeploymentProcessor.java @@ -96,22 +96,11 @@ public class KeycloakServerDeploymentProcessor implements DeploymentUnitProcesso } private void addInfinispanCaches(DeploymentPhaseContext context) { - // TODO Can be removed once we upgrade to WildFly 11 - ServiceName wf10CacheContainerService = ServiceName.of("jboss", "infinispan", "keycloak"); - boolean legacy = context.getServiceRegistry().getService(wf10CacheContainerService) != null; - - if (!legacy) { - ServiceTarget st = context.getServiceTarget(); - CapabilityServiceSupport support = context.getDeploymentUnit().getAttachment(Attachments.CAPABILITY_SERVICE_SUPPORT); - for (String c : CACHES) { - ServiceName sn = support.getCapabilityServiceName("org.wildfly.clustering.infinispan.cache.keycloak." + c); - st.addDependency(sn); - } - } else { - ServiceTarget st = context.getServiceTarget(); - for (String c : CACHES) { - st.addDependency(wf10CacheContainerService.append(c)); - } + ServiceTarget st = context.getServiceTarget(); + CapabilityServiceSupport support = context.getDeploymentUnit().getAttachment(Attachments.CAPABILITY_SERVICE_SUPPORT); + for (String c : CACHES) { + ServiceName sn = support.getCapabilityServiceName("org.wildfly.clustering.infinispan.cache", "keycloak", c); + st.addDependency(sn); } }