Skip to content

Commit

Permalink
deps(wildfly): upgrade to wildfly 35
Browse files Browse the repository at this point in the history
  • Loading branch information
@PHWaechtler
PHWaechtler committed Dec 19, 2024
1 parent a096234 commit a6126f2
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 33 deletions.
10 changes: 5 additions & 5 deletions distro/wildfly/assembly/src/wildfly/standalone-full.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<server xmlns="urn:jboss:domain:20.0">
<server xmlns="urn:jboss:domain:community:20.0">
<extensions>
<extension module="org.jboss.as.clustering.infinispan"/>
<extension module="org.jboss.as.connector"/>
Expand Down Expand Up @@ -131,15 +131,15 @@
</subsystem>
<subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
<subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
<subsystem xmlns="urn:jboss:domain:datasources:7.1">
<subsystem xmlns="urn:jboss:domain:datasources:7.2">
<datasources>
<datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true" statistics-enabled="${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=${wildfly.h2.compatibility.mode:REGULAR}</connection-url>
<driver>h2</driver>
<security user-name="sa" password="sa"/>
</datasource>
<datasource jndi-name="java:jboss/datasources/ProcessEngine" pool-name="ProcessEngine" enabled="true" use-java-context="true" jta="true" use-ccm="true">
<connection-url>jdbc:h2:./camunda-h2-dbs/process-engine;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
<connection-url>jdbc:h2:./camunda-h2-dbs/process-engine;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=${wildfly.h2.compatibility.mode:REGULAR}</connection-url>
<driver>h2</driver>
<transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
<security user-name="sa" password="sa"/>
Expand Down Expand Up @@ -418,7 +418,7 @@
<subsystem xmlns="urn:jboss:domain:io:4.0" default-worker="default">
<worker name="default"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jaxrs:3.0"/>
<subsystem xmlns="urn:jboss:domain:jaxrs:4.0"/>
<subsystem xmlns="urn:jboss:domain:jca:6.0">
<archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
<bean-validation enabled="true"/>
Expand Down
10 changes: 5 additions & 5 deletions distro/wildfly/assembly/src/wildfly/standalone.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<server xmlns="urn:jboss:domain:20.0">
<server xmlns="urn:jboss:domain:community:20.0">
<extensions>
<extension module="org.jboss.as.clustering.infinispan"/>
<extension module="org.jboss.as.connector"/>
Expand Down Expand Up @@ -129,15 +129,15 @@
</subsystem>
<subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
<subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
<subsystem xmlns="urn:jboss:domain:datasources:7.1">
<subsystem xmlns="urn:jboss:domain:datasources:7.2">
<datasources>
<datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true" statistics-enabled="${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=${wildfly.h2.compatibility.mode:REGULAR}</connection-url>
<driver>h2</driver>
<security user-name="sa" password="sa"/>
</datasource>
<datasource jndi-name="java:jboss/datasources/ProcessEngine" pool-name="ProcessEngine" enabled="true" use-java-context="true" jta="true" use-ccm="true">
<connection-url>jdbc:h2:./camunda-h2-dbs/process-engine;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
<connection-url>jdbc:h2:./camunda-h2-dbs/process-engine;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=${wildfly.h2.compatibility.mode:REGULAR}</connection-url>
<driver>h2</driver>
<transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
<security user-name="sa" password="sa"/>
Expand Down Expand Up @@ -406,7 +406,7 @@
<subsystem xmlns="urn:jboss:domain:io:4.0" default-worker="default">
<worker name="default"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jaxrs:3.0"/>
<subsystem xmlns="urn:jboss:domain:jaxrs:4.0"/>
<subsystem xmlns="urn:jboss:domain:jca:6.0">
<archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
<bean-validation enabled="true"/>
Expand Down
4 changes: 2 additions & 2 deletions parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
<version.bouncycastle>1.47</version.bouncycastle>

<!-- application servers -->
<version.wildfly>33.0.1.Final</version.wildfly>
<version.wildfly.core>25.0.1.Final</version.wildfly.core>
<version.wildfly>35.0.0.Beta1</version.wildfly>
<version.wildfly.core>27.0.0.Beta5</version.wildfly.core>

<version.wildfly26>26.0.1.Final</version.wildfly26>
<version.wildfly26.core>18.0.4.Final</version.wildfly26.core>
Expand Down
61 changes: 44 additions & 17 deletions qa/wildfly-runtime/src/main/wildfly/domain/configuration/domain.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<domain xmlns="urn:jboss:domain:20.0">
<domain xmlns="urn:jboss:domain:community:20.0">
<extensions>
<extension module="org.jboss.as.clustering.infinispan"/>
<extension module="org.jboss.as.clustering.jgroups"/>
Expand Down Expand Up @@ -107,15 +107,15 @@
</subsystem>
<subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
<subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
<subsystem xmlns="urn:jboss:domain:datasources:7.1">
<subsystem xmlns="urn:jboss:domain:datasources:7.2">
<datasources>
<datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true" statistics-enabled="${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=${wildfly.h2.compatibility.mode:REGULAR}</connection-url>
<driver>h2</driver>
<security user-name="sa" password="sa"/>
</datasource>
<datasource jndi-name="java:jboss/datasources/ProcessEngine" pool-name="ProcessEngineDS" enabled="true" use-java-context="true">
<connection-url>jdbc:h2:mem:processengine;DB_CLOSE_DELAY=-1</connection-url>
<connection-url>jdbc:h2:mem:processengine;DB_CLOSE_DELAY=-1;MODE=${wildfly.h2.compatibility.mode:REGULAR}</connection-url>
<driver>h2</driver>
<security user-name="sa" password="sa"/>
</datasource>
Expand Down Expand Up @@ -359,7 +359,7 @@
<subsystem xmlns="urn:jboss:domain:io:4.0" default-worker="default">
<worker name="default"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jaxrs:3.0"/>
<subsystem xmlns="urn:jboss:domain:jaxrs:4.0"/>
<subsystem xmlns="urn:jboss:domain:jca:6.0">
<archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
<bean-validation enabled="true"/>
Expand Down Expand Up @@ -546,10 +546,10 @@
</subsystem>
<subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
<subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
<subsystem xmlns="urn:jboss:domain:datasources:7.1">
<subsystem xmlns="urn:jboss:domain:datasources:7.2">
<datasources>
<datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true" statistics-enabled="${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=${wildfly.h2.compatibility.mode:REGULAR}</connection-url>
<driver>h2</driver>
<security user-name="sa" password="sa"/>
</datasource>
Expand Down Expand Up @@ -772,7 +772,7 @@
<expiration interval="0"/>
</replicated-cache>
</cache-container>
<cache-container name="web" default-cache="dist" marshaller="PROTOSTREAM" modules="org.wildfly.clustering.web.infinispan">
<cache-container name="web" default-cache="dist" marshaller="PROTOSTREAM" modules="org.wildfly.clustering.session.infinispan.embedded">
<transport lock-timeout="60000"/>
<replicated-cache name="sso">
<locking isolation="REPEATABLE_READ"/>
Expand Down Expand Up @@ -810,7 +810,7 @@
<subsystem xmlns="urn:jboss:domain:io:4.0" default-worker="default">
<worker name="default"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jaxrs:3.0"/>
<subsystem xmlns="urn:jboss:domain:jaxrs:4.0"/>
<subsystem xmlns="urn:jboss:domain:jca:6.0">
<archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
<bean-validation enabled="true"/>
Expand Down Expand Up @@ -1012,10 +1012,10 @@
</subsystem>
<subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
<subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
<subsystem xmlns="urn:jboss:domain:datasources:7.1">
<subsystem xmlns="urn:jboss:domain:datasources:7.2">
<datasources>
<datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true" statistics-enabled="${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=${wildfly.h2.compatibility.mode:REGULAR}</connection-url>
<driver>h2</driver>
<security user-name="sa" password="sa"/>
</datasource>
Expand Down Expand Up @@ -1269,7 +1269,7 @@
<subsystem xmlns="urn:jboss:domain:io:4.0" default-worker="default">
<worker name="default"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jaxrs:3.0"/>
<subsystem xmlns="urn:jboss:domain:jaxrs:4.0"/>
<subsystem xmlns="urn:jboss:domain:jca:6.0">
<archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
<bean-validation enabled="true"/>
Expand Down Expand Up @@ -1447,17 +1447,17 @@
</subsystem>
<subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
<subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
<subsystem xmlns="urn:jboss:domain:datasources:7.1">
<subsystem xmlns="urn:jboss:domain:datasources:7.2">
<datasources>
<datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true" statistics-enabled="${wildfly.datasources.statistics-enabled:${wildfly.statistics-enabled:false}}">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=${wildfly.h2.compatibility.mode:REGULAR}</connection-url>
<driver>h2</driver>
<security user-name="sa" password="sa"/>
</datasource>
<drivers>
<driver name="h2" module="com.h2database.h2">
<xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
</driver>
</driver>1
</drivers>
</datasources>
</subsystem>
Expand Down Expand Up @@ -1683,7 +1683,7 @@
<expiration interval="0"/>
</replicated-cache>
</cache-container>
<cache-container name="web" default-cache="dist" marshaller="PROTOSTREAM" modules="org.wildfly.clustering.web.infinispan">
<cache-container name="web" default-cache="dist" marshaller="PROTOSTREAM" modules="org.wildfly.clustering.session.infinispan.embedded">
<transport lock-timeout="60000"/>
<replicated-cache name="sso">
<locking isolation="REPEATABLE_READ"/>
Expand Down Expand Up @@ -1721,7 +1721,7 @@
<subsystem xmlns="urn:jboss:domain:io:4.0" default-worker="default">
<worker name="default"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jaxrs:3.0"/>
<subsystem xmlns="urn:jboss:domain:jaxrs:4.0"/>
<subsystem xmlns="urn:jboss:domain:jca:6.0">
<archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
<bean-validation enabled="true"/>
Expand Down Expand Up @@ -2300,6 +2300,7 @@
<excluded-extensions>
<extension module="org.wildfly.extension.clustering.ejb"/>
<extension module="org.wildfly.extension.elytron-oidc-client"/>
<extension module="org.wildfly.extension.jakarta.data"/>
<extension module="org.wildfly.extension.opentelemetry"/>
<extension module="org.wildfly.extension.micrometer"/>
<extension module="org.wildfly.extension.microprofile.lra-participant"/>
Expand All @@ -2313,6 +2314,7 @@
<excluded-extensions>
<extension module="org.wildfly.extension.clustering.ejb"/>
<extension module="org.wildfly.extension.elytron-oidc-client"/>
<extension module="org.wildfly.extension.jakarta.data"/>
<extension module="org.wildfly.extension.opentelemetry"/>
<extension module="org.wildfly.extension.micrometer"/>
<extension module="org.wildfly.extension.microprofile.lra-participant"/>
Expand All @@ -2325,6 +2327,7 @@
<host-release id="WildFly25.0"/>
<excluded-extensions>
<extension module="org.wildfly.extension.clustering.ejb"/>
<extension module="org.wildfly.extension.jakarta.data"/>
<extension module="org.wildfly.extension.micrometer"/>
<extension module="org.wildfly.extension.microprofile.lra-participant"/>
<extension module="org.wildfly.extension.microprofile.lra-coordinator"/>
Expand All @@ -2336,6 +2339,7 @@
<host-release id="WildFly26.0"/>
<excluded-extensions>
<extension module="org.wildfly.extension.clustering.ejb"/>
<extension module="org.wildfly.extension.jakarta.data"/>
<extension module="org.wildfly.extension.micrometer"/>
<extension module="org.wildfly.extension.microprofile.lra-participant"/>
<extension module="org.wildfly.extension.microprofile.lra-coordinator"/>
Expand All @@ -2346,6 +2350,7 @@
<host-exclude name="WildFly27.0">
<host-release id="WildFly27.0"/>
<excluded-extensions>
<extension module="org.wildfly.extension.jakarta.data"/>
<extension module="org.wildfly.extension.micrometer"/>
<extension module="org.wildfly.extension.microprofile.lra-participant"/>
<extension module="org.wildfly.extension.microprofile.lra-coordinator"/>
Expand All @@ -2356,26 +2361,48 @@
<host-exclude name="WildFly28.0">
<host-release id="WildFly28.0"/>
<excluded-extensions>
<extension module="org.wildfly.extension.jakarta.data"/>
<extension module="org.wildfly.extension.mvc-krazo"/>
</excluded-extensions>
</host-exclude>
<host-exclude name="WildFly29.0">
<host-release id="WildFly29.0"/>
<excluded-extensions>
<extension module="org.wildfly.extension.jakarta.data"/>
<extension module="org.wildfly.extension.mvc-krazo"/>
</excluded-extensions>
</host-exclude>
<host-exclude name="WildFly30.0">
<host-release id="WildFly30.0"/>
<excluded-extensions>
<extension module="org.wildfly.extension.jakarta.data"/>
<extension module="org.wildfly.extension.mvc-krazo"/>
</excluded-extensions>
</host-exclude>
<host-exclude name="WildFly31.0">
<host-release id="WildFly31.0"/>
<excluded-extensions>
<extension module="org.wildfly.extension.jakarta.data"/>
<extension module="org.wildfly.extension.mvc-krazo"/>
</excluded-extensions>
</host-exclude>
<host-exclude name="WildFly32.0">
<host-release id="WildFly32.0"/>
<excluded-extensions>
<extension module="org.wildfly.extension.jakarta.data"/>
</excluded-extensions>
</host-exclude>
<host-exclude name="WildFly33.0">
<host-release id="WildFly33.0"/>
<excluded-extensions>
<extension module="org.wildfly.extension.jakarta.data"/>
</excluded-extensions>
</host-exclude>
<host-exclude name="WildFly34.0">
<host-api-version major-version="27" minor-version="0"/>
<excluded-extensions>
<extension module="org.wildfly.extension.jakarta.data"/>
</excluded-extensions>
</host-exclude>
</host-excludes>
</domain>
2 changes: 1 addition & 1 deletion qa/wildfly-runtime/src/main/wildfly/domain/configuration/host.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<host xmlns="urn:jboss:domain:20.0" name="primary">
<host xmlns="urn:jboss:domain:community:20.0" name="primary">
<extensions>
<extension module="org.jboss.as.jmx"/>
<extension module="org.wildfly.extension.core-management"/>
Expand Down
6 changes: 3 additions & 3 deletions qa/wildfly-runtime/src/main/wildfly/standalone/configuration/standalone.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<server xmlns="urn:jboss:domain:20.0">
<server xmlns="urn:jboss:domain:community:20.0">
<extensions>
<extension module="org.jboss.as.clustering.infinispan"/>
<extension module="org.jboss.as.connector"/>
Expand Down Expand Up @@ -129,7 +129,7 @@
</subsystem>
<subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
<subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
<subsystem xmlns="urn:jboss:domain:datasources:7.1">
<subsystem xmlns="urn:jboss:domain:datasources:7.2">
<datasources>
<drivers>
<!-- all drivers needed in QA are listed here -->
Expand Down Expand Up @@ -400,7 +400,7 @@
<subsystem xmlns="urn:jboss:domain:io:4.0" default-worker="default">
<worker name="default"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jaxrs:3.0"/>
<subsystem xmlns="urn:jboss:domain:jaxrs:4.0"/>
<subsystem xmlns="urn:jboss:domain:jca:6.0">
<archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
<bean-validation enabled="true"/>
Expand Down

0 comments on commit a6126f2

Please sign in to comment.