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 2020/03/25 10:22:26 UTC
[camel-karaf] 05/05: Camel-test-karaf: Fixed the groupId and skip
test for camel-itest-osgi
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-karaf.git
commit e2518a49f40e1fc17cf6681bf8cfe025d230f6d9
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 25 11:11:15 2020 +0100
Camel-test-karaf: Fixed the groupId and skip test for camel-itest-osgi
---
.../main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java | 2 +-
pom.xml | 5 +++++
tests/camel-itest-osgi/pom.xml | 3 ++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
index 4297bdb..ed8cc9f 100644
--- a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
+++ b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
@@ -365,7 +365,7 @@ public abstract class AbstractFeatureTest {
features(getCamelKarafFeatureUrl(), camelFeatures),
// install camel-test-karaf as bundle (not feature as the feature causes a bundle refresh that invalidates the @Inject bundleContext)
- mavenBundle().groupId("org.apache.camel").artifactId("camel-test-karaf").versionAsInProject(),
+ mavenBundle().groupId("org.apache.camel.karaf").artifactId("camel-test-karaf").versionAsInProject(),
when(JavaVersionUtil.getMajorVersion() >= 9)
.useOptions(
systemProperty("pax.exam.osgi.`unresolved.fail").value("true"),
diff --git a/pom.xml b/pom.xml
index 1137571..21428a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -861,6 +861,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-test-karaf</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
<version>${camel-version}</version>
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index f631bf6..e85ef07 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.camel</groupId>
+ <groupId>org.apache.camel.karaf</groupId>
<artifactId>camel-test-karaf</artifactId>
<scope>test</scope>
</dependency>
@@ -93,6 +93,7 @@
<karafVersion>${karaf4-version}</karafVersion>
<camelKarafFeatureVersion>${project.version}</camelKarafFeatureVersion>
</systemPropertyVariables>
+ <skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>