CAMEL-11756: camel-spring-boot2 - Work in progress
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/90a5002a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/90a5002a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/90a5002a Branch: refs/heads/boot2 Commit: 90a5002a6d97e002e1a24067469e4fea726c73d0 Parents: a11b539 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Sep 10 10:37:57 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Sep 10 10:39:47 2017 +0200 ---------------------------------------------------------------------- tooling/camel-spring-boot-common/pom.xml | 5 ----- .../apache/camel/spring/boot/common/PropertySourceUtils.java | 6 +++--- .../java/org/apache/camel/spring/boot/common/RelaxedNames.java | 6 +++--- .../camel/spring/boot/common/RelaxedPropertyResolver.java | 6 +++--- 4 files changed, 9 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/90a5002a/tooling/camel-spring-boot-common/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/camel-spring-boot-common/pom.xml b/tooling/camel-spring-boot-common/pom.xml index 77e80b4..d5ee31b 100644 --- a/tooling/camel-spring-boot-common/pom.xml +++ b/tooling/camel-spring-boot-common/pom.xml @@ -40,11 +40,6 @@ <artifactId>spring-boot</artifactId> <version>${spring-boot-version}</version> </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-autoconfigure</artifactId> - <version>${spring-boot-version}</version> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/90a5002a/tooling/camel-spring-boot-common/src/main/java/org/apache/camel/spring/boot/common/PropertySourceUtils.java ---------------------------------------------------------------------- diff --git a/tooling/camel-spring-boot-common/src/main/java/org/apache/camel/spring/boot/common/PropertySourceUtils.java b/tooling/camel-spring-boot-common/src/main/java/org/apache/camel/spring/boot/common/PropertySourceUtils.java index f7311f8..2013904 100644 --- a/tooling/camel-spring-boot-common/src/main/java/org/apache/camel/spring/boot/common/PropertySourceUtils.java +++ b/tooling/camel-spring-boot-common/src/main/java/org/apache/camel/spring/boot/common/PropertySourceUtils.java @@ -5,9 +5,9 @@ * 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 - * <p> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p> + * + * 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. http://git-wip-us.apache.org/repos/asf/camel/blob/90a5002a/tooling/camel-spring-boot-common/src/main/java/org/apache/camel/spring/boot/common/RelaxedNames.java ---------------------------------------------------------------------- diff --git a/tooling/camel-spring-boot-common/src/main/java/org/apache/camel/spring/boot/common/RelaxedNames.java b/tooling/camel-spring-boot-common/src/main/java/org/apache/camel/spring/boot/common/RelaxedNames.java index b5db66e..77c07b7 100644 --- a/tooling/camel-spring-boot-common/src/main/java/org/apache/camel/spring/boot/common/RelaxedNames.java +++ b/tooling/camel-spring-boot-common/src/main/java/org/apache/camel/spring/boot/common/RelaxedNames.java @@ -5,9 +5,9 @@ * 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 - * <p> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p> + * + * 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. http://git-wip-us.apache.org/repos/asf/camel/blob/90a5002a/tooling/camel-spring-boot-common/src/main/java/org/apache/camel/spring/boot/common/RelaxedPropertyResolver.java ---------------------------------------------------------------------- diff --git a/tooling/camel-spring-boot-common/src/main/java/org/apache/camel/spring/boot/common/RelaxedPropertyResolver.java b/tooling/camel-spring-boot-common/src/main/java/org/apache/camel/spring/boot/common/RelaxedPropertyResolver.java index a046787..f08161a 100644 --- a/tooling/camel-spring-boot-common/src/main/java/org/apache/camel/spring/boot/common/RelaxedPropertyResolver.java +++ b/tooling/camel-spring-boot-common/src/main/java/org/apache/camel/spring/boot/common/RelaxedPropertyResolver.java @@ -5,9 +5,9 @@ * 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 - * <p> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p> + * + * 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.
