This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit af052b65f7830314a625b7355597d05f97e5cd69
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Mar 17 18:04:30 2018 +0100
CAMEL-11430: Migrate to Spring Boot 2 - work in progress
---
components/camel-quartz/pom.xml | 2 +-
.../examples/cluster/ClusterNodeConfiguration.java | 21 --
.../examples/master/MasterNodeConfiguration.java | 21 --
.../example/spring/boot/rest/jpa/Application.java | 5 +-
.../example/spring/boot/rest/jpa/Database.java | 2 +-
.../example/spring/boot/rest/jpa/OrderService.java | 2 +-
parent/pom.xml | 9 -
platforms/commands/commands-spring-boot/README.md | 34 ---
platforms/commands/commands-spring-boot/pom.xml | 56 -----
.../commands/crsh/ArgumentCamelContext.java | 31 ---
.../springboot/commands/crsh/ArgumentRouteID.java | 31 ---
.../commands/crsh/CamelCommandsFacade.java | 132 -----------
.../commands/crsh/CamelCommandsPlugin.java | 56 -----
.../springboot/commands/crsh/CamelCompleter.java | 71 ------
.../commands/crsh/CamelControllerImpl.java | 83 -------
.../springboot/commands/crsh/NoopStringEscape.java | 34 ---
.../springboot/commands/crsh/OutputBuffer.java | 51 -----
.../META-INF/services/org.crsh.plugin.CRaSHPlugin | 17 --
.../resources/crash/commands/camel/camel.groovy | 251 ---------------------
platforms/commands/pom.xml | 1 -
.../components-starter/camel-amqp-starter/pom.xml | 8 -
.../components-starter/camel-bam-starter/pom.xml | 8 -
.../components-starter/camel-cxf-starter/pom.xml | 8 -
.../camel-cxf-transport-starter/pom.xml | 8 -
.../components-starter/camel-drill-starter/pom.xml | 8 -
.../components-starter/camel-elsql-starter/pom.xml | 8 -
.../components-starter/camel-jms-starter/pom.xml | 8 -
.../components-starter/camel-jpa-starter/pom.xml | 8 -
.../camel-spring-batch-starter/pom.xml | 8 -
.../camel-spring-cloud-starter/pom.xml | 8 -
.../camel-spring-integration-starter/pom.xml | 8 -
.../camel-spring-javaconfig-starter/pom.xml | 8 -
.../camel-spring-redis-starter/pom.xml | 8 -
.../components-starter/camel-sql-starter/pom.xml | 8 -
.../packaging/SpringBootAutoConfigurationMojo.java | 3 +-
35 files changed, 5 insertions(+), 1020 deletions(-)
diff --git a/components/camel-quartz/pom.xml b/components/camel-quartz/pom.xml
index ef9dac1..462a5e1 100644
--- a/components/camel-quartz/pom.xml
+++ b/components/camel-quartz/pom.xml
@@ -46,7 +46,7 @@
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=quartz</camel.osgi.export.service>
<!-- Spring 4.1.x only Compatible with Quartz 2.1.4 and higher -->
<!-- Here we just override the spring-version to spring 4.0.x -->
- <spring-version>${spring40-version}</spring-version>
+ <spring-version>4.0.9.RELEASE</spring-version>
</properties>
<dependencies>
diff --git
a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/java/org/apache/camel/examples/cluster/ClusterNodeConfiguration.java
b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/java/org/apache/camel/examples/cluster/ClusterNodeConfiguration.java
index e7df7be..9d31e76 100644
---
a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/java/org/apache/camel/examples/cluster/ClusterNodeConfiguration.java
+++
b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/java/org/apache/camel/examples/cluster/ClusterNodeConfiguration.java
@@ -16,19 +16,12 @@
*/
package org.apache.camel.examples.cluster;
-import java.io.IOException;
-import java.net.ServerSocket;
-
import org.apache.camel.builder.RouteBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import
org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
public class ClusterNodeConfiguration {
- private static final Logger LOGGER =
LoggerFactory.getLogger(ClusterNodeConfiguration.class);
@Bean
public RouteBuilder routeBuilder() {
@@ -51,18 +44,4 @@ public class ClusterNodeConfiguration {
};
}
- /**
- * A small hack to find out the a free port so you can run multiple
instances
- * of the example without having to manually set the property: server.port
- */
- @Bean
- public EmbeddedServletContainerCustomizer containerCustomizer() {
- return container -> {
- try (ServerSocket socket = new ServerSocket(0)) {
- LOGGER.debug("server.port: {}", socket.getLocalPort());
- container.setPort(socket.getLocalPort());
- } catch (IOException ignored) {
- }
- };
- }
}
diff --git
a/examples/camel-example-spring-boot-master/src/main/java/org/apache/camel/examples/master/MasterNodeConfiguration.java
b/examples/camel-example-spring-boot-master/src/main/java/org/apache/camel/examples/master/MasterNodeConfiguration.java
index 6d18bc9..93d8deb 100644
---
a/examples/camel-example-spring-boot-master/src/main/java/org/apache/camel/examples/master/MasterNodeConfiguration.java
+++
b/examples/camel-example-spring-boot-master/src/main/java/org/apache/camel/examples/master/MasterNodeConfiguration.java
@@ -16,19 +16,12 @@
*/
package org.apache.camel.examples.master;
-import java.io.IOException;
-import java.net.ServerSocket;
-
import org.apache.camel.builder.RouteBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import
org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
public class MasterNodeConfiguration {
- private static final Logger LOGGER =
LoggerFactory.getLogger(MasterNodeConfiguration.class);
@Bean
public RouteBuilder routeBuilder() {
@@ -51,18 +44,4 @@ public class MasterNodeConfiguration {
};
}
- /**
- * A small hack to find out the a free port so you can run multiple
instances
- * of the example without having to manually set the property: server.port
- */
- @Bean
- public EmbeddedServletContainerCustomizer containerCustomizer() {
- return container -> {
- try (ServerSocket socket = new ServerSocket(0)) {
- LOGGER.debug("server.port: {}", socket.getLocalPort());
- container.setPort(socket.getLocalPort());
- } catch (IOException ignored) {
- }
- };
- }
}
diff --git
a/examples/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Application.java
b/examples/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Application.java
index ba12b96..e595cab 100644
---
a/examples/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Application.java
+++
b/examples/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Application.java
@@ -17,13 +17,10 @@
package org.apache.camel.example.spring.boot.rest.jpa;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.servlet.CamelHttpTransportServlet;
import org.apache.camel.model.rest.RestBindingMode;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
-import org.springframework.context.annotation.Bean;
+import
org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.stereotype.Component;
@SpringBootApplication
diff --git
a/examples/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Database.java
b/examples/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Database.java
index bd81734..8c68f86 100644
---
a/examples/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Database.java
+++
b/examples/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Database.java
@@ -33,6 +33,6 @@ public class Database {
}
public Order findOrder(Integer id) {
- return orders.findOne(id);
+ return orders.findById(id).get();
}
}
diff --git
a/examples/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/OrderService.java
b/examples/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/OrderService.java
index 2d26423..d673fba 100644
---
a/examples/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/OrderService.java
+++
b/examples/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/OrderService.java
@@ -32,7 +32,7 @@ public class OrderService {
public Order generateOrder() {
Order order = new Order();
order.setAmount(amount.nextInt(10) + 1);
- order.setBook(books.findOne(amount.nextInt(2) + 1));
+ order.setBook(books.findById(amount.nextInt(2) + 1).get());
return order;
}
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 7572012..011fd9b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -5539,15 +5539,6 @@
</build>
</profile>
- <!-- profiles for choosing default spring version -->
- <profile>
- <id>spring4</id>
- <properties>
- <spring-version>${spring4-version}</spring-version>
-
<camel-test-spring-artifactId>camel-test-spring</camel-test-spring-artifactId>
- </properties>
- </profile>
-
<profile>
<id>jdk1.8</id>
<activation>
diff --git a/platforms/commands/commands-spring-boot/README.md
b/platforms/commands/commands-spring-boot/README.md
deleted file mode 100644
index f37986a..0000000
--- a/platforms/commands/commands-spring-boot/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# Camel Shell Commands for Spring Boot
-
-This component is implemented as a plugin for [CRuSH Java
Shell](http://www.crashub.org/), a component used by the Spring Boot platform
for the remote shell.
-It is essentially an adapter for the available Camel commands, responsible for
passing through the options and arguments.
-
-# Installation
-
-To enable Spring Boot remote shell support:
-
-```xml
-
-<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-remote-shell</artifactId>
- <version>x.x.x</version>
- <!-- use the version that is used as the depndency by the Camel -->
-</dependency>
-
-```
-
-To enable Camel Commands for the Spring Boot remote shell:
-
-```xml
-
-<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-commands-spring-boot</artifactId>
- <version>x.x.x</version>
- <!-- use the same version as your Camel core version -->
-</dependency>
-
-```
-
-
diff --git a/platforms/commands/commands-spring-boot/pom.xml
b/platforms/commands/commands-spring-boot/pom.xml
deleted file mode 100644
index e9a7bf5..0000000
--- a/platforms/commands/commands-spring-boot/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>commands</artifactId>
- <version>2.22.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-commands-spring-boot</artifactId>
- <packaging>jar</packaging>
- <name>Camel :: Platforms :: Commands :: Spring Boot (deprecated)</name>
- <description>Camel Commands using Spring Boot Shell</description>
- <modelVersion>4.0.0</modelVersion>
-
- <properties>
- <!-- use by camel-catalog -->
- <firstVersion>2.17.0</firstVersion>
- <label>tooling</label>
-
- <camel.osgi.export.pkg/>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-commands-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-remote-shell</artifactId>
- <version>${spring-boot-version}</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git
a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/ArgumentCamelContext.java
b/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/ArgumentCamelContext.java
deleted file mode 100644
index f1fc1f3..0000000
---
a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/ArgumentCamelContext.java
+++ /dev/null
@@ -1,31 +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.springboot.commands.crsh;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import org.crsh.cli.Argument;
-import org.crsh.cli.Man;
-import org.crsh.cli.Usage;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Usage("Camel context name")
-@Man("Camel context name")
-@Argument(name = "Camel Context", completer = CamelCompleter.class)
-@interface ArgumentCamelContext {
-}
diff --git
a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/ArgumentRouteID.java
b/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/ArgumentRouteID.java
deleted file mode 100644
index 1446444..0000000
---
a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/ArgumentRouteID.java
+++ /dev/null
@@ -1,31 +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.springboot.commands.crsh;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import org.crsh.cli.Argument;
-import org.crsh.cli.Man;
-import org.crsh.cli.Usage;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Usage("Route ID")
-@Man("Route ID")
-@Argument(name = "Route ID", completer = CamelCompleter.class)
-@interface ArgumentRouteID {
-}
diff --git
a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelCommandsFacade.java
b/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelCommandsFacade.java
deleted file mode 100644
index 68fcd6f..0000000
---
a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelCommandsFacade.java
+++ /dev/null
@@ -1,132 +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.springboot.commands.crsh;
-
-import java.io.PrintStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Route;
-import org.apache.camel.commands.AbstractCamelCommand;
-import org.apache.camel.commands.AbstractContextCommand;
-import org.apache.camel.commands.AbstractRouteCommand;
-import org.apache.camel.commands.LocalCamelController;
-import org.apache.camel.commands.StringEscape;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CamelCommandsFacade {
-
- protected final Logger log = LoggerFactory.getLogger(getClass().getName());
-
- private LocalCamelController camelController;
- private StringEscape stringEscape = new NoopStringEscape();
-
- CamelCommandsFacade(LocalCamelController controller) {
- this.camelController = controller;
- }
-
- LocalCamelController getCamelController() {
- return this.camelController;
- }
-
- public <T extends AbstractCamelCommand> String runCommand(Class<T> clazz,
Object... commandArgs) throws Exception {
- OutputBuffer buffer = new OutputBuffer();
- PrintStream ops = buffer.getPrintStream();
-
- // Trying to infer the camel context if not given
- // The order of the varargs for Route Command
- // [0] - route id
- // [1] - camel context
- if (AbstractRouteCommand.class.isAssignableFrom(clazz) && null ==
commandArgs[1]) {
- commandArgs[1] = getCamelContextForRoute((String) commandArgs[0]);
- ops.println("Automatically inferred context name : " +
commandArgs[1]);
- }
-
- // The order of the varargs for Context Command
- // [0] - camel context
- if (AbstractContextCommand.class.isAssignableFrom(clazz) && null ==
commandArgs[0]) {
- commandArgs[0] = getFirstCamelContextName();
- ops.println("Context name is not provided. Using the first : " +
commandArgs[0]);
- }
-
- // Finding the right constructor
- Class[] types = new Class[commandArgs.length];
- for (int i = 0; i < commandArgs.length; i++) {
- types[i] = commandArgs[i].getClass();
-
- // Commands require primitives
- if (types[i] == Boolean.class) {
- types[i] = boolean.class;
- }
- if (types[i] == Integer.class) {
- types[i] = int.class;
- }
- }
-
- // Instantiating an object
- Constructor<T> constructor = clazz.getConstructor(types);
- T command = constructor.newInstance(commandArgs);
-
- // Some commands require StringEscape property to be set
- try {
- Method m = clazz.getMethod("setStringEscape",
org.apache.camel.commands.StringEscape.class);
- m.invoke(command, stringEscape);
- } catch (Exception e) {
- }
-
- // Executing
- command.execute(camelController, ops, ops);
- return buffer.toString();
- }
-
- private String getCamelContextForRoute(String routeId) throws Exception {
- ArrayList<String> contextNames = new ArrayList<String>();
-
- for (CamelContext camelContext :
camelController.getLocalCamelContexts()) {
- for (Route route : camelContext.getRoutes()) {
- if (routeId.equals(route.getId())) {
- contextNames.add(camelContext.getName());
- break;
- }
- }
- }
-
- if (contextNames.size() != 1) {
- StringBuffer error = new StringBuffer();
- error.append("Cannot infer CamelContext. Please provide
manually.");
-
- if (contextNames.size() > 1) {
- error.append(" Contexts : " + contextNames.toString());
- }
-
- throw new org.crsh.cli.impl.SyntaxException(error.toString());
- }
-
- return contextNames.get(0);
- }
-
- private String getFirstCamelContextName() throws Exception {
- if (camelController.getLocalCamelContexts() == null ||
camelController.getLocalCamelContexts().size() == 0) {
- throw new org.crsh.cli.impl.SyntaxException("No CamelContexts
available");
- }
-
- return camelController.getLocalCamelContexts().get(0).getName();
- }
-}
diff --git
a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelCommandsPlugin.java
b/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelCommandsPlugin.java
deleted file mode 100644
index b183ec5..0000000
---
a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelCommandsPlugin.java
+++ /dev/null
@@ -1,56 +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.springboot.commands.crsh;
-
-import org.crsh.plugin.CRaSHPlugin;
-import org.springframework.beans.factory.ListableBeanFactory;
-
-public class CamelCommandsPlugin extends CRaSHPlugin<CamelCommandsPlugin> {
-
- private static CamelCommandsPlugin camelPlugin;
-
- private CamelCommandsFacade facade;
-
- private static void setCamelPlugin(CamelCommandsPlugin plugin) {
- camelPlugin = plugin;
- }
-
- static CamelCommandsPlugin getInstance() {
- return camelPlugin;
- }
-
- @Override
- public CamelCommandsPlugin getImplementation() {
- return this;
- }
-
- @Override
- public void init() {
- ListableBeanFactory beanFactory = (ListableBeanFactory)
getContext().getAttributes().get("spring.beanfactory");
- this.facade = new CamelCommandsFacade(new
CamelControllerImpl(beanFactory));
- setCamelPlugin(this);
- }
-
- @Override
- public void destroy() {
- // noop
- }
-
- CamelCommandsFacade getCamelCommandsFacade() {
- return this.facade;
- }
-}
diff --git
a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelCompleter.java
b/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelCompleter.java
deleted file mode 100644
index 1355661..0000000
---
a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelCompleter.java
+++ /dev/null
@@ -1,71 +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.springboot.commands.crsh;
-
-import java.util.LinkedList;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Route;
-import org.apache.camel.commands.LocalCamelController;
-import org.crsh.cli.descriptor.ParameterDescriptor;
-import org.crsh.cli.spi.Completer;
-import org.crsh.cli.spi.Completion;
-
-public class CamelCompleter implements Completer {
-
- private LocalCamelController camelController =
CamelCommandsPlugin.getInstance().getCamelCommandsFacade().getCamelController();
-
- public Completion complete(ParameterDescriptor parameterDescriptor, String
prefix) throws Exception {
-
- LinkedList<String> values = new LinkedList<String>();
- Completion.Builder builder = new Completion.Builder(prefix);
-
- if (parameterDescriptor.getAnnotation() instanceof
ArgumentCamelContext) {
- values.addAll(getContextNames());
- }
-
- if (parameterDescriptor.getAnnotation() instanceof ArgumentRouteID) {
- values.addAll(getRouteIds());
- }
-
- for (String value : values) {
- if (value.startsWith(prefix)) {
- builder.add(value.substring(prefix.length()), true);
- }
- }
-
- return builder.build();
- }
-
- private LinkedList<String> getContextNames() throws Exception {
- LinkedList<String> values = new LinkedList<String>();
- for (CamelContext camelContext :
camelController.getLocalCamelContexts()) {
- values.add(camelContext.getName());
- }
- return values;
- }
-
- private LinkedList<String> getRouteIds() throws Exception {
- LinkedList<String> values = new LinkedList<String>();
- for (CamelContext camelContext :
camelController.getLocalCamelContexts()) {
- for (Route route : camelContext.getRoutes()) {
- values.add(route.getId());
- }
- }
- return values;
- }
-}
diff --git
a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelControllerImpl.java
b/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelControllerImpl.java
deleted file mode 100644
index af837e3..0000000
---
a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelControllerImpl.java
+++ /dev/null
@@ -1,83 +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.springboot.commands.crsh;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.commands.AbstractLocalCamelController;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.ListableBeanFactory;
-
-public class CamelControllerImpl extends AbstractLocalCamelController {
-
- private static final Logger LOG =
LoggerFactory.getLogger(CamelControllerImpl.class);
-
- private ListableBeanFactory beanFactory;
-
- CamelControllerImpl(ListableBeanFactory factory) {
- beanFactory = factory;
- }
-
- public List<CamelContext> getLocalCamelContexts() {
- List<CamelContext> camelContexts = new ArrayList<CamelContext>();
- try {
-
camelContexts.addAll(beanFactory.getBeansOfType(CamelContext.class).values());
- } catch (Exception e) {
- LOG.warn("Cannot retrieve the list of Camel contexts.", e);
- }
-
- Collections.sort(camelContexts, new Comparator<CamelContext>() {
- public int compare(CamelContext o1, CamelContext o2) {
- return o1.getName().compareTo(o2.getName());
- }
- });
-
- return camelContexts;
- }
-
- public List<Map<String, String>> getCamelContexts() throws Exception {
- List<Map<String, String>> answer = new ArrayList<Map<String,
String>>();
-
- List<CamelContext> camelContexts = getLocalCamelContexts();
- for (CamelContext camelContext : camelContexts) {
- Map<String, String> row = new LinkedHashMap<String, String>();
- row.put("name", camelContext.getName());
- row.put("state", camelContext.getStatus().name());
- row.put("uptime", camelContext.getUptime());
- if (camelContext.getManagedCamelContext() != null) {
- row.put("exchangesTotal", "" +
camelContext.getManagedCamelContext().getExchangesTotal());
- row.put("exchangesInflight", "" +
camelContext.getManagedCamelContext().getExchangesInflight());
- row.put("exchangesFailed", "" +
camelContext.getManagedCamelContext().getExchangesFailed());
- } else {
- row.put("exchangesTotal", "0");
- row.put("exchangesInflight", "0");
- row.put("exchangesFailed", "0");
- }
- answer.add(row);
- }
-
- return answer;
- }
-
-}
diff --git
a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/NoopStringEscape.java
b/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/NoopStringEscape.java
deleted file mode 100644
index b46828e..0000000
---
a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/NoopStringEscape.java
+++ /dev/null
@@ -1,34 +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.springboot.commands.crsh;
-
-import org.apache.camel.commands.StringEscape;
-
-class NoopStringEscape implements StringEscape {
-
- public String unescapeJava(String s) {
- return s;
- }
-
- public String escapeJava(String s) {
- return s;
- }
-
- public String hex(char c) {
- return Character.toString(c);
- }
-}
diff --git
a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/OutputBuffer.java
b/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/OutputBuffer.java
deleted file mode 100644
index c6924e4..0000000
---
a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/OutputBuffer.java
+++ /dev/null
@@ -1,51 +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.springboot.commands.crsh;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
-
-class OutputBuffer {
-
- private ByteArrayOutputStream baos = new ByteArrayOutputStream();
- private PrintStream ps = new PrintStream(baos);
-
- public PrintStream getPrintStream() {
- return ps;
- }
-
- @Override
- public String toString() {
- BufferedReader bufferedReader = new BufferedReader(new
InputStreamReader(new ByteArrayInputStream(baos.toByteArray())));
- StringBuffer sb = new StringBuffer();
- String line;
- String lineSeparator = System.lineSeparator();
- try {
- while ((line = bufferedReader.readLine()) != null) {
- sb.append(line);
- sb.append(lineSeparator);
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- return sb.toString();
- }
-}
diff --git
a/platforms/commands/commands-spring-boot/src/main/resources/META-INF/services/org.crsh.plugin.CRaSHPlugin
b/platforms/commands/commands-spring-boot/src/main/resources/META-INF/services/org.crsh.plugin.CRaSHPlugin
deleted file mode 100755
index 642c133..0000000
---
a/platforms/commands/commands-spring-boot/src/main/resources/META-INF/services/org.crsh.plugin.CRaSHPlugin
+++ /dev/null
@@ -1,17 +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.
-
-org.apache.camel.springboot.commands.crsh.CamelCommandsPlugin
\ No newline at end of file
diff --git
a/platforms/commands/commands-spring-boot/src/main/resources/crash/commands/camel/camel.groovy
b/platforms/commands/commands-spring-boot/src/main/resources/crash/commands/camel/camel.groovy
deleted file mode 100644
index 670bffc..0000000
---
a/platforms/commands/commands-spring-boot/src/main/resources/crash/commands/camel/camel.groovy
+++ /dev/null
@@ -1,251 +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 crash.commands.camel
-
-import org.apache.camel.commands.*
-import org.apache.camel.springboot.commands.crsh.ArgumentCamelContext
-import org.apache.camel.springboot.commands.crsh.ArgumentRouteID
-import org.apache.camel.springboot.commands.crsh.CamelCommandsFacade
-import org.apache.camel.springboot.commands.crsh.CamelCommandsPlugin
-import org.crsh.cli.*
-import org.crsh.groovy.GroovyCommand
-
-@Usage("Camel related commands")
-public class camel extends GroovyCommand {
-
- private CamelCommandsFacade getCommandsFacade() {
- return context.session["crash"].
-
context.getPlugin(CamelCommandsPlugin.class).getCamelCommandsFacade()
- }
- // ===============================
- // Components and EIP
- // ===============================
- @Command
- @Usage("Lists all Camel components available in the context.")
- @Named("component-list")
- public String component_list(@Required @ArgumentCamelContext String
camelContext,
- @Usage("Verbose output")
- @Option(names = ["v", "verbose"]) Boolean
verbose) {
- Boolean v = (null != verbose && Boolean.valueOf(verbose))
- return getCommandsFacade().runCommand(ComponentListCommand.class,
camelContext, v)
- }
-
- @Command
- @Usage("Explains the EIP in the Camel context.")
- @Named("eip-explain")
- public String eip_explain(@Required @ArgumentCamelContext String
camelContext,
- @Required @Argument String nameOrId,
- @Usage("Verbose output")
- @Option(names = ["v", "verbose"]) Boolean
verbose) {
- Boolean v = (null != verbose && Boolean.valueOf(verbose))
- return getCommandsFacade().runCommand(EipExplainCommand.class,
camelContext, nameOrId, v)
- }
-
- // ===============================
- // Context
- // ===============================
- @Command
- @Usage("Lists all Camel contexts.")
- @Named("context-list")
- public String context_list() {
- return getCommandsFacade().runCommand(ContextListCommand.class)
- }
-
- @Command
- @Usage("Displays detailed information about the Camel context.")
- @Named("context-info")
- public String context_info(@Required @ArgumentCamelContext String
camelContext,
- @Usage("Verbose output")
- @Option(names = ["v", "verbose"]) Boolean
verbose) {
- Boolean v = (null != verbose && Boolean.valueOf(verbose))
- return getCommandsFacade().runCommand(ContextInfoCommand.class,
camelContext, v)
- }
-
- @Command
- @Usage("Displays detailed information about the Camel context.")
- @Named("context-inflight")
- public String context_inflight(@Required @ArgumentCamelContext String
camelContext,
- @Usage("Sort by longest duration")
- @Option(names = ["s", "sort"]) Boolean sort,
- @Usage("Limit output to number of messages")
- @Option(names = ["l", "limit"]) Integer
limit) {
-
- Boolean _sort = (null != sort && Boolean.valueOf(sort))
- Integer _limit = null != limit ? limit : -1;
-
- if (_limit != -1) {
- out.println("Limiting output to " + _limit + " messages.")
- }
-
- return getCommandsFacade().runCommand(ContextInflightCommand.class,
camelContext, _limit, _sort)
- }
-
- @Command
- @Usage("Starts the Camel context.")
- @Named("context-start")
- public String context_start(@Required @ArgumentCamelContext String
camelContext) {
- return getCommandsFacade().runCommand(ContextStartCommand.class,
camelContext)
- }
-
- @Command
- @Usage("Stops the Camel context.")
- @Named("context-stop")
- public String context_stop(@Required @ArgumentCamelContext String
camelContext) {
- return getCommandsFacade().runCommand(ContextStopCommand.class,
camelContext)
- }
-
- @Command
- @Usage("Suspends the Camel context.")
- @Named("context-suspend")
- public String context_suspend(@Required @ArgumentCamelContext String
camelContext) {
- return getCommandsFacade().runCommand(ContextSuspendCommand.class,
camelContext)
- }
-
- @Command
- @Usage("Resumes the Camel context.")
- @Named("context-resume")
- public String context_resume(@Required @ArgumentCamelContext String
camelContext) {
- return getCommandsFacade().runCommand(ContextResumeCommand.class,
camelContext)
- }
-
- // ===============================
- // Endpoints
- // ===============================
- @Command
- @Usage("Lists Camel endpoints.")
- @Named("endpoint-list")
- public String endpoint_list(@Required @ArgumentCamelContext String
camelContext,
- @Usage("Decode URI so they are human readable")
- @Option(names = ["d", "decode"]) Boolean
decode,
- @Usage("Verbose output")
- @Option(names = ["v", "verbose"]) Boolean
verbose,
- @Usage("Explain the endpoint options")
- @Option(names = ["e", "explain"]) Boolean
explain) {
- Boolean _verbose = (null != verbose && Boolean.valueOf(verbose))
- Boolean _decode = (null != decode && Boolean.valueOf(decode))
- Boolean _explain = (null != explain && Boolean.valueOf(explain))
- return getCommandsFacade().runCommand(EndpointListCommand.class,
camelContext, _decode, _verbose, _explain);
- }
-
- @Command
- @Usage("Explain all Camel endpoints available in the CamelContext.")
- @Named("endpoint-explain")
- public String endpoint_explain(@Required @ArgumentCamelContext String
camelContext,
- @Usage("Verbose output")
- @Option(names = ["v", "verbose"]) Boolean
verbose,
- @Usage("Filter endpoint by pattern")
- @Option(names = ["f", "filter"]) String
filter) {
- Boolean _verbose = (null != verbose && Boolean.valueOf(verbose))
- String _filter = null != filter ? filter : "*";
- return getCommandsFacade().runCommand(EndpointExplainCommand.class,
camelContext, _verbose, _filter);
- }
-
- @Command
- @Usage("Explain all Camel endpoints available in the CamelContext.")
- @Named("endpoint-stats")
- public String endpoint_stats(@Required @ArgumentCamelContext String
camelContext,
- @Usage("Decode URI so they are human
readable")
- @Option(names = ["d", "decode"]) Boolean
decode,
- @Usage("Filter the list by
in,out,static,dynamic")
- @Option(names = ["f", "filter"]) String
filter) {
- Boolean _decode = (null != decode && Boolean.valueOf(decode))
- String[] _filter = filter == null ? [] : filter.split(",")
- return getCommandsFacade().runCommand(EndpointStatisticCommand.class,
camelContext, _decode, _filter);
- }
-
- @Command
- @Usage("Lists all Camel REST services enlisted in the Rest Registry from a
CamelContext.")
- @Named("rest-registry-list")
- public String rest_registry_list(@Required @ArgumentCamelContext String
camelContext,
- @Usage("Decode URI so they are human
readable")
- @Option(names = ["d", "decode"]) Boolean
decode,
- @Usage("Verbose output")
- @Option(names = ["v", "verbose"]) Boolean
verbose) {
- Boolean _verbose = (null != verbose && Boolean.valueOf(verbose))
- Boolean _decode = (null != decode && Boolean.valueOf(decode))
- return getCommandsFacade().runCommand(RestRegistryListCommand.class,
camelContext, _decode, _verbose);
- }
-
- // ===============================
- // Route
- // ===============================
- @Command
- @Usage("Lists Camel routes for the given Camel context.")
- @Named("route-list")
- public String route_list(@Required @ArgumentCamelContext String
camelContext) {
- return getCommandsFacade().runCommand(RouteListCommand.class,
camelContext)
- }
-
- @Command
- @Usage("Displays information about a Camel route")
- @Named("route-info")
- public String route_info(@Required @ArgumentRouteID String route,
@ArgumentCamelContext String camelContext) {
- return getCommandsFacade().runCommand(RouteInfoCommand.class, route,
camelContext)
- }
-
- @Command
- @Usage("Displays Camel route profile")
- @Named("route-profile")
- public String route_profile(@Required @ArgumentRouteID String route,
@ArgumentCamelContext String camelContext) {
- return getCommandsFacade().runCommand(RouteProfileCommand.class,
route, camelContext)
- }
-
- @Command
- @Usage("Display the Camel route definition in XML.")
- @Named("route-show")
- public String route_show(@Required @ArgumentRouteID String route,
@ArgumentCamelContext String camelContext) {
- return getCommandsFacade().runCommand(RouteShowCommand.class, route,
camelContext)
- }
-
- @Command
- @Usage("Resets route performance stats.")
- @Named("route-reset-stats")
- public String route_reset_stats(
- @Required @ArgumentRouteID String route, @ArgumentCamelContext
String camelContext) {
- return getCommandsFacade().runCommand(RouteResetStatsCommand.class,
route, camelContext)
- }
-
- @Command
- @Usage("Resumes the route operation.")
- @Named("route-resume")
- public String route_resume(@Required @ArgumentRouteID String route,
@ArgumentCamelContext String camelContext) {
- return getCommandsFacade().runCommand(RouteResumeCommand.class, route,
camelContext)
- }
-
- @Command
- @Usage("Suspends the route operation.")
- @Named("route-suspend")
- public String route_suspend(@Required @ArgumentRouteID String route,
@ArgumentCamelContext String camelContext) {
- return getCommandsFacade().runCommand(RouteSuspendCommand.class,
route, camelContext)
- }
-
- @Command
- @Usage("Stops the route operation.")
- @Named("route-stop")
- public String route_stop(@Required @ArgumentRouteID String route,
@ArgumentCamelContext String camelContext) {
- return getCommandsFacade().runCommand(RouteStopCommand.class, route,
camelContext)
- }
-
- @Command
- @Usage("Starts the route operation.")
- @Named("route-start")
- public String route_start(@Required @ArgumentRouteID String route,
@ArgumentCamelContext String camelContext) {
- return getCommandsFacade().runCommand(RouteStartCommand.class, route,
camelContext)
- }
-
-}
-
diff --git a/platforms/commands/pom.xml b/platforms/commands/pom.xml
index 6ae3660..7ec1431 100644
--- a/platforms/commands/pom.xml
+++ b/platforms/commands/pom.xml
@@ -33,7 +33,6 @@
<modules>
<module>commands-core</module>
<module>commands-jolokia</module>
- <module>commands-spring-boot</module>
</modules>
</project>
diff --git
a/platforms/spring-boot/components-starter/camel-amqp-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-amqp-starter/pom.xml
index 767d91a..0a6ea9a 100644
--- a/platforms/spring-boot/components-starter/camel-amqp-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-amqp-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-amqp</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml
index a2a7abf..f96ca2b 100644
--- a/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-bam</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/platforms/spring-boot/components-starter/camel-cxf-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-cxf-starter/pom.xml
index 2421617..c33739c 100644
--- a/platforms/spring-boot/components-starter/camel-cxf-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-cxf-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git
a/platforms/spring-boot/components-starter/camel-cxf-transport-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-cxf-transport-starter/pom.xml
index addc41a..9f02c66 100644
---
a/platforms/spring-boot/components-starter/camel-cxf-transport-starter/pom.xml
+++
b/platforms/spring-boot/components-starter/camel-cxf-transport-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf-transport</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git
a/platforms/spring-boot/components-starter/camel-drill-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-drill-starter/pom.xml
index ce2f768..a24d73c 100644
--- a/platforms/spring-boot/components-starter/camel-drill-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-drill-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-drill</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git
a/platforms/spring-boot/components-starter/camel-elsql-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-elsql-starter/pom.xml
index c1b1cba..7d26bf9 100644
--- a/platforms/spring-boot/components-starter/camel-elsql-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-elsql-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-elsql</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/platforms/spring-boot/components-starter/camel-jms-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-jms-starter/pom.xml
index 34c5237..e9808fe 100644
--- a/platforms/spring-boot/components-starter/camel-jms-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jms-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-jms</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/platforms/spring-boot/components-starter/camel-jpa-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-jpa-starter/pom.xml
index 2428c88..535f8c9 100644
--- a/platforms/spring-boot/components-starter/camel-jpa-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jpa-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-jpa</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git
a/platforms/spring-boot/components-starter/camel-spring-batch-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-spring-batch-starter/pom.xml
index 5e2cbd3..88a5fdd 100644
---
a/platforms/spring-boot/components-starter/camel-spring-batch-starter/pom.xml
+++
b/platforms/spring-boot/components-starter/camel-spring-batch-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-batch</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git
a/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml
index 6eb1cf0..6027461 100644
---
a/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml
+++
b/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-cloud</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git
a/platforms/spring-boot/components-starter/camel-spring-integration-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-spring-integration-starter/pom.xml
index 8da0211..674b381 100644
---
a/platforms/spring-boot/components-starter/camel-spring-integration-starter/pom.xml
+++
b/platforms/spring-boot/components-starter/camel-spring-integration-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-integration</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git
a/platforms/spring-boot/components-starter/camel-spring-javaconfig-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-spring-javaconfig-starter/pom.xml
index 8fd34a5..00b66ad 100644
---
a/platforms/spring-boot/components-starter/camel-spring-javaconfig-starter/pom.xml
+++
b/platforms/spring-boot/components-starter/camel-spring-javaconfig-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-javaconfig</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git
a/platforms/spring-boot/components-starter/camel-spring-redis-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-spring-redis-starter/pom.xml
index be9f764..a75e3a2 100644
---
a/platforms/spring-boot/components-starter/camel-spring-redis-starter/pom.xml
+++
b/platforms/spring-boot/components-starter/camel-spring-redis-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-redis</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/platforms/spring-boot/components-starter/camel-sql-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-sql-starter/pom.xml
index cb05234..9023d1b 100644
--- a/platforms/spring-boot/components-starter/camel-sql-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-sql-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-sql</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
index a9734f3..4ca37ef 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
@@ -78,7 +78,6 @@ import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
-import org.springframework.boot.bind.RelaxedPropertyResolver;
import
org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty;
@@ -2242,7 +2241,7 @@ public class SpringBootAutoConfigurationMojo extends
AbstractMojo {
parentClass.addImport(ConditionMessage.class);
parentClass.addImport(ConditionContext.class);
parentClass.addImport(ConditionOutcome.class);
- parentClass.addImport(RelaxedPropertyResolver.class);
+
parentClass.addImport("org.apache.camel.spring.boot.util.RelaxedPropertyResolver");
parentClass.addImport(AnnotatedTypeMetadata.class);
parentClass.addImport(SpringBootCondition.class);
--
To stop receiving notification emails like this one, please contact
davscl...@apache.org.
