This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new d44baab Submodule for support extensions #213
new cf56799 Merge pull request #214 from lburgazzoli/github-213
d44baab is described below
commit d44baab126a78a4b9bd05b07f4d3934f2b79faf0
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Mon Sep 30 14:50:52 2019 +0200
Submodule for support extensions #213
---
.../modules/ROOT/pages/_partials/common-extensions.adoc | 2 --
.../ROOT/pages/_partials/component-extensions.adoc | 1 +
extensions/pom.xml | 5 +++--
extensions/salesforce/deployment/pom.xml | 4 ++--
extensions/salesforce/runtime/pom.xml | 4 ++--
.../{jetty-common => support/jetty}/deployment/pom.xml | 8 ++++----
.../quarkus/jetty/common/deployment/JettyProcessor.java | 0
extensions/{jetty-common => support/jetty}/pom.xml | 6 +++---
.../{jetty-common => support/jetty}/runtime/pom.xml | 6 +++---
extensions/{jetty-common => support}/pom.xml | 13 ++++++-------
.../xstream}/deployment/pom.xml | 8 ++++----
.../xstream/common/deployment/XStreamProcessor.java | 0
extensions/{xstream-common => support/xstream}/pom.xml | 6 +++---
.../{xstream-common => support/xstream}/runtime/pom.xml | 6 +++---
poms/bom-deployment/pom.xml | 17 ++++++++++++-----
poms/bom/pom.xml | 16 +++++++++-------
16 files changed, 55 insertions(+), 47 deletions(-)
diff --git a/docs/modules/ROOT/pages/_partials/common-extensions.adoc
b/docs/modules/ROOT/pages/_partials/common-extensions.adoc
index 72c7a79..5c4952e 100644
--- a/docs/modules/ROOT/pages/_partials/common-extensions.adoc
+++ b/docs/modules/ROOT/pages/_partials/common-extensions.adoc
@@ -2,6 +2,4 @@
* `camel-quarkus-core`
* `camel-quarkus-core-cloud`
* `camel-quarkus-http-common`
-* `camel-quarkus-jetty-common`
* `camel-quarkus-xml-common`
-* `camel-quarkus-xstream-common`
diff --git a/docs/modules/ROOT/pages/_partials/component-extensions.adoc
b/docs/modules/ROOT/pages/_partials/component-extensions.adoc
index 43f8cae..30de83f 100644
--- a/docs/modules/ROOT/pages/_partials/component-extensions.adoc
+++ b/docs/modules/ROOT/pages/_partials/component-extensions.adoc
@@ -16,6 +16,7 @@
* `camel-quarkus-rest`
* `camel-quarkus-salesforce`
* `camel-quarkus-servlet`
+* `camel-quarkus-support`
* `camel-quarkus-timer`
* `camel-quarkus-twitter`
* `camel-quarkus-zipfile`
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 8cfb95e..3067117 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -32,9 +32,10 @@
<name>Camel Quarkus :: Extensions</name>
<modules>
+ <!-- support extensions -->
+ <module>support</module>
+
<!-- common/shared extensions -->
- <module>jetty-common</module>
- <module>xstream-common</module>
<module>xml-common</module>
<module>core</module>
<module>core-cloud</module>
diff --git a/extensions/salesforce/deployment/pom.xml
b/extensions/salesforce/deployment/pom.xml
index 5f17c6d..0a82faa 100644
--- a/extensions/salesforce/deployment/pom.xml
+++ b/extensions/salesforce/deployment/pom.xml
@@ -47,11 +47,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-jetty-common-deployment</artifactId>
+ <artifactId>camel-quarkus-support-jetty-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-xstream-common-deployment</artifactId>
+ <artifactId>camel-quarkus-support-xstream-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions/salesforce/runtime/pom.xml
b/extensions/salesforce/runtime/pom.xml
index 915b9c7..b707f3f 100644
--- a/extensions/salesforce/runtime/pom.xml
+++ b/extensions/salesforce/runtime/pom.xml
@@ -47,11 +47,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-jetty-common</artifactId>
+ <artifactId>camel-quarkus-support-jetty</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-xstream-common</artifactId>
+ <artifactId>camel-quarkus-support-xstream</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/extensions/jetty-common/deployment/pom.xml
b/extensions/support/jetty/deployment/pom.xml
similarity index 90%
rename from extensions/jetty-common/deployment/pom.xml
rename to extensions/support/jetty/deployment/pom.xml
index bf209b7..f0c50c5 100644
--- a/extensions/jetty-common/deployment/pom.xml
+++ b/extensions/support/jetty/deployment/pom.xml
@@ -20,13 +20,13 @@
<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";>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-jetty-common-parent</artifactId>
+ <artifactId>camel-quarkus-support-jetty-parent</artifactId>
<version>0.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-quarkus-jetty-common-deployment</artifactId>
- <name>Camel Quarkus :: Jetty :: Common :: Deployment</name>
+ <artifactId>camel-quarkus-support-jetty-deployment</artifactId>
+ <name>Camel Quarkus :: Support :: Jetty :: Deployment</name>
<dependencyManagement>
<dependencies>
@@ -47,7 +47,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-jetty-common</artifactId>
+ <artifactId>camel-quarkus-support-jetty</artifactId>
</dependency>
</dependencies>
diff --git
a/extensions/jetty-common/deployment/src/main/java/org/apache/camel/quarkus/jetty/common/deployment/JettyProcessor.java
b/extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/jetty/common/deployment/JettyProcessor.java
similarity index 100%
rename from
extensions/jetty-common/deployment/src/main/java/org/apache/camel/quarkus/jetty/common/deployment/JettyProcessor.java
rename to
extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/jetty/common/deployment/JettyProcessor.java
diff --git a/extensions/jetty-common/pom.xml b/extensions/support/jetty/pom.xml
similarity index 88%
copy from extensions/jetty-common/pom.xml
copy to extensions/support/jetty/pom.xml
index 0c7b14f..a3586db 100644
--- a/extensions/jetty-common/pom.xml
+++ b/extensions/support/jetty/pom.xml
@@ -23,13 +23,13 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<version>0.2.1-SNAPSHOT</version>
- <relativePath>../../poms/build-parent/pom.xml</relativePath>
+ <relativePath>../../../poms/build-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-quarkus-jetty-common-parent</artifactId>
- <name>Camel Quarkus :: Jetty :: Common</name>
+ <artifactId>camel-quarkus-support-jetty-parent</artifactId>
+ <name>Camel Quarkus :: Support :: Jetty</name>
<packaging>pom</packaging>
<modules>
<module>deployment</module>
diff --git a/extensions/jetty-common/runtime/pom.xml
b/extensions/support/jetty/runtime/pom.xml
similarity index 93%
rename from extensions/jetty-common/runtime/pom.xml
rename to extensions/support/jetty/runtime/pom.xml
index 324c408..e48e30b 100644
--- a/extensions/jetty-common/runtime/pom.xml
+++ b/extensions/support/jetty/runtime/pom.xml
@@ -20,13 +20,13 @@
<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";>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-jetty-common-parent</artifactId>
+ <artifactId>camel-quarkus-support-jetty-parent</artifactId>
<version>0.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-quarkus-jetty-common</artifactId>
- <name>Camel Quarkus :: Jetty :: Common :: Runtime</name>
+ <artifactId>camel-quarkus-support-jetty</artifactId>
+ <name>Camel Quarkus :: Support :: Jetty :: Runtime</name>
<dependencyManagement>
<dependencies>
diff --git a/extensions/jetty-common/pom.xml b/extensions/support/pom.xml
similarity index 80%
rename from extensions/jetty-common/pom.xml
rename to extensions/support/pom.xml
index 0c7b14f..f07058b 100644
--- a/extensions/jetty-common/pom.xml
+++ b/extensions/support/pom.xml
@@ -21,19 +21,18 @@
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-build-parent</artifactId>
+ <artifactId>camel-quarkus-extensions</artifactId>
<version>0.2.1-SNAPSHOT</version>
- <relativePath>../../poms/build-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-quarkus-jetty-common-parent</artifactId>
- <name>Camel Quarkus :: Jetty :: Common</name>
+ <artifactId>camel-quarkus-extensions-support</artifactId>
+ <name>Camel Quarkus :: Support</name>
<packaging>pom</packaging>
+
<modules>
- <module>deployment</module>
- <module>runtime</module>
+ <module>jetty</module>
+ <module>xstream</module>
</modules>
-
</project>
diff --git a/extensions/xstream-common/deployment/pom.xml
b/extensions/support/xstream/deployment/pom.xml
similarity index 90%
rename from extensions/xstream-common/deployment/pom.xml
rename to extensions/support/xstream/deployment/pom.xml
index d74743e..ee45acc 100644
--- a/extensions/xstream-common/deployment/pom.xml
+++ b/extensions/support/xstream/deployment/pom.xml
@@ -20,13 +20,13 @@
<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";>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-xstream-common-parent</artifactId>
+ <artifactId>camel-quarkus-support-xstream-parent</artifactId>
<version>0.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-quarkus-xstream-common-deployment</artifactId>
- <name>Camel Quarkus :: XStream :: Common :: Deployment</name>
+ <artifactId>camel-quarkus-support-xstream-deployment</artifactId>
+ <name>Camel Quarkus :: Support :: XStream :: Deployment</name>
<dependencyManagement>
<dependencies>
@@ -47,7 +47,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-xstream-common</artifactId>
+ <artifactId>camel-quarkus-support-xstream</artifactId>
</dependency>
</dependencies>
diff --git
a/extensions/xstream-common/deployment/src/main/java/org/apache/camel/quarkus/xstream/common/deployment/XStreamProcessor.java
b/extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/xstream/common/deployment/XStreamProcessor.java
similarity index 100%
rename from
extensions/xstream-common/deployment/src/main/java/org/apache/camel/quarkus/xstream/common/deployment/XStreamProcessor.java
rename to
extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/xstream/common/deployment/XStreamProcessor.java
diff --git a/extensions/xstream-common/pom.xml
b/extensions/support/xstream/pom.xml
similarity index 88%
rename from extensions/xstream-common/pom.xml
rename to extensions/support/xstream/pom.xml
index 29e1021..ec365d9 100644
--- a/extensions/xstream-common/pom.xml
+++ b/extensions/support/xstream/pom.xml
@@ -23,13 +23,13 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent</artifactId>
<version>0.2.1-SNAPSHOT</version>
- <relativePath>../../poms/build-parent/pom.xml</relativePath>
+ <relativePath>../../../poms/build-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-quarkus-xstream-common-parent</artifactId>
- <name>Camel Quarkus :: XStream :: Common</name>
+ <artifactId>camel-quarkus-support-xstream-parent</artifactId>
+ <name>Camel Quarkus :: Support :: XStream</name>
<packaging>pom</packaging>
<modules>
<module>deployment</module>
diff --git a/extensions/xstream-common/runtime/pom.xml
b/extensions/support/xstream/runtime/pom.xml
similarity index 93%
rename from extensions/xstream-common/runtime/pom.xml
rename to extensions/support/xstream/runtime/pom.xml
index 92695f2..4801e4f 100644
--- a/extensions/xstream-common/runtime/pom.xml
+++ b/extensions/support/xstream/runtime/pom.xml
@@ -20,13 +20,13 @@
<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";>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-xstream-common-parent</artifactId>
+ <artifactId>camel-quarkus-support-xstream-parent</artifactId>
<version>0.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-quarkus-xstream-common</artifactId>
- <name>Camel Quarkus :: XStream :: Common :: Runtime</name>
+ <artifactId>camel-quarkus-support-xstream</artifactId>
+ <name>Camel Quarkus :: Support :: XStream :: Runtime</name>
<dependencyManagement>
<dependencies>
diff --git a/poms/bom-deployment/pom.xml b/poms/bom-deployment/pom.xml
index 5831794..0f3553e 100644
--- a/poms/bom-deployment/pom.xml
+++ b/poms/bom-deployment/pom.xml
@@ -62,6 +62,18 @@
<scope>import</scope>
</dependency>
+ <!-- Camel Quarkus support deployment modules, in alphabetical
order -->
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-jetty-deployment</artifactId>
+ <version>${camel-quarkus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+
<artifactId>camel-quarkus-support-xstream-deployment</artifactId>
+ <version>${camel-quarkus.version}</version>
+ </dependency>
+
<!-- Camel Quarkus deployment modules, in alphabetical order -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -120,11 +132,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-jetty-common-deployment</artifactId>
- <version>${camel-quarkus.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-http-common-deployment</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 539518d..55eb9c9 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -212,35 +212,37 @@
<version>${camel.version}</version>
</dependency>
- <!-- Camel Quarkus Common (in alphabetical order) -->
+ <!-- Camel Quarkus Support (in alphabetical order) -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core</artifactId>
+ <artifactId>camel-quarkus-support-jetty</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core-cloud</artifactId>
+ <artifactId>camel-quarkus-support-xstream</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
+
+ <!-- Camel Quarkus Common (in alphabetical order) -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-http-common</artifactId>
+ <artifactId>camel-quarkus-core</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-jetty-common</artifactId>
+ <artifactId>camel-quarkus-core-cloud</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-xml-common</artifactId>
+ <artifactId>camel-quarkus-http-common</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-xstream-common</artifactId>
+ <artifactId>camel-quarkus-xml-common</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
