Skip to content

Commit e645b99

Browse files
authored
refactor(distro-wildfly): align Apiman to Keycloak 15.1.1, which required 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.
1 parent 52eebc0 commit e645b99

File tree

8 files changed

+144
-124
lines changed

8 files changed

+144
-124
lines changed

distro/wildfly/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<properties>
1515
<docker.wildfly.version>wildfly</docker.wildfly.version>
16-
<docker.base-image>jboss/wildfly:20.0.1.Final</docker.base-image>
16+
<docker.base-image>quay.io/wildfly/wildfly:23.0.2.Final</docker.base-image>
1717
<docker.target-image-name>apiman/on-wildfly:latest</docker.target-image-name>
1818
<docker.target-image-name.alias>wildfly-master</docker.target-image-name.alias>
1919
</properties>

distro/wildfly/src/main/resources/overlay/standalone/configuration/standalone-apiman.xml

Lines changed: 114 additions & 110 deletions
Large diffs are not rendered by default.

gateway/platforms/war/wildfly8/api/src/main/webapp/WEB-INF/jboss-deployment-structure.xml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
<jboss-deployment-structure>
22
<deployment>
3+
<exclusions>
4+
<module name="org.apache.log4j" />
5+
<module name="org.apache.logging.log4j.api" />
6+
</exclusions>
37
<dependencies>
4-
<module name="org.codehaus.jackson.jackson-core-asl" />
5-
<module name="org.codehaus.jackson.jackson-mapper-asl" />
8+
<module name="com.fasterxml.jackson.core.jackson-core" />
9+
<module name="com.fasterxml.jackson.core.jackson-annotations" />
10+
<module name="com.fasterxml.jackson.core.jackson-databind" />
11+
<module name="com.fasterxml.jackson.datatype.jackson-datatype-jdk8" />
12+
<module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" />
613
<module name="org.infinispan" />
7-
<module name="org.apache.log4j" />
8-
<module name="org.slf4j" />
914
<module name="org.picketbox" />
1015
</dependencies>
1116
<exclude-subsystems>

gateway/platforms/war/wildfly8/gateway/src/main/webapp/WEB-INF/jboss-deployment-structure.xml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
<jboss-deployment-structure>
22
<deployment>
3+
<exclusions>
4+
<module name="org.apache.log4j" />
5+
<module name="org.apache.logging.log4j.api" />
6+
</exclusions>
37
<dependencies>
4-
<module name="org.codehaus.jackson.jackson-core-asl" />
5-
<module name="org.codehaus.jackson.jackson-mapper-asl" />
8+
<module name="com.fasterxml.jackson.core.jackson-core" />
9+
<module name="com.fasterxml.jackson.core.jackson-annotations" />
10+
<module name="com.fasterxml.jackson.core.jackson-databind" />
11+
<module name="com.fasterxml.jackson.datatype.jackson-datatype-jdk8" />
12+
<module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" />
613
<module name="org.infinispan" />
7-
<module name="org.apache.log4j" />
8-
<module name="org.slf4j" />
914
<module name="org.picketbox" />
1015
</dependencies>
1116
<exclude-subsystems>

manager/api/war/wildfly8/src/main/webapp/WEB-INF/jboss-deployment-structure.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<jboss-deployment-structure>
22
<deployment>
3+
<exclusions>
4+
<module name="org.apache.log4j" />
5+
<module name="org.apache.logging.log4j.api" />
6+
</exclusions>
37
<dependencies>
48
<module name="org.infinispan" />
59
<module name="org.hibernate" />
6-
<module name="org.apache.log4j" />
7-
<module name="org.slf4j" />
810
<module name="org.picketbox" />
911
</dependencies>
1012
<exclude-subsystems>

manager/ui/war/wildfly8/src/main/webapp/WEB-INF/jboss-deployment-structure.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<jboss-deployment-structure>
22
<deployment>
3+
<exclusions>
4+
<module name="org.apache.log4j" />
5+
<module name="org.apache.logging.log4j.api" />
6+
</exclusions>
37
<exclude-subsystems>
48
<subsystem name="webservices" />
59
</exclude-subsystems>

parent/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,15 @@
122122
<version.org.elasticsearch>7.13.4</version.org.elasticsearch>
123123
<version.org.hamcrest>1.3</version.org.hamcrest>
124124
<version.org.hibernate.javax.persistence.hibernate-jpa-2.1-api>1.0.2</version.org.hibernate.javax.persistence.hibernate-jpa-2.1-api>
125-
<version.org.hibernate>5.3.17.Final</version.org.hibernate> <!-- Pin to Wildfly version -->
125+
<version.org.hibernate>5.3.20.Final</version.org.hibernate> <!-- Pin to WildFly version -->
126126
<version.org.infinispan>8.2.12.Final</version.org.infinispan>
127127
<version.org.jboss.jandex>2.4.0.Final</version.org.jboss.jandex>
128128
<version.org.jboss.logging.jboss-logging>3.4.2.Final</version.org.jboss.logging.jboss-logging>
129129
<version.org.jboss.resteasy>3.15.1.Final</version.org.jboss.resteasy>
130130
<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>
131131
<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>
132132
<version.org.jboss.weld.weld>3.1.8.Final</version.org.jboss.weld.weld>
133-
<version.org.keycloak>12.0.4</version.org.keycloak>
133+
<version.org.keycloak>15.1.1</version.org.keycloak>
134134
<version.org.mockito>3.12.1</version.org.mockito>
135135
<version.org.mvel>2.4.12.Final</version.org.mvel>
136136
<version.org.picketbox>5.1.0.Final</version.org.picketbox>

tools/server-all/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<antversion property="antversion" />
8080
<echo>Ant Version: ${antversion}</echo>
8181

82-
<property name="wildfly.version" value="20.0.1.Final"/>
82+
<property name="wildfly.version" value="23.0.2.Final"/>
8383

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

0 commit comments

Comments
 (0)