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 2019/08/05 14:26:40 UTC
[camel] 04/09: CAMEL-13792 - Rename components to default names,
Camel-mina2 to camel-mina - Updated references
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.git
commit 22ac72db51780283339a3c1e6352fabb42969d18
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 15:25:23 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina - Updated references
---
apache-camel/pom.xml | 4 ++--
apache-camel/src/main/descriptors/common-bin.xml | 4 ++--
bom/camel-bom/pom.xml | 4 ++--
components/camel-hl7/pom.xml | 4 ++--
components/camel-syslog/pom.xml | 2 +-
components/pom.xml | 2 +-
examples/camel-example-loadbalancing/pom.xml | 2 +-
parent/pom.xml | 4 ++--
platforms/spring-boot/components-starter/README.adoc | 1 -
.../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 4 ++--
10 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index bf322aa..158609f 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -984,7 +984,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2</artifactId>
+ <artifactId>camel-mina</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -2488,7 +2488,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2-starter</artifactId>
+ <artifactId>camel-mina-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 9bcdafa..077c358 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -217,7 +217,7 @@
<include>org.apache.camel:camel-micrometer</include>
<include>org.apache.camel:camel-microprofile-config</include>
<include>org.apache.camel:camel-milo</include>
- <include>org.apache.camel:camel-mina2</include>
+ <include>org.apache.camel:camel-mina</include>
<include>org.apache.camel:camel-mllp</include>
<include>org.apache.camel:camel-mock</include>
<include>org.apache.camel:camel-mongodb</include>
@@ -557,7 +557,7 @@
<include>org.apache.camel:camel-metrics-starter</include>
<include>org.apache.camel:camel-micrometer-starter</include>
<include>org.apache.camel:camel-milo-starter</include>
- <include>org.apache.camel:camel-mina2-starter</include>
+ <include>org.apache.camel:camel-mina-starter</include>
<include>org.apache.camel:camel-mllp-starter</include>
<include>org.apache.camel:camel-mock-starter</include>
<include>org.apache.camel:camel-mongodb-gridfs-starter</include>
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 39c28f9..d3874c3 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -1890,12 +1890,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2</artifactId>
+ <artifactId>camel-mina</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2-starter</artifactId>
+ <artifactId>camel-mina-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml
index 402687e..650c66e 100644
--- a/components/camel-hl7/pom.xml
+++ b/components/camel-hl7/pom.xml
@@ -100,7 +100,7 @@
<optional>true</optional>
</dependency>
- <!-- for MLLP either use mina2 or camel-netty4 -->
+ <!-- for MLLP either use mina or camel-netty4 -->
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
@@ -120,7 +120,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2</artifactId>
+ <artifactId>camel-mina</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-syslog/pom.xml b/components/camel-syslog/pom.xml
index edc2ed5..89b7ae6 100644
--- a/components/camel-syslog/pom.xml
+++ b/components/camel-syslog/pom.xml
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2</artifactId>
+ <artifactId>camel-mina</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/pom.xml b/components/pom.xml
index 18773aa..82aae97 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -235,7 +235,7 @@
<module>camel-micrometer</module>
<module>camel-microprofile-config</module>
<module>camel-milo</module>
- <module>camel-mina2</module>
+ <module>camel-mina</module>
<module>camel-mllp</module>
<module>camel-mongodb</module>
<module>camel-mongodb-gridfs</module>
diff --git a/examples/camel-example-loadbalancing/pom.xml b/examples/camel-example-loadbalancing/pom.xml
index d24ff4b..44dedfe 100644
--- a/examples/camel-example-loadbalancing/pom.xml
+++ b/examples/camel-example-loadbalancing/pom.xml
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2</artifactId>
+ <artifactId>camel-mina</artifactId>
</dependency>
<!-- logging -->
diff --git a/parent/pom.xml b/parent/pom.xml
index 65fe4b6..7f15d6e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1699,7 +1699,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2</artifactId>
+ <artifactId>camel-mina</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -3233,7 +3233,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2-starter</artifactId>
+ <artifactId>camel-mina-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/platforms/spring-boot/components-starter/README.adoc b/platforms/spring-boot/components-starter/README.adoc
index fe5a480..f8db999 100644
--- a/platforms/spring-boot/components-starter/README.adoc
+++ b/platforms/spring-boot/components-starter/README.adoc
@@ -19,7 +19,6 @@ The following components do not have a starter because of compatibility issues:
* **camel-core-xml**
* **camel-eventadmin** (intended for OSGi only)
* **camel-ibatis** (`camel-mybatis-starter` is included)
-* **camel-mina** (`camel-mina2-starter` is included)
* **camel-paxlogging** (intended for OSGi only)
* **camel-quartz** (`camel-quartz2-starter` is included)
* **camel-scala**
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index a05920e..c6a83b6 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -2115,12 +2115,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2</artifactId>
+ <artifactId>camel-mina</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2-starter</artifactId>
+ <artifactId>camel-mina-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>