buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/35235 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/35234 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel-quarkus] branch master updated: Upgrade quarkus to v0.19.0 #60
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/master by this push: new 0e0d0b7 Upgrade quarkus to v0.19.0 #60 0e0d0b7 is described below commit 0e0d0b793dac58ccc948a5ee892334ba17f9bb37 Author: lburgazzoli AuthorDate: Wed Jul 10 16:55:38 2019 +0200 Upgrade quarkus to v0.19.0 #60 --- .../quarkus/core/deployment/CamelInitProcessor.java| 18 +- .../runtime/{CamelTemplate.java => CamelRecorder.java} | 13 ++--- pom.xml| 2 +- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelInitProcessor.java b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelInitProcessor.java index 4d1c288..8d37035 100644 --- a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelInitProcessor.java +++ b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelInitProcessor.java @@ -35,8 +35,8 @@ import org.apache.camel.builder.AdviceWithRouteBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.quarkus.core.runtime.CamelConfig; import org.apache.camel.quarkus.core.runtime.CamelProducers; +import org.apache.camel.quarkus.core.runtime.CamelRecorder; import org.apache.camel.quarkus.core.runtime.CamelRuntime; -import org.apache.camel.quarkus.core.runtime.CamelTemplate; import org.apache.camel.quarkus.core.runtime.CamelConfig.BuildTime; import org.apache.camel.quarkus.core.runtime.support.RuntimeRegistry; import org.eclipse.microprofile.config.Config; @@ -70,7 +70,7 @@ class CamelInitProcessor { @Record(ExecutionTime.STATIC_INIT) @BuildStep(applicationArchiveMarkers = { CamelSupport.CAMEL_SERVICE_BASE_PATH, CamelSupport.CAMEL_ROOT_PACKAGE_DIRECTORY }) -CamelRuntimeBuildItem createInitTask(RecorderContext recorderContext, CamelTemplate template, +CamelRuntimeBuildItem createInitTask(RecorderContext recorderContext, CamelRecorder recorder, BuildProducer runtimeBeans) { Properties properties = new Properties(); Config configProvider = ConfigProvider.getConfig(); @@ -93,7 +93,7 @@ class CamelInitProcessor { recorderContext.newInstance(type.getName())); }); -RuntimeValue camelRuntime = template.create(registry, properties, builders); +RuntimeValue camelRuntime = recorder.create(registry, properties, builders); runtimeBeans .produce(RuntimeBeanBuildItem.builder(CamelRuntime.class).setRuntimeValue(camelRuntime).build()); @@ -106,11 +106,11 @@ class CamelInitProcessor { AdditionalBeanBuildItem createCamelProducers( RecorderContext recorderContext, CamelRuntimeBuildItem runtime, -CamelTemplate template, +CamelRecorder recorder, BuildProducer listeners) { listeners -.produce(new BeanContainerListenerBuildItem(template.initRuntimeInjection(runtime.getRuntime(; +.produce(new BeanContainerListenerBuildItem(recorder.initRuntimeInjection(runtime.getRuntime(; return AdditionalBeanBuildItem.unremovableOf(CamelProducers.class); } @@ -120,21 +120,21 @@ class CamelInitProcessor { void createInitTask( BeanContainerBuildItem beanContainerBuildItem, CamelRuntimeBuildItem runtime, -CamelTemplate template) throws Exception { +CamelRecorder recorder) throws Exception { -template.init(beanContainerBuildItem.getValue(), runtime.getRuntime(), buildTimeConfig); +recorder.init(beanContainerBuildItem.getValue(), runtime.getRuntime(), buildTimeConfig); } @Record(ExecutionTime.RUNTIME_INIT) @BuildStep(applicationArchiveMarkers = { CamelSupport.CAMEL_SERVICE_BASE_PATH, CamelSupport.CAMEL_ROOT_PACKAGE_DIRECTORY }) void createRuntimeInitTask( -CamelTemplate template, +CamelRecorder recorder, CamelRuntimeBuildItem runtime, ShutdownContextBuildItem shutdown, CamelConfig.Runtime runtimeConfig) throws Exception { -template.start(shutdown, runtime.getRuntime(), runtimeConfig); +recorder.start(shutdown, runtime.getRuntime(), runtimeConfig); } protected Stream getBuildTimeRouteBuilderClasses() { diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/CamelTemplate.java b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/CamelRecorder.java similarity index 97% rename from
[camel] branch camel-2.23.x updated: [CAMEL-13424]Rest Component custom routeId is not accessible in processor(added testcase from jira ensure it works now)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch camel-2.23.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.23.x by this push: new 6eb761d [CAMEL-13424]Rest Component custom routeId is not accessible in processor(added testcase from jira ensure it works now) 6eb761d is described below commit 6eb761ddf256e7853c476eff9d231dd5ff7ca90a Author: Freeman Fang AuthorDate: Wed Jul 10 13:40:15 2019 -0400 [CAMEL-13424]Rest Component custom routeId is not accessible in processor(added testcase from jira ensure it works now) (cherry picked from commit 79c2ad868603255f79ebe7f9e660e498e64e0e2d) (cherry picked from commit 3616ab9ea34c6ca1532b657179ca7ada6132907c) (cherry picked from commit 0f7408b8944e6481c21c2212536f6a9f4b7dea83) --- .../component/restlet/RestRestletRouterIdTest.java | 133 + 1 file changed, 133 insertions(+) diff --git a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java new file mode 100644 index 000..ad2d2af --- /dev/null +++ b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java @@ -0,0 +1,133 @@ +/* + * 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.component.restlet; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; +import org.apache.camel.RoutesBuilder; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.http4.HttpMethods; +import org.apache.camel.impl.JndiRegistry; +import org.apache.camel.model.rest.RestBindingMode; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Assert; +import org.junit.Test; + +public class RestRestletRouterIdTest extends CamelTestSupport { + +private static final Processor SET_ROUTE_ID_AS_BODY = +exchange -> exchange.getIn().setBody(exchange.getFromRouteId()); + +@Override +protected JndiRegistry createRegistry() throws Exception { +JndiRegistry r = super.createRegistry(); +r.bind("setId", SET_ROUTE_ID_AS_BODY); +return r; +} + +@Override +protected RoutesBuilder createRouteBuilder() throws Exception { +return new RouteBuilder() { +@Override +public void configure() throws Exception { + +restConfiguration().component("restlet").host("localhost") +.port(8088).bindingMode(RestBindingMode.auto); + +rest("/app").get("/test1").id("test1").to("direct:setId") +.get("/test2").route().routeId("test2").to("direct:setId"); + rest("/app").get("/test4").route().routeId("test4").to("direct:setId2"); + + +from("direct:setId") +.process(SET_ROUTE_ID_AS_BODY); + +from("direct:setId2") +.process("setId"); + +rest("/app").get("/test3") +.route() +.id("test3") +.process(SET_ROUTE_ID_AS_BODY); + + rest("/app").get("/REST-TEST").route().routeId("TEST").id("REST-TEST").to("direct:setId"); + +rest("/app").get("/test5").route() +.id("test5") +.to("direct:setId") +.endRest() +.to("direct:setId2"); +} + +; +}; +} + +@Test +public void test() throws Exception { + +Assert.assertEquals("\"test1\"", template.requestBodyAndHeader( +"http4://localhost:8088/app/test1", +"", +Exchange.HTTP_METHOD, +HttpMethods.GET, +String.class +)); + +Assert.assertEquals("\"test2\"", template.requestBodyAndHeader( +"http4://localhost:8088/app/test2", +"", +Exchange.HTTP_METHOD, +HttpMethods.GET, +
[camel] branch camel-2.24.x updated: [CAMEL-13424]Rest Component custom routeId is not accessible in processor(added testcase from jira ensure it works now)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch camel-2.24.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.24.x by this push: new 0f7408b [CAMEL-13424]Rest Component custom routeId is not accessible in processor(added testcase from jira ensure it works now) 0f7408b is described below commit 0f7408b8944e6481c21c2212536f6a9f4b7dea83 Author: Freeman Fang AuthorDate: Wed Jul 10 13:40:15 2019 -0400 [CAMEL-13424]Rest Component custom routeId is not accessible in processor(added testcase from jira ensure it works now) (cherry picked from commit 79c2ad868603255f79ebe7f9e660e498e64e0e2d) (cherry picked from commit 3616ab9ea34c6ca1532b657179ca7ada6132907c) --- .../component/restlet/RestRestletRouterIdTest.java | 133 + 1 file changed, 133 insertions(+) diff --git a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java new file mode 100644 index 000..ad2d2af --- /dev/null +++ b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java @@ -0,0 +1,133 @@ +/* + * 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.component.restlet; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; +import org.apache.camel.RoutesBuilder; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.http4.HttpMethods; +import org.apache.camel.impl.JndiRegistry; +import org.apache.camel.model.rest.RestBindingMode; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Assert; +import org.junit.Test; + +public class RestRestletRouterIdTest extends CamelTestSupport { + +private static final Processor SET_ROUTE_ID_AS_BODY = +exchange -> exchange.getIn().setBody(exchange.getFromRouteId()); + +@Override +protected JndiRegistry createRegistry() throws Exception { +JndiRegistry r = super.createRegistry(); +r.bind("setId", SET_ROUTE_ID_AS_BODY); +return r; +} + +@Override +protected RoutesBuilder createRouteBuilder() throws Exception { +return new RouteBuilder() { +@Override +public void configure() throws Exception { + +restConfiguration().component("restlet").host("localhost") +.port(8088).bindingMode(RestBindingMode.auto); + +rest("/app").get("/test1").id("test1").to("direct:setId") +.get("/test2").route().routeId("test2").to("direct:setId"); + rest("/app").get("/test4").route().routeId("test4").to("direct:setId2"); + + +from("direct:setId") +.process(SET_ROUTE_ID_AS_BODY); + +from("direct:setId2") +.process("setId"); + +rest("/app").get("/test3") +.route() +.id("test3") +.process(SET_ROUTE_ID_AS_BODY); + + rest("/app").get("/REST-TEST").route().routeId("TEST").id("REST-TEST").to("direct:setId"); + +rest("/app").get("/test5").route() +.id("test5") +.to("direct:setId") +.endRest() +.to("direct:setId2"); +} + +; +}; +} + +@Test +public void test() throws Exception { + +Assert.assertEquals("\"test1\"", template.requestBodyAndHeader( +"http4://localhost:8088/app/test1", +"", +Exchange.HTTP_METHOD, +HttpMethods.GET, +String.class +)); + +Assert.assertEquals("\"test2\"", template.requestBodyAndHeader( +"http4://localhost:8088/app/test2", +"", +Exchange.HTTP_METHOD, +HttpMethods.GET, +String.class +)); + +
[camel] branch camel-2.x updated: [CAMEL-13424]Rest Component custom routeId is not accessible in processor(added testcase from jira ensure it works now)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.x by this push: new 3616ab9 [CAMEL-13424]Rest Component custom routeId is not accessible in processor(added testcase from jira ensure it works now) 3616ab9 is described below commit 3616ab9ea34c6ca1532b657179ca7ada6132907c Author: Freeman Fang AuthorDate: Wed Jul 10 13:40:15 2019 -0400 [CAMEL-13424]Rest Component custom routeId is not accessible in processor(added testcase from jira ensure it works now) (cherry picked from commit 79c2ad868603255f79ebe7f9e660e498e64e0e2d) --- .../component/restlet/RestRestletRouterIdTest.java | 133 + 1 file changed, 133 insertions(+) diff --git a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java new file mode 100644 index 000..ad2d2af --- /dev/null +++ b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java @@ -0,0 +1,133 @@ +/* + * 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.component.restlet; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; +import org.apache.camel.RoutesBuilder; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.http4.HttpMethods; +import org.apache.camel.impl.JndiRegistry; +import org.apache.camel.model.rest.RestBindingMode; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Assert; +import org.junit.Test; + +public class RestRestletRouterIdTest extends CamelTestSupport { + +private static final Processor SET_ROUTE_ID_AS_BODY = +exchange -> exchange.getIn().setBody(exchange.getFromRouteId()); + +@Override +protected JndiRegistry createRegistry() throws Exception { +JndiRegistry r = super.createRegistry(); +r.bind("setId", SET_ROUTE_ID_AS_BODY); +return r; +} + +@Override +protected RoutesBuilder createRouteBuilder() throws Exception { +return new RouteBuilder() { +@Override +public void configure() throws Exception { + +restConfiguration().component("restlet").host("localhost") +.port(8088).bindingMode(RestBindingMode.auto); + +rest("/app").get("/test1").id("test1").to("direct:setId") +.get("/test2").route().routeId("test2").to("direct:setId"); + rest("/app").get("/test4").route().routeId("test4").to("direct:setId2"); + + +from("direct:setId") +.process(SET_ROUTE_ID_AS_BODY); + +from("direct:setId2") +.process("setId"); + +rest("/app").get("/test3") +.route() +.id("test3") +.process(SET_ROUTE_ID_AS_BODY); + + rest("/app").get("/REST-TEST").route().routeId("TEST").id("REST-TEST").to("direct:setId"); + +rest("/app").get("/test5").route() +.id("test5") +.to("direct:setId") +.endRest() +.to("direct:setId2"); +} + +; +}; +} + +@Test +public void test() throws Exception { + +Assert.assertEquals("\"test1\"", template.requestBodyAndHeader( +"http4://localhost:8088/app/test1", +"", +Exchange.HTTP_METHOD, +HttpMethods.GET, +String.class +)); + +Assert.assertEquals("\"test2\"", template.requestBodyAndHeader( +"http4://localhost:8088/app/test2", +"", +Exchange.HTTP_METHOD, +HttpMethods.GET, +String.class +)); + +Assert.assertEquals("\"test3\"", template.requestBodyAndHeader( +
[camel] branch master updated: [CAMEL-13424]Rest Component custom routeId is not accessible in processor(added testcase from jira ensure it works now)
This is an automated email from the ASF dual-hosted git repository. ffang 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 79c2ad8 [CAMEL-13424]Rest Component custom routeId is not accessible in processor(added testcase from jira ensure it works now) 79c2ad8 is described below commit 79c2ad868603255f79ebe7f9e660e498e64e0e2d Author: Freeman Fang AuthorDate: Wed Jul 10 13:40:15 2019 -0400 [CAMEL-13424]Rest Component custom routeId is not accessible in processor(added testcase from jira ensure it works now) --- .../component/restlet/RestRestletRouterIdTest.java | 133 + 1 file changed, 133 insertions(+) diff --git a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java new file mode 100644 index 000..ad2d2af --- /dev/null +++ b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java @@ -0,0 +1,133 @@ +/* + * 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.component.restlet; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; +import org.apache.camel.RoutesBuilder; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.http4.HttpMethods; +import org.apache.camel.impl.JndiRegistry; +import org.apache.camel.model.rest.RestBindingMode; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Assert; +import org.junit.Test; + +public class RestRestletRouterIdTest extends CamelTestSupport { + +private static final Processor SET_ROUTE_ID_AS_BODY = +exchange -> exchange.getIn().setBody(exchange.getFromRouteId()); + +@Override +protected JndiRegistry createRegistry() throws Exception { +JndiRegistry r = super.createRegistry(); +r.bind("setId", SET_ROUTE_ID_AS_BODY); +return r; +} + +@Override +protected RoutesBuilder createRouteBuilder() throws Exception { +return new RouteBuilder() { +@Override +public void configure() throws Exception { + +restConfiguration().component("restlet").host("localhost") +.port(8088).bindingMode(RestBindingMode.auto); + +rest("/app").get("/test1").id("test1").to("direct:setId") +.get("/test2").route().routeId("test2").to("direct:setId"); + rest("/app").get("/test4").route().routeId("test4").to("direct:setId2"); + + +from("direct:setId") +.process(SET_ROUTE_ID_AS_BODY); + +from("direct:setId2") +.process("setId"); + +rest("/app").get("/test3") +.route() +.id("test3") +.process(SET_ROUTE_ID_AS_BODY); + + rest("/app").get("/REST-TEST").route().routeId("TEST").id("REST-TEST").to("direct:setId"); + +rest("/app").get("/test5").route() +.id("test5") +.to("direct:setId") +.endRest() +.to("direct:setId2"); +} + +; +}; +} + +@Test +public void test() throws Exception { + +Assert.assertEquals("\"test1\"", template.requestBodyAndHeader( +"http4://localhost:8088/app/test1", +"", +Exchange.HTTP_METHOD, +HttpMethods.GET, +String.class +)); + +Assert.assertEquals("\"test2\"", template.requestBodyAndHeader( +"http4://localhost:8088/app/test2", +"", +Exchange.HTTP_METHOD, +HttpMethods.GET, +String.class +)); + +Assert.assertEquals("\"test3\"", template.requestBodyAndHeader( +"http4://localhost:8088/app/test3", +"", +Exchange.HTTP_METHOD, +
[camel-quarkus] branch master updated: chore(build): cleanup build set-up
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/master by this push: new eb38927 chore(build): cleanup build set-up eb38927 is described below commit eb389277aead41be6ffce0abcc4d5af09bd7648b Author: lburgazzoli AuthorDate: Wed Jul 10 16:31:38 2019 +0200 chore(build): cleanup build set-up --- bom/pom.xml| 6 --- build-parent/pom.xml | 50 -- integration-tests/pom.xml | 8 ++-- .../test-project-sanity-checks.groovy | 4 +- pom.xml| 1 - 5 files changed, 34 insertions(+), 35 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 418fbbb..896bb05 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -44,12 +44,6 @@ import - - org.apache.camel diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 6929ac8..e883eee 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -35,8 +35,14 @@ [3.5.3,) +2.5.7 + 3.0.0 7.6.1 +1.0.6 +3.1.0 +1.7.1 +0.3.0 @@ -117,10 +123,8 @@ - org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec - - org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec - + org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec + org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec org.jboss.logging:jboss-logmanager @@ -149,11 +153,6 @@ -io.fabric8 -docker-maven-plugin -0.29.0 - - org.apache.maven.plugins maven-javadoc-plugin @@ -163,23 +162,28 @@ -org.jboss.jandex -jandex-maven-plugin -1.0.6 - - -com.google.code.maven-replacer-plugin -maven-resources-plugin -1.5.3 - - +org.apache.maven.plugins maven-resources-plugin -3.1.0 +${maven-resources-plugin.version} -org.codehaus.gmaven -groovy-maven-plugin -2.1 +org.codehaus.gmavenplus +gmavenplus-plugin +${gmavenplus-plugin.version} + + +org.codehaus.groovy +groovy +${groovy.version} +runtime + + +org.codehaus.groovy +groovy-ant +${groovy.version} +runtime + + diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 311d2e3..e955bdb 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -89,8 +89,8 @@ -org.codehaus.gmaven -groovy-maven-plugin +org.codehaus.gmavenplus +gmavenplus-plugin test-project-sanity-checks @@ -99,7 +99,9 @@ validate - ${project.basedir}/../test-project-sanity-checks.groovy + + file:///${project.basedir}/../test-project-sanity-checks.groovy + diff --git
[camel-k] 02/02: Add conditions to camel-k CRs #594 (fix PR review)
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git commit cc339f7d2c3d0a14f3c7c3b0bb055156b2372141 Author: lburgazzoli AuthorDate: Wed Jul 10 12:42:11 2019 +0200 Add conditions to camel-k CRs #594 (fix PR review) --- pkg/controller/integration/integration_controller.go | 8 1 file changed, 8 deletions(-) diff --git a/pkg/controller/integration/integration_controller.go b/pkg/controller/integration/integration_controller.go index 6bd6e7e..641eaa3 100644 --- a/pkg/controller/integration/integration_controller.go +++ b/pkg/controller/integration/integration_controller.go @@ -79,14 +79,6 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error { UpdateFunc: func(e event.UpdateEvent) bool { oldIntegration := e.ObjectOld.(*v1alpha1.Integration) newIntegration := e.ObjectNew.(*v1alpha1.Integration) - - if oldIntegration.Status.Phase != newIntegration.Status.Phase { - Log.ForIntegration(newIntegration).Info( - "Phase transition", - "old-phase", oldIntegration.Status.Phase, - "new-phase", newIntegration.Status.Phase, - ) - } // Ignore updates to the integration status in which case metadata.Generation does not change, // or except when the integration phase changes as it's used to transition from one phase // to another
[camel-k] 01/02: Add conditions to camel-k CRs #594
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 68df2fb0aa8668ef46e89e5c6be1381d595e7e28 Author: lburgazzoli AuthorDate: Fri Jun 21 13:12:05 2019 +0200 Add conditions to camel-k CRs #594 --- pkg/apis/camel/v1alpha1/build_types.go | 46 +-- pkg/apis/camel/v1alpha1/build_types_support.go | 92 - pkg/apis/camel/v1alpha1/common_types.go| 10 ++ pkg/apis/camel/v1alpha1/integration_types.go | 82 ++-- .../camel/v1alpha1/integration_types_support.go| 147 + pkg/apis/camel/v1alpha1/integrationkit_types.go| 47 +-- .../camel/v1alpha1/integrationkit_types_support.go | 97 +- .../camel/v1alpha1/integrationplatform_types.go| 25 +++- .../v1alpha1/integrationplatform_types_support.go | 77 +++ pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 102 +- pkg/cmd/describe_integration.go| 48 ++- pkg/controller/build/build_controller.go | 6 +- pkg/controller/integration/build_kit.go| 21 +-- pkg/controller/integration/deploy.go | 3 +- pkg/controller/integration/initialize.go | 5 +- .../integration/integration_controller.go | 27 +++- pkg/controller/integration/util.go | 20 ++- .../integrationkit/integrationkit_controller.go| 6 +- pkg/platform/platform.go | 20 ++- pkg/trait/deployment.go| 27 +++- pkg/trait/ingress.go | 71 ++ pkg/trait/knative_service.go | 59 +++-- pkg/trait/route.go | 77 ++- pkg/trait/route_test.go| 2 +- pkg/trait/service.go | 49 +-- pkg/trait/trait_types.go | 7 +- pkg/util/indentedwriter/writer.go | 16 ++- pkg/util/kubernetes/collection.go | 37 ++ pkg/util/kubernetes/resolver.go| 17 ++- pkg/util/kubernetes/util.go| 32 +++-- 30 files changed, 1069 insertions(+), 206 deletions(-) diff --git a/pkg/apis/camel/v1alpha1/build_types.go b/pkg/apis/camel/v1alpha1/build_types.go index 8f8e90a..43b4660 100644 --- a/pkg/apis/camel/v1alpha1/build_types.go +++ b/pkg/apis/camel/v1alpha1/build_types.go @@ -18,6 +18,7 @@ limitations under the License. package v1alpha1 import ( + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -42,16 +43,17 @@ type BuildSpec struct { // BuildStatus defines the observed state of Build type BuildStatus struct { - // INSERT ADDITIONAL STATUS FIELD - define observed state of cluster - // Important: Run "operator-sdk generate k8s" to regenerate code after modifying this file - Phase BuildPhase `json:"phase,omitempty"` - Image string `json:"image,omitempty"` - BaseImage string `json:"baseImage,omitempty"` - PublicImage string `json:"publicImage,omitempty"` - Artifacts []Artifact `json:"artifacts,omitempty"` - Error string `json:"error,omitempty"` - Failure *Failure`json:"failure,omitempty"` - StartedAt metav1.Time `json:"startedAt,omitempty"` + Phase BuildPhase `json:"phase,omitempty"` + Image string `json:"image,omitempty"` + BaseImage string `json:"baseImage,omitempty"` + PublicImage string `json:"publicImage,omitempty"` + Artifacts []Artifact `json:"artifacts,omitempty"` + Error string `json:"error,omitempty"` + Failure *Failure `json:"failure,omitempty"` + StartedAt metav1.Time `json:"startedAt,omitempty"` + Platformstring `json:"platform,omitempty"` + Conditions []BuildCondition `json:"conditions,omitempty"` + // Change to Duration / ISO 8601 when CRD uses OpenAPI spec v3 // https://github.com/OAI/OpenAPI-Specification/issues/845 Duration string `json:"duration,omitempty"` @@ -60,6 +62,9 @@ type BuildStatus struct { // BuildPhase -- type BuildPhase string +// BuildConditionType -- +type BuildConditionType string + const ( // BuildKind -- BuildKind string = "Build" @@ -84,6 +89,11 @@ const ( BuildPhaseInterrupted = "Interrupted" // BuildPhaseError -- BuildPhaseError BuildPhase = "Error" + + // BuildConditionPlatformAvailable -- + BuildConditionPlatformAvailable BuildConditionType = "IntegrationPlatformAvailable" + // BuildConditionPlatformAvailableReason -- + BuildConditionPlatformAvailableReason string =
[camel-k] branch master updated (8d6fdda -> cc339f7)
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git. from 8d6fdda fix lint new 68df2fb Add conditions to camel-k CRs #594 new cc339f7 Add conditions to camel-k CRs #594 (fix PR review) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pkg/apis/camel/v1alpha1/build_types.go | 46 +-- pkg/apis/camel/v1alpha1/build_types_support.go | 92 - pkg/apis/camel/v1alpha1/common_types.go| 10 ++ pkg/apis/camel/v1alpha1/integration_types.go | 82 ++-- .../camel/v1alpha1/integration_types_support.go| 147 + pkg/apis/camel/v1alpha1/integrationkit_types.go| 47 +-- .../camel/v1alpha1/integrationkit_types_support.go | 97 +- .../camel/v1alpha1/integrationplatform_types.go| 25 +++- .../v1alpha1/integrationplatform_types_support.go | 77 +++ pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 102 +- pkg/cmd/describe_integration.go| 48 ++- pkg/controller/build/build_controller.go | 6 +- pkg/controller/integration/build_kit.go| 21 +-- pkg/controller/integration/deploy.go | 3 +- pkg/controller/integration/initialize.go | 5 +- .../integration/integration_controller.go | 19 ++- pkg/controller/integration/util.go | 20 ++- .../integrationkit/integrationkit_controller.go| 6 +- pkg/platform/platform.go | 20 ++- pkg/trait/deployment.go| 27 +++- pkg/trait/ingress.go | 71 ++ pkg/trait/knative_service.go | 59 +++-- pkg/trait/route.go | 77 ++- pkg/trait/route_test.go| 2 +- pkg/trait/service.go | 49 +-- pkg/trait/trait_types.go | 7 +- pkg/util/indentedwriter/writer.go | 16 ++- pkg/util/kubernetes/collection.go | 37 ++ pkg/util/kubernetes/resolver.go| 17 ++- pkg/util/kubernetes/util.go| 32 +++-- 30 files changed, 1061 insertions(+), 206 deletions(-)
[camel-quarkus] branch master updated: Review extensions' dependencies chains #56
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/master by this push: new a68f54b Review extensions' dependencies chains #56 a68f54b is described below commit a68f54b6bad1ac41bc05cdea72608cba6ea1 Author: lburgazzoli AuthorDate: Wed Jul 10 12:49:17 2019 +0200 Review extensions' dependencies chains #56 --- extensions/aws-s3/deployment/pom.xml | 13 +--- extensions/aws-s3/runtime/pom.xml | 19 +- extensions/aws-sns/deployment/pom.xml | 13 +--- extensions/aws-sns/runtime/pom.xml| 19 +- extensions/aws-sqs/deployment/pom.xml | 13 +--- extensions/aws-sqs/runtime/pom.xml| 19 +- extensions/core/deployment/pom.xml| 10 +-- extensions/core/runtime/pom.xml | 21 +++--- extensions/infinispan/deployment/pom.xml | 99 +--- extensions/infinispan/runtime/pom.xml | 17 ++--- extensions/jdbc/deployment/pom.xml| 11 ++-- extensions/jdbc/runtime/pom.xml | 5 -- extensions/netty4-http/deployment/pom.xml | 97 +--- extensions/netty4-http/runtime/pom.xml| 20 ++ extensions/salesforce/deployment/pom.xml | 89 - extensions/salesforce/runtime/pom.xml | 17 + extensions/servlet/deployment/pom.xml | 104 ++ extensions/servlet/runtime/pom.xml| 13 ++-- integration-tests/aws-s3/pom.xml | 29 + integration-tests/aws-sns/pom.xml | 29 + integration-tests/aws-sqs/pom.xml | 29 + integration-tests/core/pom.xml| 18 +- integration-tests/jdbc/pom.xml| 6 -- integration-tests/salesforce/pom.xml | 30 + integration-tests/servlet/pom.xml | 1 - 25 files changed, 233 insertions(+), 508 deletions(-) diff --git a/extensions/aws-s3/deployment/pom.xml b/extensions/aws-s3/deployment/pom.xml index 7ff2861..1360c29 100644 --- a/extensions/aws-s3/deployment/pom.xml +++ b/extensions/aws-s3/deployment/pom.xml @@ -31,23 +31,14 @@ Camel Quarkus :: AWS S3 :: Deployment - - - -io.quarkus -quarkus-core-deployment - -io.quarkus -quarkus-arc-deployment +org.apache.camel.quarkus +camel-quarkus-core-deployment - - org.apache.camel.quarkus camel-quarkus-aws-s3 - diff --git a/extensions/aws-s3/runtime/pom.xml b/extensions/aws-s3/runtime/pom.xml index 11cad11..a023322 100644 --- a/extensions/aws-s3/runtime/pom.xml +++ b/extensions/aws-s3/runtime/pom.xml @@ -31,23 +31,11 @@ Camel Quarkus :: AWS S3 :: Runtime - - - -io.quarkus -quarkus-arc - -io.quarkus -quarkus-core +org.apache.camel.quarkus +camel-quarkus-core -com.oracle.substratevm -svm - - - - org.apache.camel camel-aws-s3 @@ -61,17 +49,14 @@ - com.fasterxml.jackson.dataformat jackson-dataformat-cbor - com.fasterxml.jackson.core jackson-databind - diff --git a/extensions/aws-sns/deployment/pom.xml b/extensions/aws-sns/deployment/pom.xml index ffa9e76..45355da 100644 --- a/extensions/aws-sns/deployment/pom.xml +++ b/extensions/aws-sns/deployment/pom.xml @@ -31,23 +31,14 @@ Camel Quarkus :: AWS SNS :: Deployment - - - -io.quarkus -quarkus-core-deployment - -io.quarkus -quarkus-arc-deployment +org.apache.camel.quarkus +camel-quarkus-core-deployment - - org.apache.camel.quarkus camel-quarkus-aws-sns - diff --git a/extensions/aws-sns/runtime/pom.xml b/extensions/aws-sns/runtime/pom.xml index b08d210..41ccbc1 100644 --- a/extensions/aws-sns/runtime/pom.xml +++ b/extensions/aws-sns/runtime/pom.xml @@ -31,23 +31,11 @@ Camel Quarkus :: AWS SNS :: Runtime - - - -io.quarkus -quarkus-arc - -io.quarkus -quarkus-core +org.apache.camel.quarkus +camel-quarkus-core -com.oracle.substratevm -svm - - - - org.apache.camel camel-aws-sns @@ -61,17 +49,14 @@ -
[camel] branch master updated: Fixed CS for camel-cxf
This is an automated email from the ASF dual-hosted git repository. acosentino 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 ce67308 Fixed CS for camel-cxf ce67308 is described below commit ce67308c1d2c86a948d75a21b1a6e8f9aa22ede2 Author: Andrea Cosentino AuthorDate: Wed Jul 10 11:36:56 2019 +0200 Fixed CS for camel-cxf --- .../test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java | 2 +- .../apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java | 2 +- .../apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java index 47addfb..a610123 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java @@ -29,13 +29,13 @@ import javax.activation.FileDataSource; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import org.apache.camel.attachment.AttachmentMessage; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.apache.camel.Exchange; import org.apache.camel.ExchangePattern; +import org.apache.camel.attachment.AttachmentMessage; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.converter.IOConverter; import org.apache.camel.impl.DefaultCamelContext; diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java index 360bd3a..9754f3c 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java @@ -28,13 +28,13 @@ import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; import javax.xml.xpath.XPathConstants; -import org.apache.camel.attachment.AttachmentMessage; import org.w3c.dom.Element; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.ExchangePattern; import org.apache.camel.Processor; +import org.apache.camel.attachment.AttachmentMessage; import org.apache.camel.component.cxf.CXFTestSupport; import org.apache.camel.component.cxf.CxfPayload; import org.apache.camel.converter.jaxp.XmlConverter; diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java index 0bbe8fc..d451aed 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java @@ -33,13 +33,13 @@ import javax.xml.ws.Endpoint; import javax.xml.ws.soap.SOAPBinding; import javax.xml.xpath.XPathConstants; -import org.apache.camel.attachment.AttachmentMessage; import org.w3c.dom.Element; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.ExchangePattern; import org.apache.camel.Processor; +import org.apache.camel.attachment.AttachmentMessage; import org.apache.camel.component.cxf.CXFTestSupport; import org.apache.camel.component.cxf.CxfPayload; import org.apache.camel.converter.jaxp.XmlConverter;
[camel] branch master updated: Fixed Karaf features verification on JDK11 for camel-solr
This is an automated email from the ASF dual-hosted git repository. acosentino 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 79f1711 Fixed Karaf features verification on JDK11 for camel-solr 79f1711 is described below commit 79f1711cd0c7acfc03cc176add5696ef06142eaa Author: Andrea Cosentino AuthorDate: Wed Jul 10 11:20:31 2019 +0200 Fixed Karaf features verification on JDK11 for camel-solr --- components/camel-solr/pom.xml| 7 +++ platforms/karaf/features/src/main/resources/features.xml | 1 + 2 files changed, 8 insertions(+) diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml index 01d10e8..cbd585c 100644 --- a/components/camel-solr/pom.xml +++ b/components/camel-solr/pom.xml @@ -34,6 +34,9 @@ true 9.4.11.v20180605 + +javax.activation.*;version="${javax-activation-version-range}" + org.apache.solr.*;version="${solr-version-range}" @@ -45,6 +48,10 @@ camel-support +org.apache.camel +camel-attachments + + org.apache.solr solr-solrj ${solr-version} diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 0046fd4..7b11435 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -2285,6 +2285,7 @@ mvn:commons-codec/commons-codec/${commons-codec-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version} mvn:commons-io/commons-io/${commons-io-version} +mvn:org.apache.camel/camel-attachments/${project.version} mvn:org.apache.camel/camel-solr/${project.version}
[camel] branch camel-2.x updated (7686dc9 -> 1dbb5af)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git. from 7686dc9 [CAMEL-13711] Files.createTempFile not equivalent to File.createTempFile new 058ef92 CAMEL-13734: camel-undertow - Support streaming for consumer endpoints new 86786b6 CAMEL-13734: camel-undertow - Support streaming for producer endpoints new 6e1d171 CAMEL-13734 - Fixed CS new 1dbb5af Merge pull request #3030 from tadayosi/CAMEL-13734-2x The 34619 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../main/java/org/apache/camel/util/IOHelper.java | 14 +++ .../src/main/docs/undertow-component.adoc | 2 +- .../undertow/DefaultUndertowHttpBinding.java | 31 +- .../undertow/RestUndertowHttpBinding.java | 8 ++ .../component/undertow/UndertowClientCallback.java | 24 ++--- .../component/undertow/UndertowComponent.java | 2 +- .../camel/component/undertow/UndertowConsumer.java | 20 +++- .../camel/component/undertow/UndertowEndpoint.java | 21 ++-- .../camel/component/undertow/UndertowProducer.java | 117 +++-- .../undertow/UndertowStreamingClientCallback.java | 61 +++ 10 files changed, 221 insertions(+), 79 deletions(-) create mode 100644 components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowStreamingClientCallback.java
[camel-quarkus] branch master updated: Fix #31 Move infinispan integration-tests out of core
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/master by this push: new 8a9a2a4 Fix #31 Move infinispan integration-tests out of core 8a9a2a4 is described below commit 8a9a2a41a4d2c0a2ede2cd8f9fe38be197674996 Author: Peter Palaga AuthorDate: Tue Jul 9 20:53:56 2019 +0200 Fix #31 Move infinispan integration-tests out of core --- extensions/infinispan/deployment/pom.xml | 8 +-- extensions/infinispan/runtime/pom.xml | 9 +-- extensions/netty4-http/runtime/pom.xml | 4 ++ integration-tests/core/pom.xml | 18 -- .../java/io/quarkus/it/camel/core/CamelRoute.java | 19 +- .../java/io/quarkus/it/camel/core/CamelTest.java | 1 - integration-tests/{core => infinispan}/pom.xml | 70 ++ .../io/quarkus/it/camel/infinispan/CamelRoute.java | 47 +++ .../camel/infinispan}/CamelInfinispanITCase.java | 2 +- .../it/camel/infinispan}/CamelInfinispanTest.java | 2 +- .../infinispan}/InfinispanServerTestResource.java | 2 +- integration-tests/pom.xml | 1 + 12 files changed, 84 insertions(+), 99 deletions(-) diff --git a/extensions/infinispan/deployment/pom.xml b/extensions/infinispan/deployment/pom.xml index 704217f..40cd4ff 100644 --- a/extensions/infinispan/deployment/pom.xml +++ b/extensions/infinispan/deployment/pom.xml @@ -31,12 +31,12 @@ Camel Quarkus :: Infinispan :: Deployment - - - io.quarkus - quarkus-core-deployment + org.apache.camel.quarkus + camel-quarkus-core-deployment + + io.quarkus quarkus-arc-deployment diff --git a/extensions/infinispan/runtime/pom.xml b/extensions/infinispan/runtime/pom.xml index b8e655d..7054c49 100644 --- a/extensions/infinispan/runtime/pom.xml +++ b/extensions/infinispan/runtime/pom.xml @@ -32,14 +32,15 @@ - -io.quarkus -quarkus-arc +org.apache.camel.quarkus +camel-quarkus-core + + io.quarkus -quarkus-core +quarkus-arc io.quarkus diff --git a/extensions/netty4-http/runtime/pom.xml b/extensions/netty4-http/runtime/pom.xml index 303be8b..53744ec 100644 --- a/extensions/netty4-http/runtime/pom.xml +++ b/extensions/netty4-http/runtime/pom.xml @@ -42,6 +42,10 @@ quarkus-core +io.quarkus +quarkus-netty + + com.oracle.substratevm svm diff --git a/integration-tests/core/pom.xml b/integration-tests/core/pom.xml index 6ad1314..2b7215e 100644 --- a/integration-tests/core/pom.xml +++ b/integration-tests/core/pom.xml @@ -53,10 +53,6 @@ org.apache.camel.quarkus camel-quarkus-netty4-http - -org.apache.camel.quarkus -camel-quarkus-infinispan - org.jboss.slf4j @@ -66,20 +62,6 @@ -org.infinispan -infinispan-core -test-jar - - -org.infinispan -infinispan-server-hotrod -test-jar - - -org.infinispan -infinispan-server-hotrod - - io.quarkus quarkus-junit5 diff --git a/integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelRoute.java b/integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelRoute.java index 076cf78..c6b8436 100644 --- a/integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelRoute.java +++ b/integration-tests/core/src/main/java/io/quarkus/it/camel/core/CamelRoute.java @@ -16,7 +16,6 @@ */ package io.quarkus.it.camel.core; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; @@ -29,8 +28,6 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.bean.BeanProcessor; -import org.apache.camel.component.infinispan.InfinispanConstants; -import org.apache.camel.component.infinispan.InfinispanOperation; import org.apache.camel.support.DefaultExchange; import io.quarkus.runtime.annotations.RegisterForReflection; @@ -62,21 +59,7 @@ public class CamelRoute extends RouteBuilder { from("netty4-http:http://0.0.0.0:8999/foo;) .transform().constant("Netty Hello World"); -from("netty4-http:http://0.0.0.0:8999/put;) -.convertBodyTo(byte[].class) -.to("log:cache?showAll=true") -
[camel] branch master updated: CAMEL-13183: add support for jandex indexer
This is an automated email from the ASF dual-hosted git repository. lburgazzoli 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 cb379c2 CAMEL-13183: add support for jandex indexer cb379c2 is described below commit cb379c2c59c6e4ba1964b45613ac8a587dedeb9f Author: lburgazzoli AuthorDate: Tue Jul 9 19:59:09 2019 +0200 CAMEL-13183: add support for jandex indexer --- parent/pom.xml | 18 ++ 1 file changed, 18 insertions(+) diff --git a/parent/pom.xml b/parent/pom.xml index 57f31d9..a2b10b3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -424,6 +424,7 @@ 1.6.0 +1.0.6 1.6 3.0.1 2.3 @@ -5574,6 +5575,19 @@ maven-surefire-plugin ${maven-surefire-plugin-version} + + org.jboss.jandex + jandex-maven-plugin + ${jandex-maven-plugin-version} + + + make-index + + jandex + + + + @@ -5682,6 +5696,10 @@ + + org.jboss.jandex + jandex-maven-plugin +
[camel] 02/28: Removed unused property aries-blueprint-proxy-impl-version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 46723a8c3beb059e76cc7da9313bb8464df6e0bd Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:13:34 2019 +0200 Removed unused property aries-blueprint-proxy-impl-version --- parent/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 4d0edd1..172d1d0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -57,7 +57,6 @@ 1.3.0 1.10.0 1.1.1 - 1.1.1 1.2.1 1.1.3 1.0.2.Final
[camel] 18/28: Removed unused properties, more housekeeping
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit ed29a58bde0889748dc9b34b53a8db129192b549 Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:35:26 2019 +0200 Removed unused properties, more housekeeping --- parent/pom.xml | 11 --- 1 file changed, 11 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8649c0c..7ceab44 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -319,17 +319,14 @@ 1_2 1.6.1 3.1.0 -2.1.1 2.3.1_1 2.1.5 2.3.2 ${jakarta-jaxb-version} - ${jakarta-jaxb-version} 0.1.6 2.4 7.22.0.Final -1.0.0.Final 3.3.2.Final 1.4.10.Final 7.5.1.Final @@ -373,26 +370,18 @@ 1.1.12 0.6.4 1.5_5 -1.5 1.7.18 2.1.1 2.3.7 0.1.55 0.1.55_1 -2.4_1 -2.4 -3.2.8_1 -1.0.2 1.2 0.5.0 2.4.0 1.1.1 -2.2.0 2.3 1.11.3 -1.0.1 -1.1.1 9.8 9.8_1 2.1.3_1
[camel] 16/28: Removed unused properties related to jasper-bundle, jackson2-scala-version, javassist-bundle-version and ibatis-version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 16960094da52845a417d8d84372ff6f1e927bf59 Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:29:49 2019 +0200 Removed unused properties related to jasper-bundle, jackson2-scala-version, javassist-bundle-version and ibatis-version --- parent/pom.xml | 4 1 file changed, 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9922619..139f849 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -273,7 +273,6 @@ 1.5.18 1.5.18_1 2.3.4.726_4 -2.3.4.726 1.0.7 2.7.5 9.4.15.Final @@ -291,7 +290,6 @@ 2.4.0 1.9.12 2.6.7 -2.6.1 2.9.9 2.19.3 15.0 @@ -299,7 +297,6 @@ 0.9 2.1.1.Final 1.11.2 -6.0.44_1 1.9.3_1 1.9.3 1.0.0.Beta6_1 @@ -312,7 +309,6 @@ 2.6 0.22 1.11.1 -3.12.1.GA_3 3.20.0-GA 2.2.5 2.2.5
[camel] 14/28: Removed unused property hadoop-version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 83bf85e1920d697715d773a5008bac7448c4d299 Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:27:20 2019 +0200 Removed unused property hadoop-version --- parent/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 972852f..410c4a9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -246,7 +246,6 @@ 3.0 3.0_1 1.2.1_1 -1.2.1 2.7.2_1 2.7.4 2.5.0
[camel] 09/28: Removed unused property el-api-1.0-version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 1a8cde8bf25598f293126f24a76fb64d43a65c85 Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:21:25 2019 +0200 Removed unused property el-api-1.0-version --- parent/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 5e97b31..05306f6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -180,7 +180,6 @@ 6.6.2 6.6.2_1 1.3 -1.0.1 0.3.0 2.1.1 2.17.0
[camel] 26/28: Removed unused properties, spring-data-*
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 146bd2cb39d064b23941e31f60cdecead42ce833 Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:42:51 2019 +0200 Removed unused properties, spring-data-* --- parent/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 71f5997..fe051a8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -580,9 +580,7 @@ 2.1.1.RELEASE 2.0.2.RELEASE 2.0.0.RELEASE - 2.1.6.RELEASE 2.1.6.RELEASE_1 - 2.1.6.RELEASE 2.1.6.RELEASE_1 2.1.6.RELEASE 2.1.6.RELEASE_1
[camel] 12/28: Removed unused properties geronimo-ejb_3.1_spec-version, gentlyweb-bundle-version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 8c044895b16faf1441d2fe26c282d2a7f11ac5ab Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:24:55 2019 +0200 Removed unused properties geronimo-ejb_3.1_spec-version, gentlyweb-bundle-version --- parent/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 839db84..f2e6699 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -206,11 +206,9 @@ 1.1.1 2.3.28 1.0.2_1 -1.5_1 1.1.1 1.0 1.0 -1.0.2 1.0.1 1.0 1.0
[camel] 17/28: Removed unused property related to javax.el
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit cbb0990e1aaa3d9aaa6ea6b713f986c7cc16056b Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:31:36 2019 +0200 Removed unused property related to javax.el --- parent/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 139f849..8649c0c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -310,8 +310,6 @@ 0.22 1.11.1 3.20.0-GA -2.2.5 -2.2.5 3.0.0 3.0.1-b04 3.0.1-b10
[camel] 01/28: Removed unused property aopalliance-bundle-version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 078c31712456d16d615b30531873659601e7d3bf Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:12:51 2019 +0200 Removed unused property aopalliance-bundle-version --- parent/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index fa9c4e1..4d0edd1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -49,7 +49,6 @@ 1.7.0_6 3.5.2_1 3.5.2_1 -1.0_6 2.0.0-M24 1.16.0 0.8
[camel] 22/28: Removed unused property maven-scr-plugin-version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 2cc0510f4234732095abe283a7c906deb4b09507 Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:38:17 2019 +0200 Removed unused property maven-scr-plugin-version --- parent/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 640d5e2..3ad4749 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -443,7 +443,6 @@ 3.1.0 2.2.1 2.0.5 -1.25.0 3.2.1 2.22.1 3.2.3
[camel] 07/28: Removed unused commons-* properties
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit d58c79336d20f8a4408ffd38c535802323a18589 Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:20:14 2019 +0200 Removed unused commons-* properties --- parent/pom.xml | 5 - 1 file changed, 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 51922cb..b76bd2c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -129,19 +129,14 @@ 2.5 1.6 1.4 -1.0.15 1.4 2.6.0 -2.1 1.3 3.1_7 2.6 -2.1.1 -1.3 2.6 3.9 1.2 -2.2 3.6.1 3.6 1.6
[camel] branch master updated (dd76862 -> 8aa39b1)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from dd76862 Polished pom new 078c317 Removed unused property aopalliance-bundle-version new 46723a8 Removed unused property aries-blueprint-proxy-impl-version new eccda28 Removed unused property atomix-copycat-version new 5a519b8 Removed unused property avro-ipc-bundle-version new 750fd2c Removed unused property bsh-version new 8161c92 Removed unused properties castor-version, castor-bundle-version, cglib-bundle-version new d58c793 Removed unused commons-* properties new d93125e Removed unused property eclipse-equinox-common-version new 1a8cde8 Removed unused property el-api-1.0-version new b191b34 Removed unused property ezmorph-bundle-version new e2df33c Removed unused property fastinfoset-version new 8c04489 Removed unused properties geronimo-ejb_3.1_spec-version, gentlyweb-bundle-version new ba39375 Removed multiple unused properties related to Geronimo new 83bf85e Removed unused property hadoop-version new dfcc4bc Removed unused properties related to htmlunit new 1696009 Removed unused properties related to jasper-bundle, jackson2-scala-version, javassist-bundle-version and ibatis-version new cbb0990 Removed unused property related to javax.el new ed29a58 Removed unused properties, more housekeeping new 481c0e4 Removed unused properties, lucene3-bundle-version, juel-version new 4f38860 Removed unused property maven-bundle-version new d8b1519 Removed unused property maven-eclipse-plugin-version new 2cc0510 Removed unused property maven-scr-plugin-version new 96764b7 Removed unused properties, nekohtml-version and neethi-bundle-version new a5aa116 Removed unused properties, more housekeeping new cc3b74d Removed unused properties, servlet-api and scala stuff new 146bd2c Removed unused properties, spring-data-* new ee09656 Removed unused properties, housekeeping new 8aa39b1 Removed unused properties, housekeeping completed The 28 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: parent/pom.xml | 66 -- 1 file changed, 66 deletions(-)
[camel] 24/28: Removed unused properties, more housekeeping
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit a5aa116efc7c001cc7ca1adaab73e9528f89329b Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:40:44 2019 +0200 Removed unused properties, more housekeeping --- parent/pom.xml | 5 - 1 file changed, 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index a7af460..82ec819 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -479,7 +479,6 @@ 1.2.7 1.7.3 - 20100527_1 3.11.0 3.11.0_1 2.0.11 @@ -492,7 +491,6 @@ 1.1.3 4.7.5 2.4.3 - 2.7.0.Final 3.0.2 17.0 0.33.0 @@ -531,17 +529,14 @@ 5.7.2 1.0.2 3.2.10.RELEASE -0.9.11 0.9.11_1 1.4_1 2.0.2 3.3.0 2.3.12 4.3.0 -1.13 0.19.1 0.11.1 -1.7.7.1_1 1.7.7.1 1.7R2 2.3.0
[camel] 19/28: Removed unused properties, lucene3-bundle-version, juel-version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 481c0e471f410ab0ac518d5c3a6e329fa8d2a71a Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:36:14 2019 +0200 Removed unused properties, lucene3-bundle-version, juel-version --- parent/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7ceab44..ae797b9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -385,7 +385,6 @@ 9.8 9.8_1 2.1.3_1 -2.1.3 4.11_1 2.3 @@ -415,7 +414,6 @@ 1.2.17 2.11.2 1.2.3 -3.6.0_1 3.6.0 7.6.0_1
[camel] 21/28: Removed unused property maven-eclipse-plugin-version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit d8b151945027484e452230bab9cb4b7fdd4b0f38 Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:37:42 2019 +0200 Removed unused property maven-eclipse-plugin-version --- parent/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index cc7d719..640d5e2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -432,7 +432,6 @@ 3.0.0 7.6.1 5.1.0 -2.10 3.1.2 3.0.1 7.9.Final
[camel] 27/28: Removed unused properties, housekeeping
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit ee09656a9e3110f2b77ffa30bf7a32a1f514919f Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:43:37 2019 +0200 Removed unused properties, housekeeping --- parent/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index fe051a8..4ba0e43 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -598,7 +598,6 @@ 2.5_2 2.12.0 1.5 -2.7.5 2.7.5_1 1.15.0_1 2.5.0_2 @@ -607,7 +606,6 @@ 1.5.21 1.0.37 20.0 -2.2.10 1.0.1 3.1.4 4.2
[camel] 25/28: Removed unused properties, servlet-api and scala stuff
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit cc3b74d384260e0199eecccfd4a9ee3c1b54a20b Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:41:50 2019 +0200 Removed unused properties, servlet-api and scala stuff --- parent/pom.xml | 4 1 file changed, 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 82ec819..71f5997 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -544,19 +544,15 @@ 1.12.1 1.3.8 2.2.10 -1.3.2_2 9.9.1-3_1 9.9.1-3 2.11.7 3.2.2 -2.2.5 -1.0.6 1.3.7 1.3.7_1 1.1.1 1.14.1_1 2.9.0 -1.0 [3,4) 1.4.1 2.0.0
[camel] 28/28: Removed unused properties, housekeeping completed
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 8aa39b1791014c543fd5f75ee299daab39bd8ddc Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:44:57 2019 +0200 Removed unused properties, housekeeping completed --- parent/pom.xml | 4 1 file changed, 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 4ba0e43..57f31d9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -621,7 +621,6 @@ 7.9.1 4.0.7_1 4.0.7 - 1.3.0.Final 1.4.26.Final 2.8.2 2015-01-27T15-02-14 @@ -640,7 +639,6 @@ 2.23.2 4.4.1 5.2.1 - 1.0.2_2 1.6.3_1 1.6.3 2.7.2_3 @@ -661,10 +659,8 @@ 2.6.2 1.1.4c_7 1.1.4c -2013.2 1.4.11_1 1.4.11 -1.2.5 0.6.2 2.8.3 2.14.0
[camel] 10/28: Removed unused property ezmorph-bundle-version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit b191b3452816eb3632b4a43aa8a925b71982 Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:22:33 2019 +0200 Removed unused property ezmorph-bundle-version --- parent/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 05306f6..b8965ec 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -184,7 +184,6 @@ 2.1.1 2.17.0 1.6.0 -1.0.6_1 4.1.0 2.4.13 2.4.13_1
[camel] 15/28: Removed unused properties related to htmlunit
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit dfcc4bc72975cb72d006301f8bd50ffcebf984ae Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:28:08 2019 +0200 Removed unused properties related to htmlunit --- parent/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 410c4a9..9922619 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -263,9 +263,7 @@ 2.5.0 1.0.1 2.5.0 -2.24 2.24_1 -2.23 3.1.0-incubating 1.7 4.4.11
[camel] 23/28: Removed unused properties, nekohtml-version and neethi-bundle-version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 96764b7f6a7aec61356928eb88a85c17f598536e Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:39:00 2019 +0200 Removed unused properties, nekohtml-version and neethi-bundle-version --- parent/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 3ad4749..a7af460 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -468,8 +468,6 @@ 5.9.5.Final 1.0.0.Beta4 1.0.0.RC4 -3.0.1 -1.9.22 0.4.0 3.10.6.Final 4.1.37.Final
[camel] 06/28: Removed unused properties castor-version, castor-bundle-version, cglib-bundle-version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 8161c92458fa2932f773f3870643536f87359320 Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:17:18 2019 +0200 Removed unused properties castor-version, castor-bundle-version, cglib-bundle-version --- parent/pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 1e2b914..51922cb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -110,12 +110,9 @@ 19.0 3.7 3.1.3.2 -1.3.3 -1.3.3_1 1.2 2.0 1.2 -3.2.12_1 3.2.12 3.5.0 3.5.0_1
[camel] 03/28: Removed unused property atomix-copycat-version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit eccda2863cfa353f46369ec5c9d1361b363c0f98 Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:14:30 2019 +0200 Removed unused property atomix-copycat-version --- parent/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 172d1d0..d19547f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -74,7 +74,6 @@ [2.5,3.0) 1.0.8 1.2.1 -1.2.8 1.11-8_1 4.3.1_1 4.3.1
[camel] 08/28: Removed unused property eclipse-equinox-common-version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit d93125e90f372830adcfc8772552f547e61a9d41 Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:20:53 2019 +0200 Removed unused property eclipse-equinox-common-version --- parent/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index b76bd2c..5e97b31 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -170,7 +170,6 @@ 7.22.0.Final 3.1.1 - 3.3.0-v20070426 2.1.5 2.1.5_1 2.10.6
[camel] 20/28: Removed unused property maven-bundle-version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 4f38860a770fe2856c5d01578b6102432ef51eb0 Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:37:13 2019 +0200 Removed unused property maven-bundle-version --- parent/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index ae797b9..cc7d719 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -428,7 +428,6 @@ 3.0.1 2.3 3.0.0 - ${maven-bundle-plugin-version} 4.2.0 3.0.0 7.6.1
[camel] 11/28: Removed unused property fastinfoset-version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit e2df33c793eb26cb2d15d2c0f814543f04a0 Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:23:03 2019 +0200 Removed unused property fastinfoset-version --- parent/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index b8965ec..839db84 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -187,7 +187,6 @@ 4.1.0 2.4.13 2.4.13_1 -1.2.13_1 1.2.58 1.2.58_1 1.8.8
[camel] 04/28: Removed unused property avro-ipc-bundle-version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 5a519b87c86c8a45006220e918dd4c60d79c7013 Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:15:29 2019 +0200 Removed unused property avro-ipc-bundle-version --- parent/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index d19547f..6b98612 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -82,7 +82,6 @@ 1.9.0 1.8.2_1 -1.8.2_1 3.1.6 1.11.573_1 1.11.573
[camel] 13/28: Removed multiple unused properties related to Geronimo
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit ba393756558a58c73e3f881cd71888ef53531c5d Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:26:39 2019 +0200 Removed multiple unused properties related to Geronimo --- parent/pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index f2e6699..972852f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -220,11 +220,8 @@ 1.1.1 1.0-alpha-2 1.0-alpha-1 -1.1 1.1 1.1.1 -1.0 - 1.2 1.1.3 1.0.10 19.0
[camel] 05/28: Removed unused property bsh-version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 750fd2c612ba18ec45b92b1cd91fe9a015361b66 Author: Andrea Cosentino AuthorDate: Wed Jul 10 08:16:04 2019 +0200 Removed unused property bsh-version --- parent/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 6b98612..1e2b914 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -96,7 +96,6 @@ 2.1.0 1.4.6 2.4.0 -2.0b6 0.34 1.61 2.34.0
[camel-k-runtime] 05/05: chore(build): enable -Xlint:unchecked
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit 229bea23ccf5ebb2449add0b5f6de06de2dca3c5 Author: lburgazzoli AuthorDate: Tue Jul 9 23:23:43 2019 +0200 chore(build): enable -Xlint:unchecked --- .../src/main/java/org/apache/camel/k/yaml/parser/StepParserSupport.java | 2 ++ pom.xml | 1 + 2 files changed, 3 insertions(+) diff --git a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/StepParserSupport.java b/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/StepParserSupport.java index 6f76b49..c6d5f0c 100644 --- a/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/StepParserSupport.java +++ b/camel-k-runtime-yaml/src/main/java/org/apache/camel/k/yaml/parser/StepParserSupport.java @@ -31,6 +31,7 @@ public final class StepParserSupport { private StepParserSupport() { } +@SuppressWarnings("unchecked") public static , I> T adaptProcessorToSuper(CamelContext context, I instance) { ObjectHelper.notNull(context, "camel context"); ObjectHelper.notNull(instance, "instance"); @@ -38,6 +39,7 @@ public final class StepParserSupport { return adaptProcessor(context, (Class)instance.getClass().getSuperclass(), instance); } +@SuppressWarnings("unchecked") public static , I> T adaptProcessor(CamelContext context, Class type, I instance) { ObjectHelper.notNull(context, "camel context"); ObjectHelper.notNull(type, "type"); diff --git a/pom.xml b/pom.xml index 778dafe..38bc52c 100644 --- a/pom.xml +++ b/pom.xml @@ -108,6 +108,7 @@ 1.8 -Xlint:deprecation +-Xlint:unchecked
[camel-k-runtime] 02/05: chore(deps): update joor to v0.9.12
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit 4bf28ce5c5ef52f8a60a573d6dbcd9ad9622531a Author: lburgazzoli AuthorDate: Tue Jul 9 22:30:43 2019 +0200 chore(deps): update joor to v0.9.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ac022e9..48e46a2 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 3.0.0-M3 ${camel.version} 5.5.0 -0.9.11 +0.9.12 2.6 3.9 4.3
[camel-k-runtime] 03/05: chore(build): fix maven plugin versions
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit b75a6248c26271937cb5b9077feaf0e0f980dfb1 Author: lburgazzoli AuthorDate: Tue Jul 9 23:10:34 2019 +0200 chore(build): fix maven plugin versions --- camel-k-runtime-bom/pom.xml | 4 distribution/pom.xml| 4 +++- pom.xml | 51 ++--- 3 files changed, 37 insertions(+), 22 deletions(-) diff --git a/camel-k-runtime-bom/pom.xml b/camel-k-runtime-bom/pom.xml index 0790b32..c9b0dc9 100644 --- a/camel-k-runtime-bom/pom.xml +++ b/camel-k-runtime-bom/pom.xml @@ -176,6 +176,7 @@ true org.apache.maven.plugins maven-deploy-plugin +3.0.0-M1 true @@ -183,6 +184,7 @@ org.apache.maven.plugins maven-source-plugin +3.1.0 attach-sources @@ -195,6 +197,7 @@ org.apache.maven.plugins maven-javadoc-plugin +3.1.1 attach-javadocs @@ -211,6 +214,7 @@ org.apache.maven.plugins maven-gpg-plugin +1.6 ${gpg.passphrase} ${gpg.useagent} diff --git a/distribution/pom.xml b/distribution/pom.xml index 05b8f37..f9c1475 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -19,8 +19,8 @@ --> 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;> -camel-k-runtime-parent org.apache.camel.k +camel-k-runtime-parent 1.0.0-SNAPSHOT 4.0.0 @@ -33,7 +33,9 @@ +org.apache.maven.plugins maven-assembly-plugin +${maven-assembly-plugin.version} source-release diff --git a/pom.xml b/pom.xml index 48e46a2..70e39fe 100644 --- a/pom.xml +++ b/pom.xml @@ -64,6 +64,11 @@ 3.0 3.0.0 7.6.1 +1.6 +3.0.0-M1 +3.1.1 +3.1.0 +3.1.1 @@ -364,51 +369,55 @@ true org.apache.maven.plugins maven-deploy-plugin +${maven-deploy-plugin.version} -true +true org.apache.maven.plugins maven-source-plugin +${maven-source-plugin.version} - -attach-sources - -jar - - + +attach-sources + +jar + + org.apache.maven.plugins maven-javadoc-plugin +${maven-javadoc-plugin.version} - -attach-javadocs - -jar - - + +attach-javadocs + +jar + + -${javadoc.opts} +${javadoc.opts} org.apache.maven.plugins maven-gpg-plugin +${maven-gpg-plugin.version} -${gpg.passphrase} -${gpg.useagent} +${gpg.passphrase} +${gpg.useagent} - - -sign - - + + +sign + +
[camel-k-runtime] branch master updated (0ea2447 -> 229bea2)
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git. from 0ea2447 groovy: add missing methods from route builder / builder support new 74c8910 chore(deps): update kotlin to v1.3.41 new 4bf28ce chore(deps): update joor to v0.9.12 new b75a624 chore(build): fix maven plugin versions new 37b7354 chore(deps): update maven-remote-resources-plugin to v1.6.0 new 229bea2 chore(build): enable -Xlint:unchecked The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: camel-k-runtime-bom/pom.xml| 4 ++ .../camel/k/yaml/parser/StepParserSupport.java | 2 + distribution/pom.xml | 4 +- pom.xml| 58 +- 4 files changed, 43 insertions(+), 25 deletions(-)
[camel-k-runtime] 01/05: chore(deps): update kotlin to v1.3.41
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit 74c89102509fa222e95431b2f78b3e2d6dc3b12e Author: lburgazzoli AuthorDate: Tue Jul 9 22:29:45 2019 +0200 chore(deps): update kotlin to v1.3.41 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5705a53..ac022e9 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ 2.12.0 1.7.26 2.5.7 -1.3.40 +1.3.41 1.24 1.3-groovy-2.5 2.9.9
[camel-k-runtime] 04/05: chore(deps): update maven-remote-resources-plugin to v1.6.0
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit 37b7354649b8cacee3a0f7cf5de8f5cfd069251e Author: lburgazzoli AuthorDate: Tue Jul 9 23:18:29 2019 +0200 chore(deps): update maven-remote-resources-plugin to v1.6.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 70e39fe..778dafe 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 1.7.1 3.8.1 2.22.2 - 1.5 + 1.6.0 2.22.2 2.7 0.3.1