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

gnodet pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit ed124aef1887f4f2de319403c24e05fdd1472e02
Author: Guillaume Nodet <[email protected]>
AuthorDate: Fri Oct 12 11:15:56 2018 +0200

    Various build fixes
---
 .../DefaultManagementLifecycleStrategy.java        |  2 +-
 .../apache/camel/component/cxf/CxfComponent.java   |  2 +-
 .../camel/component/elsql/ElsqlComponent.java      |  1 +
 .../org/apache/camel/http/common/HttpHelper.java   |  1 +
 .../InfinispanRemoteQueryProducerIT.java           |  2 +-
 .../apache/camel/component/mllp/MllpEndpoint.java  |  1 +
 .../netty4/DefaultServerInitializerFactory.java    |  2 +-
 .../integration/SpringIntegrationEndpoint.java     |  6 ---
 .../converter/SpringIntegrationConverter.java      |  6 +--
 .../apache/camel/component/sql/SqlComponent.java   |  1 +
 .../dataformat/xstream/XStreamDataFormat.java      |  1 +
 .../catalog/CamelCatalogMBeanExporterTest.java     | 52 ----------------------
 .../HazelcastComponentAutoConfiguration.java       |  2 +-
 .../camel-spring-boot-dependencies/pom.xml         |  2 +-
 14 files changed, 14 insertions(+), 67 deletions(-)

diff --git 
a/camel-management-impl/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
 
b/camel-management-impl/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
index fc3db18..60522cc 100644
--- 
a/camel-management-impl/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
+++ 
b/camel-management-impl/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
@@ -634,7 +634,7 @@ public class DefaultManagementLifecycleStrategy extends 
ServiceSupport implement
             Object mr = 
getManagementObjectStrategy().getManagedObjectForRoute(camelContext, route);
 
             // skip unmanaged routes
-            if (!getManagementStrategy().isManaged(mr, null)) {
+            if (!getManagementStrategy().isManaged(mr)) {
                 log.trace("The route is not managed: {}", route);
                 continue;
             }
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
index 9f60a86..c0f79c9 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
@@ -82,7 +82,7 @@ public class CxfComponent extends 
HeaderFilterStrategyComponent implements SSLCo
 
         Object value = parameters.remove("setDefaultBus");
         if (value != null) {
-            LOG.warn("The option setDefaultBus is @deprecated, use name 
defaultBus instead");
+            log.warn("The option setDefaultBus is @deprecated, use name 
defaultBus instead");
             if (!parameters.containsKey("defaultBus")) {
                 parameters.put("defaultBus", value);
             }
diff --git 
a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java
 
b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java
index 24243ba..744a890 100644
--- 
a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java
+++ 
b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlComponent.java
@@ -21,6 +21,7 @@ import javax.sql.DataSource;
 
 import com.opengamma.elsql.ElSqlConfig;
 import org.apache.camel.Endpoint;
+import org.apache.camel.support.CamelContextHelper;
 import org.apache.camel.support.DefaultComponent;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.support.IntrospectionSupport;
diff --git 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
index 51d34ae..a72e2b5 100644
--- 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
+++ 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
@@ -32,6 +32,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
+import org.apache.camel.Producer;
 import org.apache.camel.RuntimeExchangeException;
 import org.apache.camel.converter.stream.CachedOutputStream;
 import org.apache.camel.impl.DefaultCamelContext;
diff --git 
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteQueryProducerIT.java
 
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteQueryProducerIT.java
index c3f6b21..6726d3f 100644
--- 
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteQueryProducerIT.java
+++ 
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteQueryProducerIT.java
@@ -138,7 +138,7 @@ public class InfinispanRemoteQueryProducerIT extends 
CamelTestSupport {
         Exchange request = template.request("direct:start", new Processor() {
             @Override
             public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(OPERATION, QUERY);
+                exchange.getIn().setHeader(OPERATION, 
InfinispanOperation.QUERY);
             }
         });
         assertNull(request.getException());
diff --git 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java
 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java
index 655da8a..4103eeb 100644
--- 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java
+++ 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java
@@ -20,6 +20,7 @@ package org.apache.camel.component.mllp;
 import java.io.IOException;
 import java.net.Socket;
 import java.net.SocketAddress;
+import java.nio.charset.Charset;
 import java.util.Date;
 
 import org.apache.camel.Consumer;
diff --git 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultServerInitializerFactory.java
 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultServerInitializerFactory.java
index 32930c6..6b257a6 100644
--- 
a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultServerInitializerFactory.java
+++ 
b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultServerInitializerFactory.java
@@ -45,7 +45,7 @@ public class DefaultServerInitializerFactory extends 
ServerInitializerFactory {
         try {
             this.sslContext = createSSLContext(null, configuration);
         } catch (Exception e) {
-            throw ObjectHelper.wrapRuntimeCamelException(e);
+            throw RuntimeCamelException.wrapRuntimeCamelException(e);
         }
 
         if (sslContext != null) {
diff --git 
a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
 
b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
index 28b3f5c..0c33d4a 100644
--- 
a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
+++ 
b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
@@ -48,12 +48,6 @@ public class SpringIntegrationEndpoint extends 
DefaultEndpoint {
         this.defaultChannel = channel;
     }
 
-    @Deprecated
-    public SpringIntegrationEndpoint(String uri, MessageChannel channel, 
CamelContext context) {
-        super(uri, context);
-        this.messageChannel = channel;
-    }
-
     public Producer createProducer() throws Exception {
         return new SpringIntegrationProducer((SpringCamelContext) 
getCamelContext(), this);
     }
diff --git 
a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java
 
b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java
index 05d66ad..2830e4a 100644
--- 
a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java
+++ 
b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.spring.integration.converter;
 
+import org.apache.camel.CamelContext;
 import org.apache.camel.Converter;
 import org.apache.camel.Endpoint;
 import org.apache.camel.component.spring.integration.SpringIntegrationEndpoint;
@@ -36,9 +37,8 @@ public final class SpringIntegrationConverter {
     }
 
     @Converter
-    @SuppressWarnings("deprecation")
     public static Endpoint toEndpoint(final MessageChannel channel) throws 
Exception {
-        Endpoint answer = new 
SpringIntegrationEndpoint("spring-integration://" + channel.toString(), 
channel, null);
+        Endpoint answer = new 
SpringIntegrationEndpoint("spring-integration://" + channel.toString(), 
channel.toString(), null);
         return answer;
     }
 
@@ -59,7 +59,7 @@ public final class SpringIntegrationConverter {
 
     @Converter
     public static org.apache.camel.Message toCamelMessage(final 
org.springframework.messaging.Message<?> springMessage) throws Exception {
-        return new SpringIntegrationMessage(null, springMessage);
+        return new SpringIntegrationMessage((CamelContext) null, 
springMessage);
     }
 
 }
diff --git 
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
 
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
index 56f7f7a..ef91018 100644
--- 
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
+++ 
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
@@ -22,6 +22,7 @@ import javax.sql.DataSource;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
+import org.apache.camel.support.CamelContextHelper;
 import org.apache.camel.support.DefaultComponent;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.support.IntrospectionSupport;
diff --git 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java
 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java
index 02ead3a..86aa9c0 100644
--- 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java
+++ 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java
@@ -30,6 +30,7 @@ import com.thoughtworks.xstream.io.xml.QNameMap;
 import com.thoughtworks.xstream.io.xml.StaxReader;
 import com.thoughtworks.xstream.io.xml.StaxWriter;
 import org.apache.camel.Exchange;
+import org.apache.camel.spi.ClassResolver;
 import org.apache.camel.spi.DataFormat;
 import org.apache.camel.util.IOHelper;
 
diff --git 
a/platforms/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogMBeanExporterTest.java
 
b/platforms/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogMBeanExporterTest.java
deleted file mode 100644
index 4c24e50..0000000
--- 
a/platforms/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogMBeanExporterTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.catalog;
-
-import java.lang.management.ManagementFactory;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-@Deprecated
-@Ignore
-public class CamelCatalogMBeanExporterTest {
-
-    private CamelCatalogMBeanExporter exporter = new 
CamelCatalogMBeanExporter();
-
-    @Test
-    public void testMBeanExporter() throws Exception {
-        exporter.init();
-
-        ObjectName on = exporter.getObjectName();
-
-        MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
-        assertTrue("MBean should be regsistered", 
mBeanServer.isRegistered(on));
-
-        String schema = (String) mBeanServer.invoke(on, "componentJSonSchema", 
new Object[]{"docker"}, new String[]{"java.lang.String"});
-        assertNotNull(schema);
-        assertTrue("Should be docker schema", 
schema.contains("org.apache.camel.component.docker.DockerComponent"));
-
-        exporter.destroy();
-        assertFalse("MBean should be unregsistered", 
mBeanServer.isRegistered(on));
-    }
-}
diff --git 
a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/springboot/HazelcastComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/springboot/HazelcastComponentAutoConfiguration.java
index ed00daf..2a0c13a 100644
--- 
a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/springboot/HazelcastComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/springboot/HazelcastComponentAutoConfiguration.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.hazelcast.HazelcastComponent;
-import org.apache.camel.util.IntrospectionSupport;
+import org.apache.camel.support.IntrospectionSupport;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionMessage;
 import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
diff --git 
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml 
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index f254b19..535b21a 100644
--- 
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ 
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -88,7 +88,7 @@
       <dependency>
         <groupId>com.dropbox.core</groupId>
         <artifactId>dropbox-core-sdk</artifactId>
-        <version>3.0.9</version>
+        <version>3.0.10</version>
       </dependency>
       <dependency>
         <groupId>com.github.dozermapper</groupId>

Reply via email to