[camel] branch master updated: [CAMEL-13177] Upgrade to maven-bundle-plugin 4.2.0 and remove stuff that was used to support spring-dm

[gn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 2bfb379  [CAMEL-13177] Upgrade to maven-bundle-plugin 4.2.0 and remove stuff that was used to support spring-dm
2bfb379 is described below

commit 2bfb3794057351d44bcb9d11e2d52af88dde3541
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon May 6 16:08:01 2019 +0200

    [CAMEL-13177] Upgrade to maven-bundle-plugin 4.2.0 and remove stuff that was used to support spring-dm
---
 .../camel/spring/handler/CamelNamespaceHandler.java | 21 ---------------------
 parent/pom.xml                                      |  4 ++--
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
index 3617e7b..76f6660 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
@@ -154,28 +154,7 @@ public class CamelNamespaceHandler extends NamespaceHandlerSupport {
         parserMap.put("errorHandler", errorHandlerParser);
 
         // camel context
-        boolean osgi = false;
         Class<?> cl = CamelContextFactoryBean.class;
-        // These code will try to detected if we are in the OSGi environment.
-        // If so, camel will use the OSGi version of CamelContextFactoryBean to create the CamelContext.
-        try {
-            // Try to load the BundleActivator first
-            Class.forName("org.osgi.framework.BundleActivator");
-            Class<?> c = Class.forName("org.apache.camel.osgi.Activator");
-            Method mth = c.getDeclaredMethod("getBundle");
-            Object bundle = mth.invoke(null);
-            if (bundle != null) {
-                cl = Class.forName("org.apache.camel.osgi.CamelContextFactoryBean");
-                osgi = true;
-            }
-        } catch (Throwable t) {
-            // not running with camel-core-osgi so we fallback to the regular factory bean
-            LOG.trace("Cannot find class so assuming not running in OSGi container: {}", t.getMessage());
-        }
-        if (osgi) {
-            LOG.info("OSGi environment detected.");
-        } 
-        LOG.debug("Using {} as CamelContextBeanDefinitionParser", cl.getCanonicalName());
         registerParser("camelContext", new CamelContextBeanDefinitionParser(cl));
     }
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 6102246..98b6eb5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -469,7 +469,7 @@
         <maven-archetype-packaging-version>2.3</maven-archetype-packaging-version>
         <maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
         <maven-bundle-version>${maven-bundle-plugin-version}</maven-bundle-version>
-        <maven-bundle-plugin-version>4.1.0</maven-bundle-plugin-version>
+        <maven-bundle-plugin-version>4.2.0</maven-bundle-plugin-version>
         <maven-checkstyle-plugin-version>3.0.0</maven-checkstyle-plugin-version>
         <maven-checkstyle-version>7.6.1</maven-checkstyle-version>
         <maven-owasp-plugin-version>4.0.2</maven-owasp-plugin-version>
@@ -6114,7 +6114,7 @@
         <profile>
             <id>faster-builds</id>
             <properties>
-                <maven-bundle-plugin-version>4.1.1-SNAPSHOT</maven-bundle-plugin-version>
+                <maven-bundle-plugin-version>4.2.0</maven-bundle-plugin-version>
             </properties>
         </profile>
     </profiles>