This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new b3621a4 Polished
b3621a4 is described below
commit b3621a439cbff4a391fd2e49d5d33d79f60ec546
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon May 20 06:52:16 2019 +0200
Polished
---
core/camel-base/pom.xml | 25 +++++-----------
core/camel-caffeine-lrucache/pom.xml | 4 +++
core/camel-cloud/pom.xml | 30 ++++++++++++++-----
core/camel-core-xml/pom.xml | 11 +++----
core/camel-core/pom.xml | 14 ---------
core/camel-headersmap/pom.xml | 1 -
core/camel-jaxp/pom.xml | 4 ++-
core/camel-management-api/pom.xml | 3 +-
core/camel-management-impl/pom.xml | 9 ++----
core/camel-support/pom.xml | 12 +++-----
core/camel-util/pom.xml | 58 +-----------------------------------
11 files changed, 52 insertions(+), 119 deletions(-)
diff --git a/core/camel-base/pom.xml b/core/camel-base/pom.xml
index 98640b6..fd77903 100644
--- a/core/camel-base/pom.xml
+++ b/core/camel-base/pom.xml
@@ -36,57 +36,46 @@
<dependencies>
+ <!-- camel annotations -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>spi-annotations</artifactId>
<optional>true</optional>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>meta-annotations</artifactId>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-util</artifactId>
- </dependency>
-
+ <!-- required dependencies by camel-base -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-api</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-util-json</artifactId>
</dependency>
- <!-- required dependencies by camel-core -->
+ <!-- required logging api dependency by camel-base -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <!-- osgi support -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
-
</dependencies>
<build>
diff --git a/core/camel-caffeine-lrucache/pom.xml
b/core/camel-caffeine-lrucache/pom.xml
index 450f61b..1d2beff 100644
--- a/core/camel-caffeine-lrucache/pom.xml
+++ b/core/camel-caffeine-lrucache/pom.xml
@@ -34,13 +34,17 @@
<description>Camel Caffeine LRUCache support</description>
<properties>
+ <firstVersion>3.0</firstVersion>
+ <label>tooling</label>
</properties>
<dependencies>
+
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
</dependency>
+
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
diff --git a/core/camel-cloud/pom.xml b/core/camel-cloud/pom.xml
index 54c7721..fc3fd8c 100644
--- a/core/camel-cloud/pom.xml
+++ b/core/camel-cloud/pom.xml
@@ -39,24 +39,19 @@
<dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>apt</artifactId>
- <scope>provided</scope>
- </dependency>
-
+ <!-- camel annotations -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>spi-annotations</artifactId>
<optional>true</optional>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>meta-annotations</artifactId>
<optional>true</optional>
</dependency>
+ <!-- required dependencies by camel-cloud -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
@@ -110,4 +105,25 @@
</dependencies>
+ <profiles>
+ <!-- enables the APT dependency so that it can be disabled in IDE
builds -->
+ <profile>
+ <id>apt</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <dependencies>
+
+ <!-- enable the APT processor -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>apt</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/core/camel-core-xml/pom.xml b/core/camel-core-xml/pom.xml
index e99e9c4..4dc18c3 100644
--- a/core/camel-core-xml/pom.xml
+++ b/core/camel-core-xml/pom.xml
@@ -32,18 +32,18 @@
<name>Camel :: Core XML</name>
<description>Camel Core XML support</description>
- <properties>
- </properties>
-
<dependencies>
+
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
+ <artifactId>spi-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
+ <artifactId>camel-core</artifactId>
</dependency>
+
+ <!-- testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -61,4 +61,5 @@
<scope>test</scope>
</dependency>
</dependencies>
+
</project>
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index 8d630cd..958631f 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -192,20 +192,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
- <!-- osgi support -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
-
<!-- testing -->
<dependency>
<groupId>org.codehaus.woodstox</groupId>
diff --git a/core/camel-headersmap/pom.xml b/core/camel-headersmap/pom.xml
index 00419de..33b6181 100644
--- a/core/camel-headersmap/pom.xml
+++ b/core/camel-headersmap/pom.xml
@@ -35,7 +35,6 @@
<properties>
<firstVersion>2.20.0</firstVersion>
<label>tooling</label>
-
</properties>
<dependencies>
diff --git a/core/camel-jaxp/pom.xml b/core/camel-jaxp/pom.xml
index 3e4c36f..6d8e8db 100644
--- a/core/camel-jaxp/pom.xml
+++ b/core/camel-jaxp/pom.xml
@@ -36,22 +36,24 @@
<dependencies>
+ <!-- camel annotations -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>spi-annotations</artifactId>
<optional>true</optional>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>meta-annotations</artifactId>
<optional>true</optional>
</dependency>
+
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
</dependency>
+ <!-- testing -->
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
diff --git a/core/camel-management-api/pom.xml
b/core/camel-management-api/pom.xml
index 608abdd..bf6208f 100644
--- a/core/camel-management-api/pom.xml
+++ b/core/camel-management-api/pom.xml
@@ -36,12 +36,12 @@
<dependencies>
+ <!-- camel annotaions -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>spi-annotations</artifactId>
<optional>true</optional>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>meta-annotations</artifactId>
@@ -52,7 +52,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-util</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-util-json</artifactId>
diff --git a/core/camel-management-impl/pom.xml
b/core/camel-management-impl/pom.xml
index 87c64ff..3d6fef6 100644
--- a/core/camel-management-impl/pom.xml
+++ b/core/camel-management-impl/pom.xml
@@ -36,12 +36,12 @@
<dependencies>
+ <!-- camel annotations -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>spi-annotations</artifactId>
<optional>true</optional>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>meta-annotations</artifactId>
@@ -50,19 +50,16 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-util</artifactId>
+ <artifactId>camel-core</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
+ <artifactId>camel-util</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-util-json</artifactId>
</dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
diff --git a/core/camel-support/pom.xml b/core/camel-support/pom.xml
index b39d88f..b9a13ec 100644
--- a/core/camel-support/pom.xml
+++ b/core/camel-support/pom.xml
@@ -36,12 +36,12 @@
<dependencies>
+ <!-- camel annotations -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>spi-annotations</artifactId>
<optional>true</optional>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>meta-annotations</artifactId>
@@ -50,25 +50,21 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-util</artifactId>
+ <artifactId>camel-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-api</artifactId>
+ <artifactId>camel-management-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-management-api</artifactId>
+ <artifactId>camel-util</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-util-json</artifactId>
</dependency>
- <!-- required dependencies by camel-core -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
diff --git a/core/camel-util/pom.xml b/core/camel-util/pom.xml
index 772f537..d590cc0 100644
--- a/core/camel-util/pom.xml
+++ b/core/camel-util/pom.xml
@@ -36,7 +36,7 @@
<dependencies>
- <!-- required dependencies by camel-core -->
+ <!-- required dependencies by camel-util -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -239,74 +239,18 @@
</build>
</profile>
- <!-- skip management tests on AIX as it hangs CI servers -->
- <profile>
- <id>aix</id>
- <activation>
- <os>
- <name>aix</name>
- </os>
- </activation>
- <properties>
-
<platform.skip.tests>org/apache/camel/management/**/*.java</platform.skip.tests>
- </properties>
- </profile>
- <profile>
- <id>xalan</id>
- <dependencies>
- <!-- enable the Xalan processor -->
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>${xalan-version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>xerces</id>
- <dependencies>
- <!-- enable the xerces processor -->
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces-version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>woodstox</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <!-- xmltokenizer using woodstox -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
-
<profile>
<id>jdk9+-build</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<dependencies>
-
<!-- enable the APT processor -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>apt</artifactId>
<scope>provided</scope>
</dependency>
- <!-- xmltokenizer using woodstox -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
