Skip to content

Commit

Permalink
Merge branch 'release/3.14.10' into camel-3.14.x
Browse files Browse the repository at this point in the history
  • Loading branch information
gzurowski committed Nov 10, 2023
2 parents 1b7d7bb + 407c57e commit 7b164f5
Show file tree
Hide file tree
Showing 557 changed files with 567 additions and 568 deletions.
2 changes: 1 addition & 1 deletion apache-camel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion archetypes/camel-archetype-api-component/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>archetypes</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<groupId>org.apache.camel.archetypes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/camel-archetype-cdi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>archetypes</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<groupId>org.apache.camel.archetypes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/camel-archetype-component/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>archetypes</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<groupId>org.apache.camel.archetypes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/camel-archetype-dataformat/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>archetypes</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<groupId>org.apache.camel.archetypes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/camel-archetype-endpointdsl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>archetypes</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<groupId>org.apache.camel.archetypes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/camel-archetype-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>archetypes</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<groupId>org.apache.camel.archetypes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/camel-archetype-main/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>archetypes</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<groupId>org.apache.camel.archetypes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/camel-archetype-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>archetypes</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<groupId>org.apache.camel.archetypes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bom/camel-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<artifactId>camel-bom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion buildingtools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-buildtools</artifactId>
Expand Down
23 changes: 11 additions & 12 deletions camel-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
limitations under the License.
-->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
Expand All @@ -27,7 +26,7 @@
</parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Camel :: Dependencies</name>
<description>Camel Dependencies POM</description>
Expand Down Expand Up @@ -88,18 +87,18 @@
<c3p0-version>0.9.5.5</c3p0-version>
<caffeine-version>2.9.3</caffeine-version>
<californium-version>2.6.5</californium-version>
<camel.osgi.activator></camel.osgi.activator>
<camel.osgi.dynamic></camel.osgi.dynamic>
<camel.osgi.activator />
<camel.osgi.dynamic />
<camel.osgi.exclude.dependencies>false</camel.osgi.exclude.dependencies>
<camel.osgi.export>${camel.osgi.export.pkg};-noimport:=true;${camel.osgi.version}</camel.osgi.export>
<camel.osgi.export.pkg>$${replace;{local-packages};;;\;}</camel.osgi.export.pkg>
<camel.osgi.failok>false</camel.osgi.failok>
<camel.osgi.import>${camel.osgi.import.pkg}</camel.osgi.import>
<camel.osgi.import.additional></camel.osgi.import.additional>
<camel.osgi.import.before.defaults></camel.osgi.import.before.defaults>
<camel.osgi.import.additional />
<camel.osgi.import.before.defaults />
<camel.osgi.import.camel.version>version="[$(version;==;${camel.osgi.version.clean}),$(version;=+;${camel.osgi.version.clean}))"</camel.osgi.import.camel.version>
<camel.osgi.import.default.version>[$(version;==;$(@)),$(version;+;$(@)))</camel.osgi.import.default.version>
<camel.osgi.import.defaults></camel.osgi.import.defaults>
<camel.osgi.import.defaults />
<camel.osgi.import.pkg>org.apache.camel.*;${camel.osgi.import.camel.version},
${camel.osgi.import.before.defaults},
${camel.osgi.import.defaults},
Expand All @@ -108,8 +107,8 @@
<camel.osgi.import.strict.version>version="[$(version;===;${camel.osgi.version.clean}),$(version;==+;${camel.osgi.version.clean}))"</camel.osgi.import.strict.version>
<camel.osgi.manifest>${project.build.outputDirectory}/META-INF/MANIFEST.MF</camel.osgi.manifest>
<camel.osgi.private.pkg>!*</camel.osgi.private.pkg>
<camel.osgi.provide.capability></camel.osgi.provide.capability>
<camel.osgi.require.capability></camel.osgi.require.capability>
<camel.osgi.provide.capability />
<camel.osgi.require.capability />
<camel.osgi.symbolic.name>${project.groupId}.${project.artifactId}</camel.osgi.symbolic.name>
<camel.osgi.version>version=${project.version}</camel.osgi.version>
<camel.surefire.fork.vmargs>-XX:+ExitOnOutOfMemoryError</camel.surefire.fork.vmargs>
Expand Down Expand Up @@ -163,9 +162,9 @@
<cxf-version-range>[3.4,3.5)</cxf-version-range>
<cxf-xjc-plugin-version>3.3.2</cxf-xjc-plugin-version>
<cxf-xjc-utils-version>3.3.1</cxf-xjc-utils-version>
<cxf.codegen.jvmArgs></cxf.codegen.jvmArgs>
<cxf.codegen.jvmArgs />
<cxf.codegenplugin.forkmode>once</cxf.codegenplugin.forkmode>
<cxf.xjc.jvmArgs></cxf.xjc.jvmArgs>
<cxf.xjc.jvmArgs />
<datasonnet-mapper-version>2.1.4</datasonnet-mapper-version>
<debezium-mysql-connector-version>8.0.27</debezium-mysql-connector-version>
<debezium-version>1.7.1.Final</debezium-version>
Expand Down
2 changes: 1 addition & 1 deletion catalog/camel-catalog-lucene/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>catalog</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-catalog-lucene</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion catalog/camel-catalog-maven/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>catalog</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-catalog-maven</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion catalog/camel-catalog/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>catalog</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-catalog</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion catalog/camel-csimple-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>maven-plugins</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
<relativePath>../../tooling/maven</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion catalog/camel-report-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>maven-plugins</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
<relativePath>../../tooling/maven</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion catalog/camel-route-parser/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>catalog</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-route-parser</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion catalog/dummy-component/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>catalog</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion catalog/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion components/camel-activemq/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>components</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-activemq</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-ahc-ws/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>components</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-ahc-ws</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-ahc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>components</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-ahc</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-amqp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>components</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-amqp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-any23/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>components</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-any23</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-arangodb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>components</artifactId>
<groupId>org.apache.camel</groupId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<groupId>org.apache.camel</groupId>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-as2/camel-as2-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-as2-parent</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-as2-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-as2/camel-as2-component/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-as2-parent</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-as2</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-as2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>components</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-as2-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-asn1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>components</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-asn1</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-asterisk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>components</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-asterisk</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-atlasmap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>components</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-atlasmap</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-atmos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>components</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-atmos</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-atmosphere-websocket/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>components</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-atmosphere-websocket</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-atom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>components</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-atom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-atomix/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>components</artifactId>
<version>3.14.10-SNAPSHOT</version>
<version>3.14.11-SNAPSHOT</version>
</parent>

<artifactId>camel-atomix</artifactId>
Expand Down
Loading

0 comments on commit 7b164f5

Please sign in to comment.