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:32:28 UTC
[camel] 01/14: CAMEL-17759: Prevent inconsistencies in the catalog due to the parallel build (#7147)
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>