diff --git a/build-parent/pom.xml b/build-parent/pom.xml index e6acb1c8572..b73c9c37679 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -54,28 +54,28 @@ - A version property must be specified in the format "version.{groupId}", optionally with a suffix to make it unique. - Version properties must be sorted alphabetically (other form of sorting were found to be unclear and ambiguous). --> - 1.2.13 - 1.16.0 + 1.4.12 + 1.16.1 3.2.2 1.1.1 - 2.13.0 - 1.10.0 - 2.15.2 - 2.15.2 - 2.15.2 + 2.15.1 + 1.11.0 + 2.16.1 + 2.16.1 + 2.16.1 4.31.0 3.7.4 1.0.1 - 3.22.0 + 3.25.0 2.2.220 1.0.86 - 2.3.0 + 4.0.4 1.4.20 0.18.0 - 4.7.4 - 1.11.1 - 3.2.10.Final - 3.4.0 + 4.7.5 + 1.12.2 + 3.8.4 + 3.10.0 8.5.11 4.13.1 1.8.0 @@ -83,27 +83,27 @@ 3.5.2 4.0.7 1.10.11 - 3.12.0 + 3.14.0 3.4.1 - 4.4.15 + 4.4.16 3.8.6 1.7.3 3.5.3 2.0.28 5.2.5 10.1.7 - 3.23.1 + 3.24.2 3.33.0 2.3.32 4.0.4 - 1.3 + 2.2 2.3.0 - 14.0.13.Final + 14.0.25.Final 3.26.0-GA - 6.0.1.Final + 7.0.1.Final 3.5.3.Final - 7.6.1.Final + 8.0.0.Final 3.1.6.Final 3.0.3 4.0.1 @@ -111,28 +111,21 @@ 2.1.2 2.0.1 2.1.1 - 3.2.6 - 2.3.6 - 2.0.0 2.0.1 - 3.1.0 - 4.0.1 3.1.0 - 6.0.0 - 4.0.0 + 4.0.1 3.0.0 1.1.5 - 2.1.2 + 2.1.3 4.0.0 1.6.4 - 5.9.3 + 5.10.2 2.5.1.Final 2.0.7 - 1.7.30 + 2.0.6 0.11.4.1 2.12.0.SP04 - 1.3 @@ -141,19 +134,16 @@ 4.10.1 3.13.0 - 4.15.0.Final - 1.1.0 1.6.2 - 2.0.6 - 2.0.6 + 2.2.19 + 2.1.19 1.0.55 - 2.8.2 + 2.9.1 - 2.0.1.Final 2.2.0 1.5.0 2.3.0-jaxb-1.0.6 - 4.11.0 + 5.2.0 1.21 @@ -198,17 +188,17 @@ 3.8.1 3.3.0 - 1.14.7 + 1.14.11 - 42.6.1 + 42.7.2 2.0.1 3.1.6 3.0.3 - 3.25.3 + 3.25.8 - 32.0.0-jre + 32.0.1-jre @@ -452,41 +442,16 @@ jakarta.annotation-api ${version.jakarta.annotation-api} - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - ${version.jakarta.servlet.jsp-api} - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - ${version.jakarta.servlet.jsp.jstl-api} - jakarta.transaction jakarta.transaction-api ${version.jakarta.transaction-api} - - jakarta.ws.rs - jakarta.ws.rs-api - ${version.jakarta.ws.rs-api} - - - jakarta.xml.ws - jakarta.xml.ws-api - ${version.jakarta.xml.ws-api} - jakarta.persistence jakarta.persistence-api ${version.jakarta.persistence-api} - - jakarta.servlet - jakarta.servlet-api - ${version.jakarta.servlet-api} - jakarta.xml.bind jakarta.xml.bind-api @@ -874,12 +839,6 @@ ${version.xerces} - - xmlunit - xmlunit - ${version.xmlunit} - - org.openjdk.jmh @@ -907,70 +866,6 @@ runtime - - - org.jboss.errai - errai-bus - ${version.org.jboss.errai} - - - com.google.inject - guice - - - - - org.jboss.errai - errai-ioc - ${version.org.jboss.errai} - - - com.google.inject - guice - - - - - org.jboss.errai - errai-tools - ${version.org.jboss.errai} - - - com.google.inject - guice - - - - - org.jboss.errai - errai-cdi-server - ${version.org.jboss.errai} - - - com.google.inject - guice - - - - - - com.google.elemental2 - elemental2-dom - ${version.com.google.elemental2} - - - - com.google.elemental2 - elemental2-core - ${version.com.google.elemental2} - - - - com.google.elemental2 - elemental2-promise - ${version.com.google.elemental2} - - io.swagger swagger-core @@ -1045,7 +940,7 @@ org.jboss - jboss-transaction-spi-jakarta + jboss-transaction-spi ${version.org.jboss.transaction.spi} @@ -1078,19 +973,6 @@ test - - - jakarta.validation - jakarta.validation-api - 3.0.2 - - - jakarta.validation - jakarta.validation-api - 3.0.2 - sources - - net.bytebuddy @@ -1399,22 +1281,6 @@ javax.activation.* - - - org.jboss.errai - errai-ioc - - javax.inject.Provider - - - - - org.jboss.errai - errai-javax-enterprise - - * - - io.quarkus @@ -1423,20 +1289,6 @@ * - - - - org.kie.server - kie-server-router-proxy - jar - - org.jboss.logging.* - org.jboss.threads.* - org.xnio.* - org.wildfly.* - org.apache.commons.* - - io.sundr @@ -1868,48 +1720,6 @@ org.apache.maven.plugins maven-shade-plugin - - - com.google.code.maven-replacer-plugin - replacer - 1.5.2 - - - **/*Constants_de.properties - **/*Constants_es_ES.properties - **/*Constants_fr_FR.properties - **/*Constants_ja_JP.properties - **/*Constants_pt_BR.properties - **/*Constants_zh_CN.properties - - - **/ErraiApp.properties - - - - '' - ' - - - ' - '' - - - - - - - org.zanata - zanata-maven-plugin - 2.3.0 - - **/ErraiApp.properties - ${session.executionRootDirectory}/src/main/config/zanata.xml - src/main/resources/ - src/main/resources/ - **/*Constants.properties,**/*Constants_en.properties - - @@ -2315,8 +2125,6 @@ folder during the build. These are not a subject of test coverage measurement. --> - - - - - org.codehaus.mojo - exec-maven-plugin - 3.1.1 - - - Run Script - prepare-package - - java - - - org.drools.util.RemoveCommentsMain - - ${project.basedir}/target/classes/META-INF/quarkus-javadoc.properties - - - - - diff --git a/drools-quarkus-extension/drools-quarkus/pom.xml b/drools-quarkus-extension/drools-quarkus/pom.xml index b30722604f1..9c5057e3cce 100644 --- a/drools-quarkus-extension/drools-quarkus/pom.xml +++ b/drools-quarkus-extension/drools-quarkus/pom.xml @@ -149,29 +149,6 @@ io.smallrye jandex-maven-plugin - - - - - org.codehaus.mojo - exec-maven-plugin - 3.1.1 - - - Run Script - prepare-package - - java - - - org.drools.util.RemoveCommentsMain - - ${project.basedir}/target/classes/META-INF/quarkus-extension.properties - - - - - diff --git a/drools-traits/pom.xml b/drools-traits/pom.xml index 896e33b2774..f2c5f685fd1 100644 --- a/drools-traits/pom.xml +++ b/drools-traits/pom.xml @@ -157,7 +157,7 @@ org.jboss - jboss-transaction-spi-jakarta + jboss-transaction-spi test diff --git a/drools-util/src/main/java/org/drools/util/RemoveCommentsMain.java b/drools-util/src/main/java/org/drools/util/RemoveCommentsMain.java deleted file mode 100644 index 024320a8b28..00000000000 --- a/drools-util/src/main/java/org/drools/util/RemoveCommentsMain.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.drools.util; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.NoSuchFileException; -import java.nio.file.Path; -import java.util.stream.Collectors; - -public class RemoveCommentsMain { - - private static final Logger LOGGER = LoggerFactory.getLogger(RemoveCommentsMain.class); - - public static void main(String... args) { - final String ignoreMissingFilesArgument = args[0]; - final boolean ignoreMissingFiles = Boolean.parseBoolean(ignoreMissingFilesArgument); - for (int i = 0; i < args.length; i++) { - // If the ignoreMissingFiles argument is defined, skip it in this iteration. - if ((ignoreMissingFiles || "false".equalsIgnoreCase(ignoreMissingFilesArgument)) && i == 0) { - continue; - } else { - try { - final String fileName = args[i]; - final String result = removeComments(fileName, ignoreMissingFiles); - if (result != null) { - Files.write(Path.of(fileName), result.getBytes()); - } - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } - } - - static String removeComments(String fileName, final boolean ignoreMissingFiles) { - try (var lines = Files.lines(Path.of(fileName))) { - return lines.filter(line -> !line.startsWith("#")).collect(Collectors.joining("\n")); - } catch (IOException e) { - // Ignore non-existant files. - if (ignoreMissingFiles && e instanceof NoSuchFileException) { - LOGGER.info("Ignoring file that doesn't exist: " + fileName); - return null; - } else { - throw new RuntimeException(e); - } - } - } - -} diff --git a/drools-util/src/test/java/org/drools/util/RemoveCommentsTest.java b/drools-util/src/test/java/org/drools/util/RemoveCommentsTest.java deleted file mode 100644 index 1b529b5acc7..00000000000 --- a/drools-util/src/test/java/org/drools/util/RemoveCommentsTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.drools.util; - -import org.junit.Test; - -import static org.junit.Assert.assertEquals; - -public class RemoveCommentsTest { - - @Test - public void test() { - String result = RemoveCommentsMain.removeComments("src/test/resources/commented.properties", false); - String expected = "provides-capabilities=org.drools.drl\ndeployment-artifact=org.drools\\:drools-quarkus-deployment\\:999-SNAPSHOT"; - assertEquals(expected, result); - } -} diff --git a/kie-internal/pom.xml b/kie-internal/pom.xml index 6dc0f3923b4..619f4ee0f49 100644 --- a/kie-internal/pom.xml +++ b/kie-internal/pom.xml @@ -89,6 +89,12 @@ com.sun.xml.bind jaxb-xjc provided + + + com.sun.xml.bind + jaxb-core + + diff --git a/kie-test-util/pom.xml b/kie-test-util/pom.xml index f6fd0e317e5..448bb2f3f6e 100644 --- a/kie-test-util/pom.xml +++ b/kie-test-util/pom.xml @@ -87,7 +87,7 @@ org.jboss - jboss-transaction-spi-jakarta + jboss-transaction-spi org.apache.tomcat