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 ef7e19a82acc24b851364a4707340e34b3f38ef2 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Wed Aug 7 14:01:53 2019 +0200 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Karaf integration tests and features updated --- platforms/karaf/features/src/main/resources/features.xml | 10 +++++----- .../itest/karaf/{CamelNetty4Test.java => CamelNettyTest.java} | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 58ac0fe..384ba35 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1251,7 +1251,7 @@ <bundle>mvn:org.apache.camel/camel-hipchat/${project.version}</bundle> </feature> <feature name='camel-hl7' version='${project.version}' start-level='50'> - <feature version='${project.version}'>camel-netty4</feature> + <feature version='${project.version}'>camel-netty</feature> <bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina2-version}</bundle> <bundle dependency='true'>mvn:ca.uhn.hapi/hapi-osgi-base/${hapi-version}</bundle> <bundle>mvn:org.apache.camel/camel-hl7/${project.version}</bundle> @@ -1838,7 +1838,7 @@ <bundle dependency='true'>mvn:net.i2p.crypto/eddsa/${eddsa-version}</bundle> <bundle>mvn:org.apache.camel/camel-nats/${project.version}</bundle> </feature> - <feature name='camel-netty4' version='${project.version}' start-level='50'> + <feature name='camel-netty' version='${project.version}' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:io.netty/netty-resolver/${netty-version}</bundle> <bundle dependency='true'>mvn:io.netty/netty-common/${netty-version}</bundle> @@ -1852,10 +1852,10 @@ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle> <bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle> <bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle> - <bundle>mvn:org.apache.camel/camel-netty4/${project.version}</bundle> + <bundle>mvn:org.apache.camel/camel-netty/${project.version}</bundle> </feature> <feature name='camel-netty4-http' version='${project.version}' start-level='50'> - <feature version='${project.version}'>camel-netty4</feature> + <feature version='${project.version}'>camel-netty</feature> <bundle dependency='true'>mvn:io.netty/netty-codec-http/${netty-version}</bundle> <bundle>mvn:org.apache.camel/camel-netty4-http/${project.version}</bundle> </feature> @@ -2492,7 +2492,7 @@ </feature> <feature name='camel-syslog' version='${project.version}' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <feature version='${project.version}'>camel-netty4</feature> + <feature version='${project.version}'>camel-netty</feature> <bundle>mvn:org.apache.camel/camel-syslog/${project.version}</bundle> </feature> <feature name='camel-tagsoup' version='${project.version}' start-level='50'> diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java similarity index 94% rename from tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4Test.java rename to tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java index dbbe05e..3fba8d3 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4Test.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java @@ -21,9 +21,9 @@ import org.junit.runner.RunWith; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) -public class CamelNetty4Test extends BaseKarafTest { +public class CamelNettyTest extends BaseKarafTest { - public static final String COMPONENT = extractName(CamelNetty4Test.class); + public static final String COMPONENT = extractName(CamelNettyTest.class); @Test public void test() throws Exception { @@ -31,4 +31,4 @@ public class CamelNetty4Test extends BaseKarafTest { } -} \ No newline at end of file +}