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 6964817a45544d97d8fa6b01d6d0b5a392c4f195 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Jul 31 15:29:41 2019 +0200 CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Aligned Karaf feature --- platforms/karaf/features/src/main/resources/features.xml | 4 ++-- .../camel/itest/karaf/{CamelHttp4Test.java => CamelHttpTest.java} | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 07bea56..57010c0 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1260,14 +1260,14 @@ <bundle dependency='true'>mvn:ca.uhn.hapi/hapi-osgi-base/${hapi-version}</bundle> <bundle>mvn:org.apache.camel/camel-hl7/${project.version}</bundle> </feature> - <feature name='camel-http4' version='${project.version}' start-level='50'> + <feature name='camel-http' version='${project.version}' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <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-http4/${project.version}</bundle> + <bundle>mvn:org.apache.camel/camel-http/${project.version}</bundle> </feature> <feature name='camel-hystrix' version='${project.version}' start-level='50'> <feature prerequisite='true'>wrap</feature> diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java similarity index 94% rename from tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java rename to tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java index eab3ab8..8980abc 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java @@ -21,13 +21,13 @@ import org.junit.runner.RunWith; import org.ops4j.pax.exam.junit.PaxExam; @RunWith(PaxExam.class) -public class CamelHttp4Test extends BaseKarafTest { +public class CamelHttpTest extends BaseKarafTest { - public static final String COMPONENT = extractName(CamelHttp4Test.class); + public static final String COMPONENT = extractName(CamelHttpTest.class); @Test public void test() throws Exception { testComponent(COMPONENT); } -} \ No newline at end of file +}
