Skip to content

Commit

Permalink
refactor(distro-wildfly): align Apiman to Keycloak 15.1.1, which requ…
Browse files Browse the repository at this point in the history
…ired upgrading to WildFly 23.0.2

This mostly included reworking the WildFly quickstart distro's `standalone-apiman.xml` config (again).

For now we're still using the default Apiman self-signed cert, but we should move to generate-self-signed soon.

This is a slightly more disruptive change, potentially, though.
  • Loading branch information
msavy committed Dec 24, 2021
1 parent 52eebc0 commit e645b99
Show file tree
Hide file tree
Showing 8 changed files with 144 additions and 124 deletions.
2 changes: 1 addition & 1 deletion distro/wildfly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<properties>
<docker.wildfly.version>wildfly</docker.wildfly.version>
<docker.base-image>jboss/wildfly:20.0.1.Final</docker.base-image>
<docker.base-image>quay.io/wildfly/wildfly:23.0.2.Final</docker.base-image>
<docker.target-image-name>apiman/on-wildfly:latest</docker.target-image-name>
<docker.target-image-name.alias>wildfly-master</docker.target-image-name.alias>
</properties>
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
<jboss-deployment-structure>
<deployment>
<exclusions>
<module name="org.apache.log4j" />
<module name="org.apache.logging.log4j.api" />
</exclusions>
<dependencies>
<module name="org.codehaus.jackson.jackson-core-asl" />
<module name="org.codehaus.jackson.jackson-mapper-asl" />
<module name="com.fasterxml.jackson.core.jackson-core" />
<module name="com.fasterxml.jackson.core.jackson-annotations" />
<module name="com.fasterxml.jackson.core.jackson-databind" />
<module name="com.fasterxml.jackson.datatype.jackson-datatype-jdk8" />
<module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" />
<module name="org.infinispan" />
<module name="org.apache.log4j" />
<module name="org.slf4j" />
<module name="org.picketbox" />
</dependencies>
<exclude-subsystems>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
<jboss-deployment-structure>
<deployment>
<exclusions>
<module name="org.apache.log4j" />
<module name="org.apache.logging.log4j.api" />
</exclusions>
<dependencies>
<module name="org.codehaus.jackson.jackson-core-asl" />
<module name="org.codehaus.jackson.jackson-mapper-asl" />
<module name="com.fasterxml.jackson.core.jackson-core" />
<module name="com.fasterxml.jackson.core.jackson-annotations" />
<module name="com.fasterxml.jackson.core.jackson-databind" />
<module name="com.fasterxml.jackson.datatype.jackson-datatype-jdk8" />
<module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" />
<module name="org.infinispan" />
<module name="org.apache.log4j" />
<module name="org.slf4j" />
<module name="org.picketbox" />
</dependencies>
<exclude-subsystems>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<jboss-deployment-structure>
<deployment>
<exclusions>
<module name="org.apache.log4j" />
<module name="org.apache.logging.log4j.api" />
</exclusions>
<dependencies>
<module name="org.infinispan" />
<module name="org.hibernate" />
<module name="org.apache.log4j" />
<module name="org.slf4j" />
<module name="org.picketbox" />
</dependencies>
<exclude-subsystems>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<jboss-deployment-structure>
<deployment>
<exclusions>
<module name="org.apache.log4j" />
<module name="org.apache.logging.log4j.api" />
</exclusions>
<exclude-subsystems>
<subsystem name="webservices" />
</exclude-subsystems>
Expand Down
4 changes: 2 additions & 2 deletions parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,15 @@
<version.org.elasticsearch>7.13.4</version.org.elasticsearch>
<version.org.hamcrest>1.3</version.org.hamcrest>
<version.org.hibernate.javax.persistence.hibernate-jpa-2.1-api>1.0.2</version.org.hibernate.javax.persistence.hibernate-jpa-2.1-api>
<version.org.hibernate>5.3.17.Final</version.org.hibernate> <!-- Pin to Wildfly version -->
<version.org.hibernate>5.3.20.Final</version.org.hibernate> <!-- Pin to WildFly version -->
<version.org.infinispan>8.2.12.Final</version.org.infinispan>
<version.org.jboss.jandex>2.4.0.Final</version.org.jboss.jandex>
<version.org.jboss.logging.jboss-logging>3.4.2.Final</version.org.jboss.logging.jboss-logging>
<version.org.jboss.resteasy>3.15.1.Final</version.org.jboss.resteasy>
<version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>1.1.1.Final</version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>
<version.org.jboss.spec.javax.ws.jboss-jaxrs-api_2.1_spec>2.0.2.Final</version.org.jboss.spec.javax.ws.jboss-jaxrs-api_2.1_spec>
<version.org.jboss.weld.weld>3.1.8.Final</version.org.jboss.weld.weld>
<version.org.keycloak>12.0.4</version.org.keycloak>
<version.org.keycloak>15.1.1</version.org.keycloak>
<version.org.mockito>3.12.1</version.org.mockito>
<version.org.mvel>2.4.12.Final</version.org.mvel>
<version.org.picketbox>5.1.0.Final</version.org.picketbox>
Expand Down
2 changes: 1 addition & 1 deletion tools/server-all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<antversion property="antversion" />
<echo>Ant Version: ${antversion}</echo>

<property name="wildfly.version" value="20.0.1.Final"/>
<property name="wildfly.version" value="23.0.2.Final"/>

<property name="appserver.id" value="wildfly" />
<property name="apiman.wildfly.download.url" value="https://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip" />
Expand Down

0 comments on commit e645b99

Please sign in to comment.