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 2e6a71059562ab3ee7d1184e7b698a635aebcada
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Aug 7 11:05:45 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to
camel-netty - updated references
---
apache-camel/pom.xml | 4 ++--
apache-camel/src/main/descriptors/common-bin.xml | 4 ++--
bom/camel-bom/pom.xml | 4 ++--
components/camel-ganglia/pom.xml | 2 +-
components/camel-hl7/pom.xml | 4 ++--
components/camel-netty4-http/pom.xml | 2 +-
components/camel-syslog/pom.xml | 2 +-
components/pom.xml | 2 +-
examples/camel-example-netty-custom-correlation/pom.xml | 2 +-
parent/pom.xml | 4 ++--
.../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 4 ++--
tests/camel-itest/pom.xml | 2 +-
tests/camel-jmh/pom.xml | 2 +-
.../src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java | 2 --
.../src/main/resources/spring-boot-fix-dependencies.properties | 2 +-
15 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 8ceec78..ef569f0 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -1044,7 +1044,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -2553,7 +2553,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4-starter</artifactId>
+ <artifactId>camel-netty-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 37992cb..35560aa 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -229,7 +229,7 @@
<include>org.apache.camel:camel-mybatis</include>
<include>org.apache.camel:camel-nagios</include>
<include>org.apache.camel:camel-nats</include>
- <include>org.apache.camel:camel-netty4</include>
+ <include>org.apache.camel:camel-netty</include>
<include>org.apache.camel:camel-netty4-http</include>
<include>org.apache.camel:camel-nsq</include>
<include>org.apache.camel:camel-ognl</include>
@@ -570,7 +570,7 @@
<include>org.apache.camel:camel-nagios-starter</include>
<include>org.apache.camel:camel-nats-starter</include>
<include>org.apache.camel:camel-netty4-http-starter</include>
- <include>org.apache.camel:camel-netty4-starter</include>
+ <include>org.apache.camel:camel-netty-starter</include>
<include>org.apache.camel:camel-nsq-starter</include>
<include>org.apache.camel:camel-ognl-starter</include>
<include>org.apache.camel:camel-olingo2-starter</include>
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 1bf35f8..7cbe43f 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2010,7 +2010,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -2025,7 +2025,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4-starter</artifactId>
+ <artifactId>camel-netty-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/components/camel-ganglia/pom.xml b/components/camel-ganglia/pom.xml
index 0110d93..39757a0 100644
--- a/components/camel-ganglia/pom.xml
+++ b/components/camel-ganglia/pom.xml
@@ -60,7 +60,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml
index 650c66e..2a1085e 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 mina or camel-netty4 -->
+ <!-- for MLLP either use mina or camel-netty -->
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
@@ -108,7 +108,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
<optional>true</optional>
</dependency>
diff --git a/components/camel-netty4-http/pom.xml
b/components/camel-netty4-http/pom.xml
index c1ef35f..e0f1e77 100644
--- a/components/camel-netty4-http/pom.xml
+++ b/components/camel-netty4-http/pom.xml
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
</dependency>
<!-- we use netty-all as dependency which has HTTP included -->
<dependency>
diff --git a/components/camel-syslog/pom.xml b/components/camel-syslog/pom.xml
index 89b7ae6..e724633 100644
--- a/components/camel-syslog/pom.xml
+++ b/components/camel-syslog/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
</dependency>
<!-- test dependencies -->
diff --git a/components/pom.xml b/components/pom.xml
index eb3529f..ca6efcf 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -246,7 +246,7 @@
<module>camel-mybatis</module>
<module>camel-nagios</module>
<module>camel-nats</module>
- <module>camel-netty4</module>
+ <module>camel-netty</module>
<module>camel-netty4-http</module>
<module>camel-nsq</module>
<module>camel-ognl</module>
diff --git a/examples/camel-example-netty-custom-correlation/pom.xml
b/examples/camel-example-netty-custom-correlation/pom.xml
index ee12ffd..14f6f5a 100644
--- a/examples/camel-example-netty-custom-correlation/pom.xml
+++ b/examples/camel-example-netty-custom-correlation/pom.xml
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
</dependency>
<!-- logging -->
diff --git a/parent/pom.xml b/parent/pom.xml
index d31dff4..c2e6374 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1759,7 +1759,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -3298,7 +3298,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4-starter</artifactId>
+ <artifactId>camel-netty-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
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 37fbfe8..cf29609 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
@@ -2235,7 +2235,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -2250,7 +2250,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4-starter</artifactId>
+ <artifactId>camel-netty-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index 6c70a47..b06809d 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -155,7 +155,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tests/camel-jmh/pom.xml b/tests/camel-jmh/pom.xml
index 66c1ed8..140a7a9 100644
--- a/tests/camel-jmh/pom.xml
+++ b/tests/camel-jmh/pom.xml
@@ -59,7 +59,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
index 2d51171..fb243e3 100644
---
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
+++
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
@@ -104,8 +104,6 @@ public final class DocumentationHelper {
return new
File("../camel-http/target/classes/org/apache/camel/component/http/https.json");
} else if ("netty".equals(extendsScheme)) {
return new
File("../camel-netty/target/classes/org/apache/camel/component/netty/netty.json");
- } else if ("netty4".equals(extendsScheme)) {
- return new
File("../camel-netty4/target/classes/org/apache/camel/component/netty4/netty4.json");
} else if ("servlet".equals(extendsScheme)) {
return new
File("../camel-servlet/target/classes/org/apache/camel/component/servlet/servlet.json");
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
index 5f579af..cccb344 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
+++
b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
@@ -30,7 +30,7 @@
camel-github=org.eclipse.mylyn.github:org.eclipse.egit.github.core:${egit-github
camel-guava-eventbus=com.google.guava:guava:${google-guava-version}
# Defaulting to netty4 in the starter
-camel-hl7=org.apache.camel:camel-netty4:${project.version}
+camel-hl7=org.apache.camel:camel-netty:${project.version}
# Camel Core requires on APT for the usage of CollectionStringBuffer.
# Remove this dependency if it was a mistake
