[camel-karaf] branch master updated: Added integration test again for camel-osgi-activator and fix

[acosentino]

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


The following commit(s) were added to refs/heads/master by this push:
     new 0b7cb5b  Added integration test again for camel-osgi-activator and fix
0b7cb5b is described below

commit 0b7cb5bdad4216939db86dac41789633f30d5a68
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Mar 25 09:28:48 2020 +0100

    Added integration test again for camel-osgi-activator and fix
---
 components/camel-osgi-activator/pom.xml                             | 6 +++---
 components/camel-osgi-activator/src/assembly/test-bundles.xml       | 4 ++--
 .../apache/camel/component/osgi/activator/CamelOsgiActivatorIT.java | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/camel-osgi-activator/pom.xml 
b/components/camel-osgi-activator/pom.xml
index bde0d05..393205a 100644
--- a/components/camel-osgi-activator/pom.xml
+++ b/components/camel-osgi-activator/pom.xml
@@ -182,9 +182,9 @@
                             <goal>test</goal>
                         </goals>
                         <configuration>
-                            <excludes>
-                                <exclude>**/*IT.java</exclude>
-                            </excludes>
+                            <includes>
+                                <include>**/*IT.java</include>
+                            </includes>
                             
<forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
                         </configuration>
                     </execution>
diff --git a/components/camel-osgi-activator/src/assembly/test-bundles.xml 
b/components/camel-osgi-activator/src/assembly/test-bundles.xml
index a7798e9..7b891b3 100644
--- a/components/camel-osgi-activator/src/assembly/test-bundles.xml
+++ b/components/camel-osgi-activator/src/assembly/test-bundles.xml
@@ -36,7 +36,7 @@
         <include>org.apache.camel:camel-core-osgi</include>
         <include>org.apache.camel:camel-core-languages</include>
         <include>org.apache.camel:camel-management-api</include>
-        <include>org.apache.camel:camel-osgi-activator</include>
+        <include>org.apache.camel.karaf:camel-osgi-activator</include>
         <include>org.apache.camel:camel-support</include>
         <include>org.apache.camel:camel-util</include>
         <include>org.apache.camel:camel-timer</include>
@@ -45,4 +45,4 @@
       <scope>test</scope>
     </dependencySet>
   </dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git 
a/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/CamelOsgiActivatorIT.java
 
b/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/CamelOsgiActivatorIT.java
index d08df32..c97b677 100644
--- 
a/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/CamelOsgiActivatorIT.java
+++ 
b/components/camel-osgi-activator/src/test/java/org/apache/camel/component/osgi/activator/CamelOsgiActivatorIT.java
@@ -80,7 +80,7 @@ public class CamelOsgiActivatorIT {
                 assertEquals("Camel Core OSGi not activated", Bundle.ACTIVE, 
b.getState());
             }
             
-            if 
("org.apache.camel.camel-osgi-activator".equals(b.getSymbolicName())) {
+            if 
("org.apache.camel.karaf.camel-osgi-activator".equals(b.getSymbolicName())) {
                 hasCamelCoreOsgiActivator = true;
                 assertEquals("Camel OSGi Activator not activated", 
Bundle.ACTIVE, b.getState());
             }