Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DPE-107 Updates and adaptations for TESB.. #75

Open
wants to merge 5 commits into
base: tesb/camel-karaf-4.8.1.x
Choose a base branch
from
Open

DPE-107 Updates and adaptations for TESB.. #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
358debd
DPE-107 Zookeeper update to 3.9.3.
andreasmattes Nov 18, 2024
db9a00f
DPE-445 Build camel-cxf based on CXF 4.1.0 snapshot.
andreasmattes Nov 25, 2024
3632590
DPE-107 Add modules to be built.
andreasmattes Nov 26, 2024
686c809
DPE-107 Build fix.
andreasmattes Nov 26, 2024
0a6d7b1
fix(DPE-107): fix usage of routebuilder
f2par0 Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile.talend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@Library('esb') _

Fork(
MVN_MODULES: 'org.apache.camel.karaf:camel-support,org.apache.camel.karaf:camel-cxf-all,org.apache.camel.karaf:camel-spring,org.apache.camel.karaf:apache-camel'
MVN_MODULES: 'org.apache.camel.karaf:camel-support,org.apache.camel.karaf:camel-cxf-all,org.apache.camel.karaf:camel-cxf-blueprint,org.apache.camel.karaf:camel-cxf-spring-all,org.apache.camel.karaf:camel-cxf-transport-blueprint,org.apache.camel.karaf:camel-spring,org.apache.camel.karaf:apache-camel'
)
4 changes: 2 additions & 2 deletions ...-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerBeanRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ public <T> T lookupByNameAndType(String name, Class<T> type) {
}

// just to be safe
if (answer == null) {
if (!type.isInstance(answer)) {
return null;
}

try {
return type.cast(answer);
} catch (Throwable e) {
} catch (Exception e) {
String msg = "Found bean: " + name + " in BlueprintContainer: " + blueprintContainer
+ " of type: " + answer.getClass().getName() + " expected type was: " + type;
throw new NoSuchBeanException(name, msg, e);
Expand Down
34 changes: 17 additions & 17 deletions components/camel-cxf/camel-cxf-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
org.apache.camel.component.cxf.transport.header;version=${camel-version},
org.apache.camel.component.cxf.transport.message;version=${camel-version},
org.apache.camel.component.cxf.binding.soap.blueprint;version=${upstream.version},
org.apache.cxf*;version=${cxf-version},
org.apache.cxf*;version=${cxf.tesb.version},
</camel.osgi.export>
<camel.osgi.activator>org.apache.camel.component.cxf.osgi.MainActivator</camel.osgi.activator>
<camel-osgi-camel-import>
Expand Down Expand Up @@ -150,7 +150,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-common</artifactId>
<version>${camel-version}</version>
<version>${camel-cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.camel</groupId>
Expand All @@ -161,7 +161,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
<version>${cxf-version}</version>
<version>${cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
Expand All @@ -183,7 +183,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
<version>${cxf-version}</version>
<version>${cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
Expand All @@ -194,7 +194,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
<version>${cxf-version}</version>
<version>${cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
Expand All @@ -205,7 +205,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-logging</artifactId>
<version>${cxf-version}</version>
<version>${cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
Expand All @@ -216,7 +216,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf-version}</version>
<version>${cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
Expand All @@ -227,7 +227,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf-version}</version>
<version>${cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
Expand All @@ -238,7 +238,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
<version>${cxf-version}</version>
<version>${cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
Expand All @@ -249,7 +249,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>${cxf-version}</version>
<version>${cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
Expand All @@ -260,7 +260,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf-version}</version>
<version>${cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
Expand All @@ -271,7 +271,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
<version>${cxf-version}</version>
<version>${cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
Expand All @@ -282,7 +282,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
<version>${cxf-version}</version>
<version>${cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
Expand All @@ -293,7 +293,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
<version>${cxf-version}</version>
<version>${cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
Expand All @@ -304,7 +304,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
<version>${cxf-version}</version>
<version>${cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
Expand All @@ -315,7 +315,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security</artifactId>
<version>${cxf-version}</version>
<version>${cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
Expand All @@ -337,7 +337,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-transport</artifactId>
<version>${camel-version}</version>
<version>${camel-cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.camel</groupId>
Expand Down
8 changes: 5 additions & 3 deletions components/camel-cxf/camel-cxf-blueprint/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
<artifactId>camel-cxf-blueprint</artifactId>
<packaging>bundle</packaging>
<name>Apache Camel :: Karaf :: Components :: CXF :: Blueprint</name>
<version>${revision}</version>
<properties>
<revision>${camel-cxf.tesb.version}</revision>
<firstVersion>3.2.0</firstVersion>
<camel.osgi.export>
org.apache.camel.component.cxf.blueprint.helpers;version=${upstream.version},
Expand All @@ -48,7 +50,7 @@
org.osgi.service*,
org.osgi.framework*,
org.apache.aries.blueprint*,
org.apache.cxf.*;version="${camel-osgi-cxf-version}",
org.apache.cxf.*;version="${camel-osgi-cxf.tesb.version}",
org.slf4j
</camel.osgi.import>
</properties>
Expand All @@ -58,12 +60,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-soap</artifactId>
<version>${camel-version}</version>
<version>${camel-cxf.tesb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-rest</artifactId>
<version>${camel-version}</version>
<version>${camel-cxf.tesb.version}</version>
</dependency>

<!-- OSGi, Blueprint -->
Expand Down
12 changes: 7 additions & 5 deletions components/camel-cxf/camel-cxf-spring-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@
<artifactId>camel-cxf-spring-all</artifactId>
<packaging>bundle</packaging>
<name>Apache Camel :: Karaf :: Components :: CXF :: Spring All in one</name>
<version>${revision}</version>

<properties>
<revision>${camel-cxf.tesb.version}</revision>
<camel.osgi.export>
org.apache.camel.component.cxf.spring;version=${camel-version},
org.apache.camel.component.cxf.spring.jaxrs;version=${camel-version},
Expand All @@ -46,7 +48,7 @@
org.springframework.core*;version="${camel-osgi-spring-version}",
org.springframework.util*;version="${camel-osgi-spring-version}",
org.springframework.web*;version="${camel-osgi-spring-version}",
org.apache.cxf.*;version="${camel-osgi-cxf-version}",
org.apache.cxf.*;version="${camel-osgi-cxf.tesb.version}",
jakarta.activation;version="${camel-osgi-jakarta-activation-version}",
jakarta.annotation;version="${camel-osgi-jakarta-annotation-version}",
jakarta.xml.ws*;version="${camel-osgi-jakarta-xml-ws-version}",
Expand All @@ -64,7 +66,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-spring-common</artifactId>
<version>${camel-version}</version>
<version>${camel-cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.camel</groupId>
Expand All @@ -75,7 +77,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-spring-rest</artifactId>
<version>${camel-version}</version>
<version>${camel-cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.camel</groupId>
Expand All @@ -86,7 +88,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-spring-soap</artifactId>
<version>${camel-version}</version>
<version>${camel-cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.camel</groupId>
Expand All @@ -97,7 +99,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-spring-transport</artifactId>
<version>${camel-version}</version>
<version>${camel-cxf.tesb.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.camel</groupId>
Expand Down
8 changes: 5 additions & 3 deletions components/camel-cxf/camel-cxf-transport-blueprint/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@
<artifactId>camel-cxf-transport-blueprint</artifactId>
<packaging>bundle</packaging>
<name>Apache Camel :: Karaf :: Components :: CXF :: Transport Blueprint</name>
<version>${revision}</version>

<properties>
<revision>${camel-cxf.tesb.version}</revision>
<firstVersion>3.2.0</firstVersion>
<camel.osgi.export>
org.apache.camel.component.cxf.transport.blueprint;version=${upstream.version},
Expand All @@ -50,7 +52,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-transport</artifactId>
<version>${camel-version}</version>
<version>${camel-cxf.tesb.version}</version>
</dependency>

<!-- OSGi, Blueprint -->
Expand All @@ -64,13 +66,13 @@
<dependency>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>camel-cxf-blueprint</artifactId>
<version>${upstream.version}</version>
<version>${camel-cxf.tesb.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>camel-cxf-all</artifactId>
<version>${upstream.version}</version>
<version>${camel-cxf-all.tesb.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Expand Down
12 changes: 6 additions & 6 deletions features/src/main/feature/camel-features.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,9 @@
</feature>

<!-- Wrapped zookeeper jars. -->
<feature name='zookeeper-core' version='${zookeeper-version}' start-level='50'>
<bundle dependency='true'>wrap:mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}$Bundle-SymbolicName=org.apache.zookeeper&amp;Bundle-Version=${zookeeper-version}&amp;Export-Package=org.apache.zookeeper;version=${zookeeper-version},org.apache.zookeeper.*;version=${zookeeper-version}</bundle>
<bundle dependency='true'>wrap:mvn:org.apache.zookeeper/zookeeper-jute/${zookeeper-version}$Bundle-SymbolicName=org.apache.zookeeper-jute&amp;Bundle-Version=${zookeeper-version}&amp;Fragment-Host=org.apache.zookeeper&amp;Export-Package=org.apache.jute;version=${zookeeper-version},org.apache.zookeeper.*;version=${zookeeper-version}</bundle>
<feature name='zookeeper-core' version='${zookeeper.tesb.version}' start-level='50'>
<bundle dependency='true'>wrap:mvn:org.apache.zookeeper/zookeeper/${zookeeper-server.tesb.version}$Bundle-SymbolicName=org.apache.zookeeper&amp;Bundle-Version=${zookeeper.tesb.version}&amp;Export-Package=org.apache.zookeeper;version=${zookeeper.tesb.version},org.apache.zookeeper.*;version=${zookeeper.tesb.version}</bundle>
<bundle dependency='true'>wrap:mvn:org.apache.zookeeper/zookeeper-jute/${zookeeper.tesb.version}$Bundle-SymbolicName=org.apache.zookeeper-jute&amp;Bundle-Version=${zookeeper.tesb.version}&amp;Fragment-Host=org.apache.zookeeper&amp;Export-Package=org.apache.jute;version=${zookeeper.tesb.version},org.apache.zookeeper.*;version=${zookeeper.tesb.version}</bundle>
</feature>

<!-- Apache Camel core features -->
Expand Down Expand Up @@ -945,13 +945,13 @@
<bundle>mvn:org.apache.camel.karaf/camel-http-base/${upstream.version}</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-http-common/${upstream.version}</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-cxf-all/${camel-cxf-all.tesb.version}</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-cxf-blueprint/${upstream.version}</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-cxf-transport-blueprint/${upstream.version}</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-cxf-blueprint/${camel-cxf.tesb.version}</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-cxf-transport-blueprint/${camel-cxf.tesb.version}</bundle>
</feature>
<feature name='camel-cxf-spring' version='${upstream.version}' start-level='50'>
<feature version='${camel-osgi-version-range}'>camel-cxf</feature>
<feature version='${camel-osgi-version-range}'>camel-spring</feature>
<bundle>mvn:org.apache.camel.karaf/camel-cxf-spring-all/${upstream.version}</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-cxf-spring-all/${camel-cxf.tesb.version}</bundle>
</feature>
<feature name='camel-datasonnet' version='${upstream.version}' start-level='50'>
<feature version='${camel-osgi-version-range}'>camel-core</feature>
Expand Down
12 changes: 11 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,15 @@
<upstream.version>4.8.1</upstream.version>
<camel-features.tesb.version>4.8.1.20240820</camel-features.tesb.version>
<camel-support.tesb.version>4.8.1.20240820</camel-support.tesb.version>
<camel-cxf.tesb.version>4.8.1.20240820</camel-cxf.tesb.version>
<camel-cxf-all.tesb.version>4.8.1.20240820</camel-cxf-all.tesb.version>
<camel-cxf-soap.tesb.version>4.8.1.20240820</camel-cxf-soap.tesb.version>
<camel-cxf-rest.tesb.version>4.8.1.20240820</camel-cxf-rest.tesb.version>
<camel-spring.tesb.version>4.8.1.20240820</camel-spring.tesb.version>

<cxf.tesb.version>4.1.0.1-SNAPSHOT</cxf.tesb.version>
<jetty11.tesb.version>11.0.21</jetty11.tesb.version>
<jetty12.tesb.version>12.0.10</jetty12.tesb.version>
<jetty12.tesb.version>12.0.15</jetty12.tesb.version>
<jetty.tesb.version>${jetty12.tesb.version}</jetty.tesb.version>
<jetty11.tesb.version-range>[11,12)</jetty11.tesb.version-range>
<jetty12.tesb.version-range>[12,13)</jetty12.tesb.version-range>
Expand All @@ -109,6 +111,10 @@
<jaxb-fastinfoset.tesb.version>2.1.1</jaxb-fastinfoset.tesb.version>
<jaxb-staxex.tesb.version>2.1.0</jaxb-staxex.tesb.version>
<jaxb-dtd-parser.tesb.version>1.5.1</jaxb-dtd-parser.tesb.version>
<zookeeper.tesb.version>3.9.3</zookeeper.tesb.version>
<zookeeper-server.tesb.version>3.9.3.jetty12.1</zookeeper-server.tesb.version>
<camel-osgi-cxf.tesb.version>[4.1,4.2)</camel-osgi-cxf.tesb.version>
<camel-osgi-jetty.tesb.version>[12,13)</camel-osgi-jetty.tesb.version>

<jdk-version>17</jdk-version>
<maven.compiler.source>${jdk-version}</maven.compiler.source>
Expand Down Expand Up @@ -698,10 +704,12 @@
<upstream.version>${upstream.version}</upstream.version>
<camel.features.tesb.version>${camel.features.tesb.version}</camel.features.tesb.version>
<camel-support.tesb.version>${camel-support.tesb.version}</camel-support.tesb.version>
<camel-cxf.tesb.version>${camel-cxf.tesb.version}</camel-cxf.tesb.version>
<camel-cxf-all.tesb.version>${camel-cxf-all.tesb.version}</camel-cxf-all.tesb.version>
<camel-cxf-soap.tesb.version>${camel-cxf-soap.tesb.version}</camel-cxf-soap.tesb.version>
<camel-cxf-rest.tesb.version>${camel-cxf-rest.tesb.version}</camel-cxf-rest.tesb.version>
<camel-spring.tesb.version>${camel-spring.tesb.version}</camel-spring.tesb.version>
<cxf.tesb.version>${cxf.tesb.version}</cxf.tesb.version>
<jetty11.tesb.version>${jetty11.tesb.version}</jetty11.tesb.version>
<jetty12.tesb.version>${jetty12.tesb.version}</jetty12.tesb.version>
<jetty.tesb.version>${jetty.tesb.version}</jetty.tesb.version>
Expand All @@ -716,6 +724,8 @@
<jaxb-fastinfoset.tesb.version>${jaxb-fastinfoset.tesb.version}</jaxb-fastinfoset.tesb.version>
<jaxb-staxex.tesb.version>${jaxb-staxex.tesb.version}</jaxb-staxex.tesb.version>
<jaxb-dtd-parser.tesb.version>${jaxb-dtd-parser.tesb.version}</jaxb-dtd-parser.tesb.version>
<zookeeper.tesb.version>${zookeeper.tesb.version}</zookeeper.tesb.version>
<zookeeper-server.tesb.version>${zookeeper-server.tesb.version}</zookeeper-server.tesb.version>
</properties>
</configuration>
<executions>
Expand Down