From f44c46ca059a4a74dcb3e2b858cb9d0523272675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= Date: Tue, 24 Oct 2023 07:58:59 +0200 Subject: [PATCH] AMQ-9281: Add Camel 4.1.0 and exclude OSGi/Karaf for now --- activemq-karaf-itest/pom.xml | 8 --- .../karaf/itest/AbstractFeatureTest.java | 9 +-- .../ActiveMQBrokerNdCamelFeatureTest.java | 1 - ...iveMQBrokerNdExternalCamelFeatureTest.java | 3 +- .../src/main/resources/features.xml | 8 --- activemq-osgi/pom.xml | 14 ---- .../activemq/osgi/ActiveMQServiceFactory.java | 8 +-- assembly/pom.xml | 72 +++++++++++++++++++ assembly/src/main/descriptors/common-bin.xml | 22 +++++- assembly/src/release/examples/conf/camel.xml | 2 - pom.xml | 38 ++-------- 11 files changed, 104 insertions(+), 81 deletions(-) diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml index 71eb0b45d1..f6ff03b54c 100644 --- a/activemq-karaf-itest/pom.xml +++ b/activemq-karaf-itest/pom.xml @@ -111,14 +111,6 @@ ${qpid-jms-version} test - - org.apache.camel.karaf - apache-camel - ${camel-version} - xml - features - test - diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java index 6cb007b089..d83c982896 100644 --- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java +++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java @@ -145,8 +145,6 @@ public abstract class AbstractFeatureTest { String karafVersion = MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf"); MavenUrlReference karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf") .type("tar.gz").versionAsInProject(); - UrlReference camelUrl = maven().groupId("org.apache.camel.karaf") - .artifactId("apache-camel").type("xml").classifier("features").versionAsInProject(); UrlReference activeMQUrl = maven().groupId("org.apache.activemq"). artifactId("activemq-karaf").versionAsInProject().type("xml").classifier("features").versionAsInProject(); return composite( @@ -157,15 +155,10 @@ public abstract class AbstractFeatureTest { editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.repositories", "https://repo1.maven.org/maven2@id=central"), editConfigurationFilePut("etc/config.properties", "karaf.startlevel.bundle", "50"), // debugConfiguration("5005", true), - features(activeMQUrl, features), // - features(camelUrl) + features(activeMQUrl, features) ); } - protected static String camelVersion() { - return MavenUtils.getArtifactVersion("org.apache.camel.karaf", "apache-camel"); - } - public static boolean withinReason(Callable callable) throws Exception { long max = System.currentTimeMillis() + ASSERTION_TIMEOUT; while (true) { diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java index 8e3c3ca682..de09fcfcd3 100644 --- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java +++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java @@ -39,7 +39,6 @@ public class ActiveMQBrokerNdCamelFeatureTest extends AbstractFeatureTest { return new Option[] // { composite(configure("activemq", "activemq-shell", "camel-jms")), - editConfigurationFilePut("etc/system.properties", "camel.version", camelVersion()), replaceConfigurationFile("etc/activemq.xml", new File(RESOURCE_BASE + "activemq-nd-camel.xml")), replaceConfigurationFile("etc/org.apache.activemq.server-default.cfg", new File(RESOURCE_BASE + "org.apache.activemq.server-default.cfg")) }; diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java index afed638b1d..a1ef86f58c 100644 --- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java +++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java @@ -40,8 +40,7 @@ public class ActiveMQBrokerNdExternalCamelFeatureTest extends AbstractFeatureTes { configure("activemq"), // copy camel.xml into a temporary directory in karaf, so we later can hot-deploy it - replaceConfigurationFile("data/tmp/camel.xml", new File(RESOURCE_BASE + "camel.xml")), - editConfigurationFilePut("etc/system.properties", "camel.version", camelVersion()) + replaceConfigurationFile("data/tmp/camel.xml", new File(RESOURCE_BASE + "camel.xml")) }; } diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml index e882ffdc9c..cd7eec644c 100644 --- a/activemq-karaf/src/main/resources/features.xml +++ b/activemq-karaf/src/main/resources/features.xml @@ -42,14 +42,6 @@ mvn:org.apache.activemq/activemq-karaf/${project.version} - - activemq-client - camel-jms - camel - camel-spring - camel-blueprint - - + + org.apache.camel + camel-activemq + + + org.apache.camel + camel-api + + + org.apache.camel + camel-base + + + org.apache.camel + camel-base-engine + org.apache.camel camel-core + + org.apache.camel + camel-core-catalog + + + org.apache.camel + camel-core-engine + + + org.apache.camel + camel-core-languages + + + org.apache.camel + camel-core-model + + + org.apache.camel + camel-core-processor + + + org.apache.camel + camel-core-reifier + + + org.apache.camel + camel-core-xml + + + org.apache.camel + camel-log + + + org.apache.camel + camel-management-api + + + org.apache.camel + camel-util + org.apache.camel camel-spring + + org.apache.camel + camel-spring-xml + + + org.apache.camel + camel-support + + + org.apache.camel + camel-timer + org.apache.camel camel-jms + + org.apache.camel + camel-xml-jaxb + diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml index 7561c6ff12..c0121de3e4 100644 --- a/assembly/src/main/descriptors/common-bin.xml +++ b/assembly/src/main/descriptors/common-bin.xml @@ -145,7 +145,7 @@ jakarta.transaction:jakarta.transaction-api ${pom.groupId}:activemq-web org.fusesource.hawtbuf:hawtbuf - jakarta.xml.bind:jaxb-api + jakarta.xml.bind:jakarta.xml.bind-api org.glassfish.jaxb:jaxb-runtime org.glassfish.jaxb:jaxb-core com.sun.istack:istack-commons-runtime @@ -157,20 +157,36 @@ 0644 0755 - lib/optional false diff --git a/assembly/src/release/examples/conf/camel.xml b/assembly/src/release/examples/conf/camel.xml index 172aa0637c..2978b07c40 100644 --- a/assembly/src/release/examples/conf/camel.xml +++ b/assembly/src/release/examples/conf/camel.xml @@ -34,10 +34,8 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - Example Camel Route diff --git a/pom.xml b/pom.xml index 9d474c2324..c791ec05f6 100644 --- a/pom.xml +++ b/pom.xml @@ -46,8 +46,7 @@ 1.10.14 1.1.0 1.0-M3-dev - 2.25.4 - [2.20,4) + 4.1.0 1.9.4 3.2.2 1.3.4 @@ -215,7 +214,6 @@ activemq-all activemq-console activemq-jaas - activemq-karaf activemq-jms-pool activemq-pool activemq-cf @@ -227,10 +225,11 @@ activemq-runtime-config activemq-tooling activemq-web - activemq-osgi - activemq-blueprint activemq-web-demo activemq-web-console + activemq-karaf + activemq-osgi + activemq-blueprint activemq-karaf-itest assembly activemq-log4j-appender @@ -515,33 +514,10 @@ org.apache.camel - camel-core - ${camel-version} - - - org.apache.camel - camel-spring - ${camel-version} - - - org.apache.camel - camel-blueprint - ${camel-version} - - - org.apache.camel - camel-jms - ${camel-version} - - - org.apache.camel - camel-test - ${camel-version} - - - org.apache.camel - camel-test-spring + camel-bom ${camel-version} + pom + import