diff --git a/.github/workflows/project_ci.yml b/.github/workflows/project_ci.yml index 7e7521e60d..91ecf37ac5 100644 --- a/.github/workflows/project_ci.yml +++ b/.github/workflows/project_ci.yml @@ -44,7 +44,7 @@ jobs: WildFly-build: uses: wildfly/wildfly/.github/workflows/shared-wildfly-build.yml@main with: - wildfly-branch: ${{ github.base_ref }} + wildfly-branch: main wildfly-repo: "wildfly/wildfly" Test-build-with-deps-matrix: diff --git a/.github/workflows/quickstart_ci.yml b/.github/workflows/quickstart_ci.yml index 59e164d708..64b6aabd77 100644 --- a/.github/workflows/quickstart_ci.yml +++ b/.github/workflows/quickstart_ci.yml @@ -162,7 +162,7 @@ jobs: WildFly-build: uses: wildfly/wildfly/.github/workflows/shared-wildfly-build.yml@main with: - wildfly-branch: ${{ github.base_ref }} + wildfly-branch: main wildfly-repo: "wildfly/wildfly" Test-build-with-deps-matrix: diff --git a/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml b/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml index 1a0c60066d..f5fd27f390 100644 --- a/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml +++ b/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml @@ -132,7 +132,7 @@ jobs: WildFly-build: uses: wildfly/wildfly/.github/workflows/shared-wildfly-build.yml@main with: - wildfly-branch: ${{ github.base_ref }} + wildfly-branch: main wildfly-repo: "wildfly/wildfly" Test-build-with-deps-matrix: diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml index 99d48ed769..42a80f1e7c 100644 --- a/batch-processing/pom.xml +++ b/batch-processing/pom.xml @@ -50,6 +50,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -205,12 +206,18 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - h2-database:default - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + + batch-jberet + cloud-server + h2-default-datasource + jsf + @@ -231,13 +238,21 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - - h2-database:default - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + + batch-jberet + cloud-server + h2-default-datasource + jsf + diff --git a/bmt/pom.xml b/bmt/pom.xml index 59ed17f51b..ff0e9ffed5 100644 --- a/bmt/pom.xml +++ b/bmt/pom.xml @@ -50,6 +50,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -146,13 +147,18 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - embedded-activemq - h2-database:default - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + ejb + embedded-activemq + h2-default-datasource + jsf + @@ -173,14 +179,21 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - - embedded-activemq - h2-database:default - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + ejb + embedded-activemq + h2-default-datasource + jsf + diff --git a/cmt/pom.xml b/cmt/pom.xml index a8252feca2..3aa7fbda04 100644 --- a/cmt/pom.xml +++ b/cmt/pom.xml @@ -49,6 +49,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -150,13 +151,18 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - embedded-activemq - h2-database:default - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + ejb + embedded-activemq + h2-default-datasource + jsf + @@ -177,14 +183,21 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - - embedded-activemq - h2-database:default - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + ejb + embedded-activemq + h2-default-datasource + jsf + diff --git a/ee-security/pom.xml b/ee-security/pom.xml index 5ca820c7bc..6298860589 100644 --- a/ee-security/pom.xml +++ b/ee-security/pom.xml @@ -50,6 +50,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -130,9 +131,14 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + @@ -162,10 +168,17 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + diff --git a/ejb-multi-server/pom.xml b/ejb-multi-server/pom.xml index 66e2d3d68f..575a275393 100644 --- a/ejb-multi-server/pom.xml +++ b/ejb-multi-server/pom.xml @@ -52,6 +52,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 diff --git a/ejb-remote/pom.xml b/ejb-remote/pom.xml index a24f2100a9..d19a2a61ff 100644 --- a/ejb-remote/pom.xml +++ b/ejb-remote/pom.xml @@ -49,6 +49,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -119,12 +120,15 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - wildfly-cli - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + ejb + @@ -145,13 +149,18 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - wildfly-cli - - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + ejb + diff --git a/ejb-security-context-propagation/pom.xml b/ejb-security-context-propagation/pom.xml index aeac8a29cc..abaeef072d 100644 --- a/ejb-security-context-propagation/pom.xml +++ b/ejb-security-context-propagation/pom.xml @@ -49,6 +49,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -140,16 +141,16 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - wildfly-cli - - - - * - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + + cloud-server + ejb + diff --git a/ejb-security-programmatic-auth/pom.xml b/ejb-security-programmatic-auth/pom.xml index ff225291d3..8826f8d54a 100644 --- a/ejb-security-programmatic-auth/pom.xml +++ b/ejb-security-programmatic-auth/pom.xml @@ -49,6 +49,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -164,21 +165,16 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - false - - - * - - - wildfly-cli - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + + cloud-server + ejb + diff --git a/ejb-throws-exception/ear/pom.xml b/ejb-throws-exception/ear/pom.xml index fdd08f4724..e36e9bc7cd 100644 --- a/ejb-throws-exception/ear/pom.xml +++ b/ejb-throws-exception/ear/pom.xml @@ -97,9 +97,16 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + ejb + jsf + ROOT.ear diff --git a/ejb-throws-exception/pom.xml b/ejb-throws-exception/pom.xml index 8e009f1216..b7f63ffcd7 100644 --- a/ejb-throws-exception/pom.xml +++ b/ejb-throws-exception/pom.xml @@ -56,6 +56,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 diff --git a/ejb-timer/pom.xml b/ejb-timer/pom.xml index 3d698960c3..7ad127d29a 100644 --- a/ejb-timer/pom.xml +++ b/ejb-timer/pom.xml @@ -49,6 +49,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -132,9 +133,15 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + ejb + @@ -155,10 +162,18 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + ejb + diff --git a/ejb-txn-remote-call/client/pom.xml b/ejb-txn-remote-call/client/pom.xml index 582d2505e0..97177ff7f8 100644 --- a/ejb-txn-remote-call/client/pom.xml +++ b/ejb-txn-remote-call/client/pom.xml @@ -42,6 +42,8 @@ 34.0.0.Final ${version.server} + 7.0.2.Final + 9.0.0.Final 5.1.0.Alpha1 42.7.0 @@ -233,14 +235,21 @@ package - - ${version.server} - - false - - postgresql - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly:wildfly-datasources-galleon-pack:${version.pack.datasources} + + + + ee-core-profile-server + jpa + ejb + jaxrs + postgresql-datasource + @@ -284,15 +293,24 @@ package - - ${version.server} - - false - cloud - - postgresql - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + org.wildfly:wildfly-datasources-galleon-pack:${version.pack.datasources} + + + + ee-core-profile-server + jpa + ejb + jaxrs + postgresql-datasource + diff --git a/ejb-txn-remote-call/server/pom.xml b/ejb-txn-remote-call/server/pom.xml index 7a14a937c2..1330bd7eaf 100644 --- a/ejb-txn-remote-call/server/pom.xml +++ b/ejb-txn-remote-call/server/pom.xml @@ -40,6 +40,8 @@ 34.0.0.Final ${version.server} + 7.0.2.Final + 9.0.0.Final 5.1.0.Alpha1 7.0.0.Final @@ -216,17 +218,26 @@ package - true - - ${version.server} - - postgresql - wildfly-cli - - - false - ha - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly:wildfly-datasources-galleon-pack:${version.pack.datasources} + + + + ee-core-profile-server + jaxrs + ejb + postgresql-datasource + core-tools + ejb-dist-cache + jpa-distributed + + + ejb-local-cache + @@ -249,16 +260,29 @@ package - - ${version.server} - - postgresql - - cloud - - false - ha - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + org.wildfly:wildfly-datasources-galleon-pack:${version.pack.datasources} + + + + ee-core-profile-server + jaxrs + ejb + postgresql-datasource + core-tools + ejb-dist-cache + jpa-distributed + + + ejb-local-cache + diff --git a/ha-singleton-deployment/pom.xml b/ha-singleton-deployment/pom.xml index 180cdedaee..a99eee67a4 100644 --- a/ha-singleton-deployment/pom.xml +++ b/ha-singleton-deployment/pom.xml @@ -56,6 +56,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 5.10.0 diff --git a/ha-singleton-service/pom.xml b/ha-singleton-service/pom.xml index 69f8be11f8..689ca0672d 100644 --- a/ha-singleton-service/pom.xml +++ b/ha-singleton-service/pom.xml @@ -51,6 +51,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 5.10.0 diff --git a/helloworld-mdb/pom.xml b/helloworld-mdb/pom.xml index e8eea5e2f7..3d51e68432 100644 --- a/helloworld-mdb/pom.xml +++ b/helloworld-mdb/pom.xml @@ -49,7 +49,8 @@ 34.0.0.Final - ${version.server} + ${version.server} + 7.0.2.Final 5.1.0.Alpha1 5.10.0 @@ -135,12 +136,16 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - embedded-activemq - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + ejb + embedded-activemq + @@ -161,13 +166,19 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - - embedded-activemq - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + ejb + embedded-activemq + diff --git a/helloworld-mutual-ssl-secured/pom.xml b/helloworld-mutual-ssl-secured/pom.xml index 3c61696a8c..9a33098e7d 100644 --- a/helloworld-mutual-ssl-secured/pom.xml +++ b/helloworld-mutual-ssl-secured/pom.xml @@ -50,6 +50,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 diff --git a/helloworld-mutual-ssl/pom.xml b/helloworld-mutual-ssl/pom.xml index ecfc7b0c72..b71c9b3a8b 100644 --- a/helloworld-mutual-ssl/pom.xml +++ b/helloworld-mutual-ssl/pom.xml @@ -37,6 +37,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 diff --git a/helloworld-rs/pom.xml b/helloworld-rs/pom.xml index 05d3e21ffe..f3a97f79cf 100644 --- a/helloworld-rs/pom.xml +++ b/helloworld-rs/pom.xml @@ -37,6 +37,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.0.0.Final @@ -119,9 +120,15 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + jaxrs + @@ -142,10 +149,18 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + jaxrs + diff --git a/helloworld-singleton/pom.xml b/helloworld-singleton/pom.xml index cdbcd8f674..e32aa613cf 100644 --- a/helloworld-singleton/pom.xml +++ b/helloworld-singleton/pom.xml @@ -50,6 +50,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 5.9.1 @@ -118,9 +119,16 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + ejb + jsf + @@ -141,10 +149,19 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + ejb + jsf + diff --git a/helloworld-ws/pom.xml b/helloworld-ws/pom.xml index 14b69ea4fc..2569c44e70 100644 --- a/helloworld-ws/pom.xml +++ b/helloworld-ws/pom.xml @@ -49,6 +49,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -137,9 +138,15 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + webservices + @@ -160,10 +167,18 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + webservices + diff --git a/helloworld/pom.xml b/helloworld/pom.xml index ba8be34852..35eb38b074 100644 --- a/helloworld/pom.xml +++ b/helloworld/pom.xml @@ -49,6 +49,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -107,9 +108,14 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + @@ -133,9 +139,14 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + true @@ -157,10 +168,17 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + diff --git a/hibernate/pom.xml b/hibernate/pom.xml index f5a591d813..1d73614f43 100644 --- a/hibernate/pom.xml +++ b/hibernate/pom.xml @@ -50,6 +50,8 @@ 34.0.0.Final ${version.server} + 7.0.2.Final + 9.0.0.Final 5.1.0.Alpha1 5.9.1 @@ -171,14 +173,19 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - false - - h2-database - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly:wildfly-datasources-galleon-pack:${version.pack.datasources} + + + + cloud-server + h2-datasource + jsf + @@ -208,15 +215,22 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - - false - - h2-database - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + org.wildfly:wildfly-datasources-galleon-pack:${version.pack.datasources} + + + + cloud-server + h2-datasource + jsf + diff --git a/http-custom-mechanism/pom.xml b/http-custom-mechanism/pom.xml index 02a52ebd4d..0f690a41ff 100644 --- a/http-custom-mechanism/pom.xml +++ b/http-custom-mechanism/pom.xml @@ -55,6 +55,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 diff --git a/http-custom-mechanism/webapp/pom.xml b/http-custom-mechanism/webapp/pom.xml index 9022b2a624..064a95d269 100644 --- a/http-custom-mechanism/webapp/pom.xml +++ b/http-custom-mechanism/webapp/pom.xml @@ -79,12 +79,14 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - wildfly-cli - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index f93a22dde5..0088e11bb9 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -50,6 +50,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 9.37.1 @@ -171,9 +172,14 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + @@ -194,10 +200,17 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + diff --git a/jaxrs-jwt/pom.xml b/jaxrs-jwt/pom.xml index e8092ef897..09c10b8a68 100644 --- a/jaxrs-jwt/pom.xml +++ b/jaxrs-jwt/pom.xml @@ -49,6 +49,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 9.37.1 @@ -170,9 +171,14 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + @@ -203,10 +209,17 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + diff --git a/jaxws-ejb/pom.xml b/jaxws-ejb/pom.xml index 968dc0d563..971945d4fd 100644 --- a/jaxws-ejb/pom.xml +++ b/jaxws-ejb/pom.xml @@ -49,6 +49,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -146,9 +147,16 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + ejb + webservices + @@ -169,10 +177,19 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + ejb + webservices + diff --git a/jaxws-retail/pom.xml b/jaxws-retail/pom.xml index 291ccd3c99..595ea3d35d 100644 --- a/jaxws-retail/pom.xml +++ b/jaxws-retail/pom.xml @@ -48,6 +48,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 1.3.0.Final @@ -174,9 +175,16 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + ejb + webservices + @@ -197,10 +205,19 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + ejb + webservices + diff --git a/jsonp/pom.xml b/jsonp/pom.xml index 647a5ea809..536cea7c68 100644 --- a/jsonp/pom.xml +++ b/jsonp/pom.xml @@ -49,6 +49,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -159,9 +160,15 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + jsf + @@ -182,10 +189,18 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + jsf + diff --git a/jts/pom.xml b/jts/pom.xml index f2bb1a263b..2a9cb8dc93 100644 --- a/jts/pom.xml +++ b/jts/pom.xml @@ -57,6 +57,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 diff --git a/kitchensink/pom.xml b/kitchensink/pom.xml index 1d22a7e220..8d9c6c1560 100644 --- a/kitchensink/pom.xml +++ b/kitchensink/pom.xml @@ -49,6 +49,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -225,9 +226,17 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + h2-driver + ejb + jsf + @@ -248,10 +257,20 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + h2-driver + ejb + jsf + diff --git a/logging/pom.xml b/logging/pom.xml index 8bf9e4e224..c02d036e26 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -49,6 +49,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 5.10.1 @@ -174,10 +175,14 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + @@ -210,10 +215,17 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + diff --git a/mail/pom.xml b/mail/pom.xml index 7a8c94e732..a78af460f4 100644 --- a/mail/pom.xml +++ b/mail/pom.xml @@ -50,6 +50,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 4.15.0 @@ -153,9 +154,17 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + core-tools + core-server + mail + jsf + diff --git a/messaging-clustering-singleton/pom.xml b/messaging-clustering-singleton/pom.xml index 37e86540f8..910bfc2325 100644 --- a/messaging-clustering-singleton/pom.xml +++ b/messaging-clustering-singleton/pom.xml @@ -49,6 +49,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 5.10.0 diff --git a/micrometer/pom.xml b/micrometer/pom.xml index 6e7ebc23b8..508133a708 100644 --- a/micrometer/pom.xml +++ b/micrometer/pom.xml @@ -28,6 +28,7 @@ ${version.server} ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -131,13 +132,16 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - - micrometer - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cdi + jaxrs-server + micrometer + @@ -171,13 +175,16 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - - micrometer - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cdi + cloud-server + micrometer + true @@ -207,14 +214,19 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - - - micrometer - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cdi + cloud-server + micrometer + diff --git a/microprofile-config/pom.xml b/microprofile-config/pom.xml index 9b1bf5ad52..cf88e31008 100644 --- a/microprofile-config/pom.xml +++ b/microprofile-config/pom.xml @@ -26,6 +26,7 @@ ${version.server} ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -127,9 +128,15 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + microprofile-config + true @@ -151,10 +158,18 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + microprofile-config + diff --git a/microprofile-fault-tolerance/pom.xml b/microprofile-fault-tolerance/pom.xml index 9ad8294ab4..07dd58bc0a 100644 --- a/microprofile-fault-tolerance/pom.xml +++ b/microprofile-fault-tolerance/pom.xml @@ -59,6 +59,7 @@ ${version.server} ${version.server} + 7.0.2.Final 5.1.0.Alpha1 4.3.1 @@ -171,9 +172,15 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + microprofile-fault-tolerance + true @@ -195,10 +202,18 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + microprofile-fault-tolerance + diff --git a/microprofile-health/pom.xml b/microprofile-health/pom.xml index e515fcf70f..99a9749e3f 100644 --- a/microprofile-health/pom.xml +++ b/microprofile-health/pom.xml @@ -25,6 +25,7 @@ ${version.server} ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -131,9 +132,15 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + microprofile-health + true @@ -155,10 +162,18 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + microprofile-health + diff --git a/microprofile-jwt/pom.xml b/microprofile-jwt/pom.xml index 4fcdc7fc23..567de8ccdc 100644 --- a/microprofile-jwt/pom.xml +++ b/microprofile-jwt/pom.xml @@ -50,6 +50,7 @@ ${version.server} ${version.server} + 7.0.2.Final 5.1.0.Alpha1 9.24.4.redhat-00001 @@ -188,9 +189,15 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + microprofile-jwt + true @@ -213,10 +220,18 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + microprofile-jwt + diff --git a/microprofile-lra/pom.xml b/microprofile-lra/pom.xml index 031c9352a4..5e0f3568b7 100644 --- a/microprofile-lra/pom.xml +++ b/microprofile-lra/pom.xml @@ -25,6 +25,7 @@ ${version.server} ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -137,12 +138,16 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - lra-coordinator - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + microprofile-lra-coordinator + microprofile-lra-participant + true @@ -164,13 +169,19 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - - lra-coordinator - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + microprofile-lra-coordinator + microprofile-lra-participant + diff --git a/microprofile-openapi/pom.xml b/microprofile-openapi/pom.xml index fb83240901..3adb2dc8c1 100644 --- a/microprofile-openapi/pom.xml +++ b/microprofile-openapi/pom.xml @@ -27,6 +27,7 @@ ${version.server} ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -95,12 +96,15 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - openapi - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + microprofile-openapi + true @@ -122,13 +126,18 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - - openapi - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + microprofile-openapi + diff --git a/microprofile-reactive-messaging-kafka/pom.xml b/microprofile-reactive-messaging-kafka/pom.xml index de28653588..87ebd420a1 100644 --- a/microprofile-reactive-messaging-kafka/pom.xml +++ b/microprofile-reactive-messaging-kafka/pom.xml @@ -42,6 +42,7 @@ ${version.server} ${version.server} + 7.0.2.Final 5.1.0.Alpha1 3.0.0 @@ -225,9 +226,16 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + h2-default-datasource + microprofile-reactive-messaging-kafka + true @@ -250,10 +258,19 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + h2-default-datasource + microprofile-reactive-messaging-kafka + diff --git a/microprofile-rest-client/pom.xml b/microprofile-rest-client/pom.xml index 875a3d858b..d792459644 100644 --- a/microprofile-rest-client/pom.xml +++ b/microprofile-rest-client/pom.xml @@ -48,6 +48,7 @@ ${version.server} ${version.server} + 7.0.2.Final 5.1.0.Alpha1 6.2.6.Final @@ -203,9 +204,15 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + microprofile-platform + true @@ -228,10 +235,18 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + microprofile-platform + diff --git a/numberguess/pom.xml b/numberguess/pom.xml index 8b5e8a2336..9b500c0be6 100644 --- a/numberguess/pom.xml +++ b/numberguess/pom.xml @@ -49,6 +49,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -123,9 +124,15 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + jsf + @@ -146,10 +153,18 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + jsf + diff --git a/opentelemetry-tracing/pom.xml b/opentelemetry-tracing/pom.xml index d2d2863160..e445ee2c1f 100644 --- a/opentelemetry-tracing/pom.xml +++ b/opentelemetry-tracing/pom.xml @@ -26,6 +26,7 @@ ${version.server} ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -131,9 +132,16 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cdi + cloud-server + opentelemetry + @@ -165,9 +173,16 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cdi + cloud-server + opentelemetry + true @@ -197,10 +212,19 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cdi + cloud-server + opentelemetry + diff --git a/remote-helloworld-mdb/pom.xml b/remote-helloworld-mdb/pom.xml index e8866c80ad..26ebf267ce 100644 --- a/remote-helloworld-mdb/pom.xml +++ b/remote-helloworld-mdb/pom.xml @@ -50,6 +50,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 5.10.0 @@ -136,12 +137,17 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - remote-activemq - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + + cloud-server + ejb + remote-activemq + @@ -162,13 +168,20 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - - remote-activemq - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + + cloud-server + ejb + remote-activemq + diff --git a/security-domain-to-domain/pom.xml b/security-domain-to-domain/pom.xml index 6ba4be73f8..f11c799cfa 100644 --- a/security-domain-to-domain/pom.xml +++ b/security-domain-to-domain/pom.xml @@ -57,6 +57,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 diff --git a/servlet-async/pom.xml b/servlet-async/pom.xml index d8d34bd57c..1936df6944 100644 --- a/servlet-async/pom.xml +++ b/servlet-async/pom.xml @@ -50,6 +50,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 5.9.1 @@ -134,9 +135,14 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + @@ -157,10 +163,17 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + diff --git a/servlet-filterlistener/pom.xml b/servlet-filterlistener/pom.xml index 5950ccd581..21c5cab7d9 100644 --- a/servlet-filterlistener/pom.xml +++ b/servlet-filterlistener/pom.xml @@ -50,6 +50,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 5.9.1 @@ -134,9 +135,14 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + @@ -157,10 +163,17 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + diff --git a/servlet-security/pom.xml b/servlet-security/pom.xml index 742de2a708..294e32ba3f 100644 --- a/servlet-security/pom.xml +++ b/servlet-security/pom.xml @@ -50,6 +50,8 @@ 34.0.0.Final ${version.server} + 7.0.2.Final + 9.0.0.Final 5.1.0.Alpha1 5.9.1 @@ -133,14 +135,18 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - false - - h2-database - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly:wildfly-datasources-galleon-pack:${version.pack.datasources} + + + + cloud-server + h2-datasource + @@ -170,15 +176,21 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - false - - h2-database - - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + org.wildfly:wildfly-datasources-galleon-pack:${version.pack.datasources} + + + + cloud-server + h2-datasource + diff --git a/spring-resteasy/pom.xml b/spring-resteasy/pom.xml index 03866e29b5..488d3f0948 100644 --- a/spring-resteasy/pom.xml +++ b/spring-resteasy/pom.xml @@ -50,6 +50,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 6.0.4 @@ -146,13 +147,11 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - - * - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + @@ -173,14 +172,14 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - - - * - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + diff --git a/tasks-jsf/pom.xml b/tasks-jsf/pom.xml index 55ba20f9ae..e09a36f8a7 100644 --- a/tasks-jsf/pom.xml +++ b/tasks-jsf/pom.xml @@ -50,8 +50,8 @@ 34.0.0.Final ${version.server} - 7.0.0.Final - 8.0.0.Final + 7.0.2.Final + 9.0.0.Final 5.1.0.Alpha1 5.9.1 diff --git a/temperature-converter/pom.xml b/temperature-converter/pom.xml index 6f42419093..71dfdd3a3f 100644 --- a/temperature-converter/pom.xml +++ b/temperature-converter/pom.xml @@ -50,6 +50,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -140,9 +141,16 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + ejb + jsf + @@ -163,10 +171,19 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + ejb + jsf + diff --git a/thread-racing/pom.xml b/thread-racing/pom.xml index 5c97ba9d13..004f9f6367 100644 --- a/thread-racing/pom.xml +++ b/thread-racing/pom.xml @@ -50,6 +50,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -189,13 +190,18 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - embedded-activemq - h2-database:default - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + ejb + batch-jberet + embedded-activemq + h2-default-datasource + @@ -216,14 +222,21 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - - embedded-activemq - h2-database:default - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + ejb + batch-jberet + embedded-activemq + h2-default-datasource + diff --git a/todo-backend/pom.xml b/todo-backend/pom.xml index af0c5adede..5fd128a28a 100644 --- a/todo-backend/pom.xml +++ b/todo-backend/pom.xml @@ -50,6 +50,8 @@ 34.0.0.Final ${version.server} + 7.0.2.Final + 9.0.0.Final 5.1.0.Alpha1 @@ -146,12 +148,18 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - - postgresql - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly:wildfly-datasources-galleon-pack:${version.pack.datasources} + + + + cloud-server + postgresql-datasource + @@ -181,13 +189,21 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - - postgresql - - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + org.wildfly:wildfly-datasources-galleon-pack:${version.pack.datasources} + + + + cloud-server + postgresql-datasource + diff --git a/websocket-endpoint/pom.xml b/websocket-endpoint/pom.xml index b6ba504a60..ff9f15c3be 100644 --- a/websocket-endpoint/pom.xml +++ b/websocket-endpoint/pom.xml @@ -50,6 +50,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 5.9.1 @@ -160,9 +161,14 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + @@ -183,10 +189,17 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server + diff --git a/websocket-hello/pom.xml b/websocket-hello/pom.xml index 0eb101cc24..87fc0ae464 100644 --- a/websocket-hello/pom.xml +++ b/websocket-hello/pom.xml @@ -50,6 +50,7 @@ 34.0.0.Final ${version.server} + 7.0.2.Final 5.1.0.Alpha1 @@ -111,9 +112,14 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + cloud-server + @@ -134,10 +140,17 @@ org.wildfly.plugins wildfly-maven-plugin - - ${version.server} - cloud - + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} + + + + cloud-server +