From ca07b58d7b603ad3a32b8ab58fc104510417a9b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Ant=C3=B4nio=20Siqueira?= Date: Fri, 20 Aug 2021 10:50:27 -0300 Subject: [PATCH] JBPM-9659: Upgrade deployments to WildFly 23 (#3757) * jul-22-save-1 (#1) * empty * Prepare to add banned dependencies on kie-parent (#2) * empty * Remove remaining Java EE 8 spec JARs (#3) * fixing webapp * Fixing JDBC URL after H2 update Co-authored-by: Tiago Bento <1584568+tiagobento@users.noreply.github.com> --- drools-beliefs/pom.xml | 4 +-- drools-cdi/pom.xml | 21 ++---------- drools-compiler/pom.xml | 13 +++----- drools-core-dynamic/pom.xml | 13 +++----- drools-core/pom.xml | 17 ++++------ .../cdi-example-scopes/pom.xml | 27 +++++---------- .../cdi-example-with-inclusion/pom.xml | 21 ++---------- drools-examples-cdi/cdi-example/pom.xml | 21 ++---------- drools-legacy-test-util/pom.xml | 4 +-- drools-mvel/pom.xml | 13 +++----- .../drools-persistence-api/pom.xml | 4 +-- .../drools-persistence-jpa/pom.xml | 33 +++++-------------- .../test-compiler-integration/pom.xml | 13 +++----- .../test-integration-nomvel/pom.xml | 13 +++----- drools-traits/pom.xml | 4 +-- kie-dmn/kie-dmn-feel-gwt-showcase/pom.xml | 16 +++++---- kie-dmn/kie-dmn-feel-gwt/pom.xml | 4 +-- kie-dmn/kie-dmn-legacy-tests/pom.xml | 4 +-- kie-dmn/kie-dmn-model/pom.xml | 4 +-- kie-dmn/kie-dmn-openapi/pom.xml | 4 +-- .../kie-dmn-pmml-tests-legacy/pom.xml | 4 +-- .../kie-dmn-pmml-tests/pom.xml | 4 +-- kie-dmn/kie-dmn-validation/pom.xml | 4 +-- kie-pmml/pom.xml | 20 +++++------ kie-test-util/pom.xml | 8 ++--- .../org/kie/test/util/db/PersistenceUtil.java | 2 +- 26 files changed, 95 insertions(+), 200 deletions(-) diff --git a/drools-beliefs/pom.xml b/drools-beliefs/pom.xml index 12d9bbeaaa7..1c34bafefe0 100644 --- a/drools-beliefs/pom.xml +++ b/drools-beliefs/pom.xml @@ -67,8 +67,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api provided diff --git a/drools-cdi/pom.xml b/drools-cdi/pom.xml index 32e7b664b37..527f4c4fa74 100644 --- a/drools-cdi/pom.xml +++ b/drools-cdi/pom.xml @@ -98,32 +98,15 @@ - javax.enterprise - cdi-api + jakarta.enterprise + jakarta.enterprise.cdi-api provided - - - javax.el - javax.el-api - - - javax.interceptor - javax.interceptor-api - - org.jboss.weld.se weld-se-core test - - - - jakarta.enterprise - jakarta.enterprise.cdi-api - - diff --git a/drools-compiler/pom.xml b/drools-compiler/pom.xml index 16148bc79bf..9de18c0a1b4 100644 --- a/drools-compiler/pom.xml +++ b/drools-compiler/pom.xml @@ -104,18 +104,13 @@ provided - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api provided - javax.xml.stream - stax-api - provided - - - javax.activation - activation + jakarta.activation + jakarta.activation-api provided diff --git a/drools-core-dynamic/pom.xml b/drools-core-dynamic/pom.xml index 67a24d2fd94..47debb57d4d 100755 --- a/drools-core-dynamic/pom.xml +++ b/drools-core-dynamic/pom.xml @@ -35,18 +35,13 @@ provided - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api provided - javax.xml.stream - stax-api - provided - - - javax.activation - activation + jakarta.activation + jakarta.activation-api provided diff --git a/drools-core/pom.xml b/drools-core/pom.xml index b657469940e..3925d000ef0 100644 --- a/drools-core/pom.xml +++ b/drools-core/pom.xml @@ -93,24 +93,19 @@ provided - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api provided - javax.xml.stream - stax-api - provided - - - javax.activation - activation + jakarta.activation + jakarta.activation-api provided - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api provided diff --git a/drools-examples-cdi/cdi-example-scopes/pom.xml b/drools-examples-cdi/cdi-example-scopes/pom.xml index a5a4c79cb14..fd695febc3a 100644 --- a/drools-examples-cdi/cdi-example-scopes/pom.xml +++ b/drools-examples-cdi/cdi-example-scopes/pom.xml @@ -36,29 +36,12 @@ drools-core - javax.enterprise - cdi-api - - - javax.el - javax.el-api - - - javax.interceptor - javax.interceptor-api - - + jakarta.enterprise + jakarta.enterprise.cdi-api org.jboss.weld.se weld-se-core - - - - jakarta.enterprise - jakarta.enterprise.cdi-api - - org.drools @@ -99,6 +82,12 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-impl-maven test + + + javax.inject + javax.inject + + diff --git a/drools-examples-cdi/cdi-example-with-inclusion/pom.xml b/drools-examples-cdi/cdi-example-with-inclusion/pom.xml index 58d79b97ca2..e80c3f68db0 100644 --- a/drools-examples-cdi/cdi-example-with-inclusion/pom.xml +++ b/drools-examples-cdi/cdi-example-with-inclusion/pom.xml @@ -26,29 +26,12 @@ drools-cdi - javax.enterprise - cdi-api - - - javax.el - javax.el-api - - - javax.interceptor - javax.interceptor-api - - + jakarta.enterprise + jakarta.enterprise.cdi-api org.jboss.weld.se weld-se-core - - - - jakarta.enterprise - jakarta.enterprise.cdi-api - - org.drools diff --git a/drools-examples-cdi/cdi-example/pom.xml b/drools-examples-cdi/cdi-example/pom.xml index d2cde9b35f4..520155c56ad 100644 --- a/drools-examples-cdi/cdi-example/pom.xml +++ b/drools-examples-cdi/cdi-example/pom.xml @@ -26,29 +26,12 @@ drools-cdi - javax.enterprise - cdi-api - - - javax.el - javax.el-api - - - javax.interceptor - javax.interceptor-api - - + jakarta.enterprise + jakarta.enterprise.cdi-api org.jboss.weld.se weld-se-core - - - - jakarta.enterprise - jakarta.enterprise.cdi-api - - org.kie diff --git a/drools-legacy-test-util/pom.xml b/drools-legacy-test-util/pom.xml index f46fa73d9ae..6b07292725e 100644 --- a/drools-legacy-test-util/pom.xml +++ b/drools-legacy-test-util/pom.xml @@ -47,8 +47,8 @@ drools-mvel - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api provided diff --git a/drools-mvel/pom.xml b/drools-mvel/pom.xml index aadf093eca5..4fdd193bac4 100644 --- a/drools-mvel/pom.xml +++ b/drools-mvel/pom.xml @@ -99,18 +99,13 @@ provided - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api provided - javax.xml.stream - stax-api - provided - - - javax.activation - activation + jakarta.activation + jakarta.activation-api provided diff --git a/drools-persistence/drools-persistence-api/pom.xml b/drools-persistence/drools-persistence-api/pom.xml index a787f3ddc88..67f5c07eec3 100644 --- a/drools-persistence/drools-persistence-api/pom.xml +++ b/drools-persistence/drools-persistence-api/pom.xml @@ -62,8 +62,8 @@ protobuf-java - org.jboss.spec.javax.transaction - jboss-transaction-api_1.2_spec + jakarta.transaction + jakarta.transaction-api diff --git a/drools-persistence/drools-persistence-jpa/pom.xml b/drools-persistence/drools-persistence-jpa/pom.xml index eb531040c10..73261273b1c 100644 --- a/drools-persistence/drools-persistence-jpa/pom.xml +++ b/drools-persistence/drools-persistence-jpa/pom.xml @@ -143,8 +143,8 @@ provided - javax.persistence - javax.persistence-api + jakarta.persistence + jakarta.persistence-api com.google.protobuf @@ -155,13 +155,13 @@ javassist - org.jboss.spec.javax.transaction - jboss-transaction-api_1.2_spec + jakarta.transaction + jakarta.transaction-api - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api @@ -223,31 +223,14 @@ - javax.enterprise - cdi-api + jakarta.enterprise + jakarta.enterprise.cdi-api test - - - javax.el - javax.el-api - - - javax.interceptor - javax.interceptor-api - - org.jboss.weld.se weld-se-core test - - - - jakarta.enterprise - jakarta.enterprise.cdi-api - - org.assertj diff --git a/drools-test-coverage/test-compiler-integration/pom.xml b/drools-test-coverage/test-compiler-integration/pom.xml index 27bb24e5ada..90ea6f793ca 100644 --- a/drools-test-coverage/test-compiler-integration/pom.xml +++ b/drools-test-coverage/test-compiler-integration/pom.xml @@ -128,18 +128,13 @@ test - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api test - javax.xml.stream - stax-api - test - - - javax.activation - activation + jakarta.activation + jakarta.activation-api test diff --git a/drools-test-coverage/test-integration-nomvel/pom.xml b/drools-test-coverage/test-integration-nomvel/pom.xml index 3c63b03b755..845d82fecb1 100644 --- a/drools-test-coverage/test-integration-nomvel/pom.xml +++ b/drools-test-coverage/test-integration-nomvel/pom.xml @@ -102,18 +102,13 @@ test - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api test - javax.xml.stream - stax-api - test - - - javax.activation - activation + jakarta.activation + jakarta.activation-api test diff --git a/drools-traits/pom.xml b/drools-traits/pom.xml index 37f2c8c5597..5633ffd41c3 100644 --- a/drools-traits/pom.xml +++ b/drools-traits/pom.xml @@ -141,8 +141,8 @@ provided - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api provided diff --git a/kie-dmn/kie-dmn-feel-gwt-showcase/pom.xml b/kie-dmn/kie-dmn-feel-gwt-showcase/pom.xml index 5d315420b30..f2fc169385d 100644 --- a/kie-dmn/kie-dmn-feel-gwt-showcase/pom.xml +++ b/kie-dmn/kie-dmn-feel-gwt-showcase/pom.xml @@ -130,18 +130,18 @@ provided - org.jboss.spec.javax.ejb - jboss-ejb-api_3.2_spec + jakarta.ejb + jakarta.ejb-api provided - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api provided - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api provided @@ -165,6 +165,10 @@ validation-api provided + + jakarta.servlet + jakarta.servlet-api + diff --git a/kie-dmn/kie-dmn-feel-gwt/pom.xml b/kie-dmn/kie-dmn-feel-gwt/pom.xml index 9627039e9bc..c01b6874f4e 100644 --- a/kie-dmn/kie-dmn-feel-gwt/pom.xml +++ b/kie-dmn/kie-dmn-feel-gwt/pom.xml @@ -62,8 +62,8 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api test diff --git a/kie-dmn/kie-dmn-legacy-tests/pom.xml b/kie-dmn/kie-dmn-legacy-tests/pom.xml index 69a487e4e21..dcc4da088d5 100644 --- a/kie-dmn/kie-dmn-legacy-tests/pom.xml +++ b/kie-dmn/kie-dmn-legacy-tests/pom.xml @@ -100,8 +100,8 @@ provided - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api provided diff --git a/kie-dmn/kie-dmn-model/pom.xml b/kie-dmn/kie-dmn-model/pom.xml index d212352f809..21c4869a658 100644 --- a/kie-dmn/kie-dmn-model/pom.xml +++ b/kie-dmn/kie-dmn-model/pom.xml @@ -21,8 +21,8 @@ - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api provided diff --git a/kie-dmn/kie-dmn-openapi/pom.xml b/kie-dmn/kie-dmn-openapi/pom.xml index 6dc682f467b..e07b90c0799 100644 --- a/kie-dmn/kie-dmn-openapi/pom.xml +++ b/kie-dmn/kie-dmn-openapi/pom.xml @@ -67,8 +67,8 @@ provided - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api provided diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-legacy/pom.xml b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-legacy/pom.xml index bf1189a8852..e4ac1899dc7 100644 --- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-legacy/pom.xml +++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests-legacy/pom.xml @@ -73,8 +73,8 @@ provided - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api provided diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml index e670b11eedd..7557cb0c877 100644 --- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml +++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/pom.xml @@ -71,8 +71,8 @@ provided - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api provided diff --git a/kie-dmn/kie-dmn-validation/pom.xml b/kie-dmn/kie-dmn-validation/pom.xml index f70daee471c..f75c76cec46 100644 --- a/kie-dmn/kie-dmn-validation/pom.xml +++ b/kie-dmn/kie-dmn-validation/pom.xml @@ -101,8 +101,8 @@ provided - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api provided diff --git a/kie-pmml/pom.xml b/kie-pmml/pom.xml index d7770da004f..2ed0345286b 100644 --- a/kie-pmml/pom.xml +++ b/kie-pmml/pom.xml @@ -75,8 +75,8 @@ - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec + jakarta.xml.bind + jakarta.xml.bind-api com.sun.xml.bind @@ -87,8 +87,8 @@ jaxb-core - javax.activation - activation + jakarta.activation + jakarta.activation-api @@ -184,9 +184,9 @@ - com.sun.activation - javax.activation - 1.2.0 + jakarta.activation + jakarta.activation-api + 1.2.2 jar false ${project.basedir}/target/lib @@ -208,9 +208,9 @@ ${project.basedir}/target/lib - javax.xml.bind - jaxb-api - 2.3.1 + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.3 jar false ${project.basedir}/target/lib diff --git a/kie-test-util/pom.xml b/kie-test-util/pom.xml index 661c4db8195..7c4c0a276e8 100644 --- a/kie-test-util/pom.xml +++ b/kie-test-util/pom.xml @@ -32,13 +32,13 @@ - javax.persistence - javax.persistence-api + jakarta.persistence + jakarta.persistence-api true - org.jboss.spec.javax.transaction - jboss-transaction-api_1.2_spec + jakarta.transaction + jakarta.transaction-api org.jboss.narayana.jta diff --git a/kie-test-util/src/main/java/org/kie/test/util/db/PersistenceUtil.java b/kie-test-util/src/main/java/org/kie/test/util/db/PersistenceUtil.java index fc69a36185b..241cb09028a 100644 --- a/kie-test-util/src/main/java/org/kie/test/util/db/PersistenceUtil.java +++ b/kie-test-util/src/main/java/org/kie/test/util/db/PersistenceUtil.java @@ -148,7 +148,7 @@ public static PoolingDataSourceWrapper setupPoolingDataSource(Properties dsProps String jdbcUrl = dsProps.getProperty("url"); // fix an incomplete JDBC URL used by some tests if (jdbcUrl.startsWith("jdbc:h2:") && !jdbcUrl.contains("tcp://")) { - dsProps.put("url", jdbcUrl + "tcp://localhost/target/persistence-test"); + dsProps.put("url", jdbcUrl + "tcp://localhost/target/./persistence-test"); } h2Server.start(); }