Repository: camel Updated Branches: refs/heads/master 7beb3d3aa -> 773838981
CAMEL-10264 Switch project version from 2.18-SNAPSHOT to 2.18.0-SNAPSHOT. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/77383898 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/77383898 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/77383898 Branch: refs/heads/master Commit: 773838981c4abf43cb7e9ddedc5639f9cb6e0120 Parents: 7beb3d3 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Aug 23 18:03:51 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Aug 23 18:03:51 2016 +0200 ---------------------------------------------------------------------- camel-website/pom.xml | 2 +- components/camel-zipkin-starter/pom.xml | 2 +- examples/camel-example-cdi-cassandraql/README.md | 4 ++-- examples/camel-example-cdi-xml/README.md | 10 +++++----- tests/camel-itest-performance/pom.xml | 2 +- .../springboot/util/LibraryVersionMismatchChecker.java | 2 +- tests/camel-performance/pom.xml | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/77383898/camel-website/pom.xml ---------------------------------------------------------------------- diff --git a/camel-website/pom.xml b/camel-website/pom.xml index 8d6c26f..52b1b56 100644 --- a/camel-website/pom.xml +++ b/camel-website/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.camel</groupId> <artifactId>camel-parent</artifactId> - <version>2.18-SNAPSHOT</version> + <version>2.18.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/camel/blob/77383898/components/camel-zipkin-starter/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-zipkin-starter/pom.xml b/components/camel-zipkin-starter/pom.xml index 42239b5..e1d6ef2 100644 --- a/components/camel-zipkin-starter/pom.xml +++ b/components/camel-zipkin-starter/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.camel</groupId> <artifactId>components</artifactId> - <version>2.18-SNAPSHOT</version> + <version>2.18.0-SNAPSHOT</version> </parent> <artifactId>camel-zipkin-starter</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/77383898/examples/camel-example-cdi-cassandraql/README.md ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-cassandraql/README.md b/examples/camel-example-cdi-cassandraql/README.md index 5d9cb12..13da242 100644 --- a/examples/camel-example-cdi-cassandraql/README.md +++ b/examples/camel-example-cdi-cassandraql/README.md @@ -103,7 +103,7 @@ INFO: Computed the following DeltaSpike ProjectStage: Production 2016-07-24 15:33:51,491 [cdi.Main.main()] WARN Validator - WELD-001478: Interceptor class org.apache.deltaspike.core.impl.lock.LockedInterceptor is enabled for the application and for the bean archive /home/oscerd/.m2/repository/org/apache/deltaspike/core/deltaspike-core-impl/1.7.1/deltaspike-core-impl-1.7.1.jar. It will only be invoked in the @Priority part of the chain. 2016-07-24 15:33:51,491 [cdi.Main.main()] WARN Validator - WELD-001478: Interceptor class org.apache.deltaspike.core.impl.future.FutureableInterceptor is enabled for the application and for the bean archive /home/oscerd/.m2/repository/org/apache/deltaspike/core/deltaspike-core-impl/1.7.1/deltaspike-core-impl-1.7.1.jar. It will only be invoked in the @Priority part of the chain. 2016-07-24 15:33:52,244 [cdi.Main.main()] INFO CdiCamelExtension - Camel CDI is starting Camel context [camel-example-cassandraql-cdi] -2016-07-24 15:33:52,245 [cdi.Main.main()] INFO DefaultCamelContext - Apache Camel 2.18-SNAPSHOT (CamelContext: camel-example-cassandraql-cdi) is starting +2016-07-24 15:33:52,245 [cdi.Main.main()] INFO DefaultCamelContext - Apache Camel 2.18.0 (CamelContext: camel-example-cassandraql-cdi) is starting 2016-07-24 15:33:52,246 [cdi.Main.main()] INFO ManagedManagementStrategy - JMX is enabled 2016-07-24 15:33:52,352 [cdi.Main.main()] INFO DefaultTypeConverter - Loaded 189 type converters 2016-07-24 15:33:52,367 [cdi.Main.main()] INFO DefaultRuntimeEndpointRegistry - Runtime endpoint registry is in extended mode gathering usage statistics of all incoming and outgoing endpoints (cache limit: 1000) @@ -119,7 +119,7 @@ INFO: Computed the following DeltaSpike ProjectStage: Production 2016-07-24 15:33:52,914 [cdi.Main.main()] INFO Cluster - New Cassandra host /172.17.0.4:9042 added 2016-07-24 15:33:52,985 [cdi.Main.main()] INFO DefaultCamelContext - Route: route1 started and consuming from: timer://stream?repeatCount=1 2016-07-24 15:33:52,986 [cdi.Main.main()] INFO DefaultCamelContext - Total 1 routes, of which 1 are started. -2016-07-24 15:33:52,987 [cdi.Main.main()] INFO DefaultCamelContext - Apache Camel 2.18-SNAPSHOT (CamelContext: camel-example-cassandraql-cdi) started in 0.742 seconds +2016-07-24 15:33:52,987 [cdi.Main.main()] INFO DefaultCamelContext - Apache Camel 2.18.0 (CamelContext: camel-example-cassandraql-cdi) started in 0.742 seconds 2016-07-24 15:33:53,018 [cdi.Main.main()] INFO Bootstrap - WELD-ENV-002003: Weld SE container STATIC_INSTANCE initialized 2016-07-24 15:33:54,041 [ timer://stream] INFO route1 - Result from query [Row[1, oscerd]] http://git-wip-us.apache.org/repos/asf/camel/blob/77383898/examples/camel-example-cdi-xml/README.md ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-xml/README.md b/examples/camel-example-cdi-xml/README.md index 399a169..4c0e470 100644 --- a/examples/camel-example-cdi-xml/README.md +++ b/examples/camel-example-cdi-xml/README.md @@ -44,13 +44,13 @@ being logged to the console, e.g.: ``` 2016-04-26 17:08:49,021 [cdi.Main.main()] INFO Version - WELD-000900: 2.3.4 (Final) 2016-04-26 17:08:51,805 [cdi.Main.main()] INFO CdiCamelExtension - Camel CDI is starting Camel context [cdi-camel-xml] -2016-04-26 17:08:51,806 [cdi.Main.main()] INFO DefaultCamelContext - Apache Camel 2.18-SNAPSHOT (CamelContext: cdi-camel-xml) is starting +2016-04-26 17:08:51,806 [cdi.Main.main()] INFO DefaultCamelContext - Apache Camel 2.18.0 (CamelContext: cdi-camel-xml) is starting 2016-04-26 17:08:52,322 [cdi.Main.main()] INFO SedaEndpoint - Endpoint Endpoint[seda://rescue?multipleConsumers=true] is using shared queue: seda://rescue with size: 2147483647 2016-04-26 17:08:52,356 [cdi.Main.main()] INFO DefaultCamelContext - Route: terminal started and consuming from: Endpoint[stream://in?delay=1000&promptMessage=Which+pill+%28red%7Cblue%29%3F%3A+] 2016-04-26 17:08:52,360 [cdi.Main.main()] INFO DefaultCamelContext - Route: matrix started and consuming from: Endpoint[direct://neo] 2016-04-26 17:08:52,361 [cdi.Main.main()] INFO DefaultCamelContext - Route: unplug started and consuming from: Endpoint[direct://unplug] 2016-04-26 17:08:52,362 [cdi.Main.main()] INFO DefaultCamelContext - Total 3 routes, of which 3 are started. -2016-04-26 17:08:52,363 [cdi.Main.main()] INFO DefaultCamelContext - Apache Camel 2.18-SNAPSHOT (CamelContext: cdi-camel-xml) started in 0.556 seconds +2016-04-26 17:08:52,363 [cdi.Main.main()] INFO DefaultCamelContext - Apache Camel 2.18.0 (CamelContext: cdi-camel-xml) started in 0.556 seconds 2016-04-26 17:08:52,434 [cdi.Main.main()] INFO Bootstrap - WELD-ENV-002003: Weld SE container STATIC_INSTANCE initialized ââââââââââââ âââââââââââ ââââ ââââ ââââââ ââââââââââââââââ ââââââ âââ ââââââââââââ âââââââââââ âââââ âââââââââââââââââââââââââââââââââââââââââ @@ -87,15 +87,15 @@ The Camel application can be stopped pressing <kbd>ctrl</kbd>+<kbd>c</kbd> in th ``` 2016-04-26 17:16:50,172 [Thread-5 ] INFO MainSupport$HangupInterceptor - Received hang up - stopping the main instance. 2016-04-26 17:16:50,179 [Thread-5 ] INFO CamelContextProducer - Camel CDI is stopping Camel context [cdi-camel-xml] -2016-04-26 17:16:50,180 [Thread-5 ] INFO DefaultCamelContext - Apache Camel 2.18-SNAPSHOT (CamelContext: cdi-camel-xml) is shutting down +2016-04-26 17:16:50,180 [Thread-5 ] INFO DefaultCamelContext - Apache Camel 2.18.0 (CamelContext: cdi-camel-xml) is shutting down 2016-04-26 17:16:50,180 [Thread-5 ] INFO DefaultShutdownStrategy - Starting to graceful shutdown 3 routes (timeout 300 seconds) 2016-04-26 17:16:50,191 [ - ShutdownTask] INFO DefaultShutdownStrategy - Route: terminal shutdown complete, was consuming from: Endpoint[stream://in?delay=1000&promptMessage=Which+pill+%28red%7Cblue%29%3F%3A+] 2016-04-26 17:16:50,192 [ - ShutdownTask] INFO DefaultShutdownStrategy - Route: unplug shutdown complete, was consuming from: Endpoint[direct://unplug] 2016-04-26 17:16:50,192 [ - ShutdownTask] INFO DefaultShutdownStrategy - Route: matrix shutdown complete, was consuming from: Endpoint[direct://neo] 2016-04-26 17:16:50,192 [Thread-5 ] INFO DefaultShutdownStrategy - Graceful shutdown of 3 routes completed in 0 seconds 2016-04-26 17:16:50,236 [Thread-5 ] INFO MainLifecycleStrategy - CamelContext: cdi-camel-xml has been shutdown, triggering shutdown of the JVM. -2016-04-26 17:16:50,259 [Thread-5 ] INFO DefaultCamelContext - Apache Camel 2.18-SNAPSHOT (CamelContext: cdi-camel-xml) uptime 7 minutes -2016-04-26 17:16:50,259 [Thread-5 ] INFO DefaultCamelContext - Apache Camel 2.18-SNAPSHOT (CamelContext: cdi-camel-xml) is shutdown in 0.079 seconds +2016-04-26 17:16:50,259 [Thread-5 ] INFO DefaultCamelContext - Apache Camel 2.18.0 (CamelContext: cdi-camel-xml) uptime 7 minutes +2016-04-26 17:16:50,259 [Thread-5 ] INFO DefaultCamelContext - Apache Camel 2.18.0 (CamelContext: cdi-camel-xml) is shutdown in 0.079 seconds _____ _ _ _ | __| |_ _ _| |_ _| |___ _ _ _ ___ |__ | | | | _| . | . | | | | |_ _ _ http://git-wip-us.apache.org/repos/asf/camel/blob/77383898/tests/camel-itest-performance/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-performance/pom.xml b/tests/camel-itest-performance/pom.xml index 404960f..311090c 100644 --- a/tests/camel-itest-performance/pom.xml +++ b/tests/camel-itest-performance/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.camel</groupId> <artifactId>tests</artifactId> - <version>2.18-SNAPSHOT</version> + <version>2.18.0-SNAPSHOT</version> </parent> <artifactId>camel-itest-performance</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/77383898/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/LibraryVersionMismatchChecker.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/LibraryVersionMismatchChecker.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/LibraryVersionMismatchChecker.java index d3381bb..c6924f2 100644 --- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/LibraryVersionMismatchChecker.java +++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/LibraryVersionMismatchChecker.java @@ -49,7 +49,7 @@ public class LibraryVersionMismatchChecker { MavenResolverSystem resolver = Maven.resolver(); - MavenResolvedArtifact[] original = resolver.resolve("org.apache.camel:" + moduleName + ":2.18-SNAPSHOT").withTransitivity().asResolvedArtifact(); + MavenResolvedArtifact[] original = resolver.resolve("org.apache.camel:" + moduleName + ":2.18.0-SNAPSHOT").withTransitivity().asResolvedArtifact(); Map<String, String> originalMap = versionMap(original); File userPom = createUserPom(moduleName); http://git-wip-us.apache.org/repos/asf/camel/blob/77383898/tests/camel-performance/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-performance/pom.xml b/tests/camel-performance/pom.xml index f8d4caf..a895f85 100644 --- a/tests/camel-performance/pom.xml +++ b/tests/camel-performance/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.camel</groupId> <artifactId>tests</artifactId> - <version>2.18-SNAPSHOT</version> + <version>2.18.0-SNAPSHOT</version> </parent> <artifactId>camel-performance</artifactId>
