You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gz...@apache.org on 2022/12/01 13:59:05 UTC
[camel-karaf] branch camel-karaf-3.18.x updated (78064db9 -> 56780775)
This is an automated email from the ASF dual-hosted git repository.
gzurowski pushed a change to branch camel-karaf-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
from 78064db9 Upgrade stax2-api to 4.2.1 / Version 3.1.4 conflicting with cxf (#208)
add 3f697938 Target Camel 3.18.4 for release
add c34e1fb8 [maven-release-plugin] prepare release camel-karaf-3.18.4
add 26edacf6 [maven-release-plugin] prepare for next development iteration
new 3074f274 Target Camel 3.18.5-SNAPSHOT for development
new 56780775 Merge branch 'release/3.18.4' into camel-karaf-3.18.x
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
archetypes/camel-archetype-blueprint/pom.xml | 2 +-
archetypes/pom.xml | 2 +-
bom/camel-karaf-bom/pom.xml | 2 +-
bom/pom.xml | 2 +-
catalog/camel-catalog-provider-karaf/pom.xml | 2 +-
catalog/pom.xml | 2 +-
components/camel-bean-validator-osgi/pom.xml | 2 +-
components/camel-blueprint-main/pom.xml | 2 +-
components/camel-blueprint/pom.xml | 2 +-
components/camel-cmis-osgi/pom.xml | 2 +-
components/camel-cxf-blueprint/pom.xml | 2 +-
components/camel-cxf-transport-blueprint/pom.xml | 2 +-
components/camel-eventadmin/pom.xml | 2 +-
components/camel-jcache-osgi/pom.xml | 2 +-
components/camel-kura/pom.xml | 2 +-
components/camel-paxlogging/pom.xml | 2 +-
components/camel-servlet-osgi/pom.xml | 2 +-
components/camel-test-blueprint-junit5/pom.xml | 2 +-
components/camel-test-blueprint/pom.xml | 2 +-
components/camel-test-karaf/pom.xml | 2 +-
components/camel-zookeeper-master-osgi/pom.xml | 2 +-
components/pom.xml | 2 +-
core/camel-core-osgi/pom.xml | 2 +-
core/pom.xml | 2 +-
platforms/commands/commands-core/pom.xml | 2 +-
platforms/commands/pom.xml | 2 +-
platforms/karaf/commands/pom.xml | 2 +-
platforms/karaf/features/pom.xml | 2 +-
platforms/karaf/pom.xml | 2 +-
platforms/pom.xml | 2 +-
pom.xml | 8 ++++----
tests/camel-blueprint-cxf-test/pom.xml | 2 +-
tests/camel-blueprint-test/pom.xml | 2 +-
tests/camel-itest-osgi/pom.xml | 2 +-
tests/pom.xml | 2 +-
tooling/camel-catalog-generator-karaf-maven-plugin/pom.xml | 2 +-
tooling/camel-karaf-maven-plugin/pom.xml | 2 +-
tooling/pom.xml | 2 +-
38 files changed, 41 insertions(+), 41 deletions(-)
[camel-karaf] 02/02: Merge branch 'release/3.18.4' into camel-karaf-3.18.x
Posted by gz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gzurowski pushed a commit to branch camel-karaf-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 56780775aabec9fdfde56537a51f78d59c497cbb
Merge: 78064db9 3074f274
Author: Gregor Zurowski <gr...@zurowski.org>
AuthorDate: Thu Dec 1 13:58:44 2022 +0000
Merge branch 'release/3.18.4' into camel-karaf-3.18.x
archetypes/camel-archetype-blueprint/pom.xml | 2 +-
archetypes/pom.xml | 2 +-
bom/camel-karaf-bom/pom.xml | 2 +-
bom/pom.xml | 2 +-
catalog/camel-catalog-provider-karaf/pom.xml | 2 +-
catalog/pom.xml | 2 +-
components/camel-bean-validator-osgi/pom.xml | 2 +-
components/camel-blueprint-main/pom.xml | 2 +-
components/camel-blueprint/pom.xml | 2 +-
components/camel-cmis-osgi/pom.xml | 2 +-
components/camel-cxf-blueprint/pom.xml | 2 +-
components/camel-cxf-transport-blueprint/pom.xml | 2 +-
components/camel-eventadmin/pom.xml | 2 +-
components/camel-jcache-osgi/pom.xml | 2 +-
components/camel-kura/pom.xml | 2 +-
components/camel-paxlogging/pom.xml | 2 +-
components/camel-servlet-osgi/pom.xml | 2 +-
components/camel-test-blueprint-junit5/pom.xml | 2 +-
components/camel-test-blueprint/pom.xml | 2 +-
components/camel-test-karaf/pom.xml | 2 +-
components/camel-zookeeper-master-osgi/pom.xml | 2 +-
components/pom.xml | 2 +-
core/camel-core-osgi/pom.xml | 2 +-
core/pom.xml | 2 +-
platforms/commands/commands-core/pom.xml | 2 +-
platforms/commands/pom.xml | 2 +-
platforms/karaf/commands/pom.xml | 2 +-
platforms/karaf/features/pom.xml | 2 +-
platforms/karaf/pom.xml | 2 +-
platforms/pom.xml | 2 +-
pom.xml | 8 ++++----
tests/camel-blueprint-cxf-test/pom.xml | 2 +-
tests/camel-blueprint-test/pom.xml | 2 +-
tests/camel-itest-osgi/pom.xml | 2 +-
tests/pom.xml | 2 +-
tooling/camel-catalog-generator-karaf-maven-plugin/pom.xml | 2 +-
tooling/camel-karaf-maven-plugin/pom.xml | 2 +-
tooling/pom.xml | 2 +-
38 files changed, 41 insertions(+), 41 deletions(-)
[camel-karaf] 01/02: Target Camel 3.18.5-SNAPSHOT for development
Posted by gz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gzurowski pushed a commit to branch camel-karaf-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 3074f2741b3033e7a86041f086d6e9f54433cbfc
Author: Gregor Zurowski <gr...@zurowski.org>
AuthorDate: Thu Dec 1 13:58:07 2022 +0000
Target Camel 3.18.5-SNAPSHOT for development
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index d6643a1a..56924da7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.18.4</version>
+ <version>3.18.5-SNAPSHOT</version>
</parent>
<groupId>org.apache.camel.karaf</groupId>
@@ -108,7 +108,7 @@
<karaf4-version>4.3.7</karaf4-version>
<!-- Camel target version -->
- <camel-version>3.18.4</camel-version>
+ <camel-version>3.18.5-SNAPSHOT</camel-version>
<ant-bundle-version>1.7.0_6</ant-bundle-version>
<antlr-bundle-version>3.5.2_1</antlr-bundle-version>
@@ -775,7 +775,7 @@
<profile>
<id>dev</id>
<properties>
- <camel-version>3.18.4</camel-version>
+ <camel-version>3.18.5-SNAPSHOT</camel-version>
</properties>
</profile>