You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/03/08 11:11:02 UTC
[camel] branch main created (now 41a5dbb)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
at 41a5dbb CAMEL-17759: Prevent inconsistencies in the catalog due to the parallel build (#7147)
This branch includes the following new commits:
new f6713db Upgrade Docker Java to version 3.2.13
new 6b20639 Upgrade Docker Java to version 3.2.13
new a3294eb Regen and sync deps
new 995b326 camel-tika: Make TikaProducer.getContentHandler protected so that it can be overridden
new 41a5dbb CAMEL-17759: Prevent inconsistencies in the catalog due to the parallel build (#7147)
The 5 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.
[camel] 05/05: CAMEL-17759: Prevent inconsistencies in the catalog due to the parallel build (#7147)
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 41a5dbb270829182d60446f67c7c4dcc2f164f4f
Author: Nicolas Filotto <es...@users.noreply.github.com>
AuthorDate: Tue Mar 8 11:44:15 2022 +0100
CAMEL-17759: Prevent inconsistencies in the catalog due to the parallel build (#7147)
## Motivation
There is a race condition in the parallel build that could cause inconsistencies in the catalog.
## Modifications
* Add a new artifact that depends on all core artifacts called `camel-core-all`
* Add a dependency to `camel-core-all` in `camel-catalog` to ensure that the catalog won't be generated before some core artifacts like the console.
---
catalog/camel-catalog/pom.xml | 18 ++++++
core/camel-core-all/pom.xml | 134 ++++++++++++++++++++++++++++++++++++++++++
core/pom.xml | 1 +
3 files changed, 153 insertions(+)
diff --git a/catalog/camel-catalog/pom.xml b/catalog/camel-catalog/pom.xml
index f12dae3..5949709 100644
--- a/catalog/camel-catalog/pom.xml
+++ b/catalog/camel-catalog/pom.xml
@@ -71,6 +71,24 @@
</exclusion>
</exclusions>
</dependency>
+ <!--
+ Enforce the dependency with all the core artifacts to ensure that the parallel build won't build this module
+ before the core artifacts to prevent inconsistencies in the catalog
+ -->
+ <!-- disable all core -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-all</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- testing -->
<dependency>
diff --git a/core/camel-core-all/pom.xml b/core/camel-core-all/pom.xml
new file mode 100644
index 0000000..95d60fd
--- /dev/null
+++ b/core/camel-core-all/pom.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<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.camel</groupId>
+ <artifactId>core</artifactId>
+ <version>3.16.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-core-all</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Camel :: All Core Sync point</name>
+ <description>Depends on all core to ensure correct build ordering</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-base</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-base-engine</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cloud</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cluster</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-console</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-catalog</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-engine</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-languages</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-processor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-reifier</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-xml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-health</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-main</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-management</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-management-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-xml-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-xml-io-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-xml-jaxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-xml-jaxp</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/core/pom.xml b/core/pom.xml
index 543c021..6dd7b66 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -58,6 +58,7 @@
<module>camel-health</module>
<module>camel-console</module>
<module>camel-main</module>
+ <module>camel-core-all</module>
</modules>
<properties>
[camel] 02/05: Upgrade Docker Java to version 3.2.13
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6b2063978d8c71a60c3ed3009bc594cda7f512c9
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 8 10:58:41 2022 +0100
Upgrade Docker Java to version 3.2.13
---
.../src/main/java/org/apache/camel/component/docker/DockerHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerHelper.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerHelper.java
index 5302c26..634ceda 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerHelper.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerHelper.java
@@ -20,7 +20,7 @@ import java.lang.reflect.Array;
import org.apache.camel.Message;
import org.apache.camel.util.StringHelper;
-import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang3.BooleanUtils;
/**
* Utility methods for Docker Component
[camel] 03/05: Regen and sync deps
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a3294eb324abf133f1bfa138658cc639bc78ae30
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 8 11:26:56 2022 +0100
Regen and sync deps
---
camel-dependencies/pom.xml | 2 +-
.../resources/org/apache/camel/catalog/others.properties | 1 +
.../org/apache/camel/catalog/others/console.json | 15 +++++++++++++++
.../org/apache/camel/catalog/schemas/camel-spring.xsd | 8 --------
4 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index fea0d34..7a80a99 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -181,7 +181,7 @@
<djl-tensorflow-native-version>2.4.1</djl-tensorflow-native-version>
<djl-version>0.11.0</djl-version>
<dnsjava-version>3.4.3</dnsjava-version>
- <docker-java-version>3.2.12</docker-java-version>
+ <docker-java-version>3.2.13</docker-java-version>
<dozer-version>6.5.2</dozer-version>
<dropbox-version>3.2.0</dropbox-version>
<eddsa-version>0.3.0</eddsa-version>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
index 2ecc8b0..5f99325 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
@@ -8,6 +8,7 @@ cloud
cloudevents
cluster
componentdsl
+console
csimple-joor
cxf-transport
debug
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json
new file mode 100644
index 0000000..b1048bd
--- /dev/null
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+ "kind": "other",
+ "name": "console",
+ "title": "Console",
+ "description": "Camel Developer Console",
+ "deprecated": false,
+ "firstVersion": "3.15.0",
+ "label": "core",
+ "supportLevel": "Preview",
+ "groupId": "org.apache.camel",
+ "artifactId": "camel-console",
+ "version": "3.16.0-SNAPSHOT"
+ }
+}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index d06f7df..6dd00d4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -10612,14 +10612,6 @@ Reference to the route templates in the xml dsl.
<xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:onException"/>
<xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:onCompletion"/>
</xs:sequence>
- <xs:attribute name="precondition" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-The predicate of the precondition in simple language to evaluate in order to
-determine if this route configuration should be included or not.
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
[camel] 01/05: Upgrade Docker Java to version 3.2.13
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f6713db699e5f933d62190f0815cbd6d40b08083
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 8 10:54:54 2022 +0100
Upgrade Docker Java to version 3.2.13
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index c7287c3..0a40de6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -161,7 +161,7 @@
<djl-mxnet-native-version>1.8.0</djl-mxnet-native-version>
<djl-pytorch-native-version>1.8.1</djl-pytorch-native-version>
<djl-tensorflow-native-version>2.4.1</djl-tensorflow-native-version>
- <docker-java-version>3.2.12</docker-java-version>
+ <docker-java-version>3.2.13</docker-java-version>
<dozer-version>6.5.2</dozer-version>
<dropbox-version>3.2.0</dropbox-version>
<debezium-version>1.8.0.Final</debezium-version>
[camel] 04/05: camel-tika: Make TikaProducer.getContentHandler protected so that it can be overridden
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 995b32647fb2771b44b79e2eef5fbbe85498e6d1
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Mar 8 10:35:18 2022 +0000
camel-tika: Make TikaProducer.getContentHandler protected so that it can be overridden
---
.../src/main/java/org/apache/camel/component/tika/TikaProducer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaProducer.java b/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaProducer.java
index f434156..58a6638 100644
--- a/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaProducer.java
+++ b/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaProducer.java
@@ -137,7 +137,7 @@ public class TikaProducer extends DefaultProducer {
}
}
- private ContentHandler getContentHandler(TikaConfiguration configuration, OutputStream outputStream)
+ protected ContentHandler getContentHandler(TikaConfiguration configuration, OutputStream outputStream)
throws TransformerConfigurationException, UnsupportedEncodingException {
ContentHandler result = null;