[camel] branch master updated (946a24f -> ccd89b5)
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 946a24f [CAMEL-14315]add openapi-rest-dsl-generator add ccd89b5 Camel-Consul: Use Consul docker image 1.6.2 No new revisions were added by this update. Summary of changes: .../test/java/org/apache/camel/component/consul/ConsulTestSupport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
svn commit: r37313 - in /dev/camel: camel-k-runtime/1.0.9/ camel-k/1.0.0-RC1/
Author: nferraro
Date: Fri Dec 20 00:14:42 2019
New Revision: 37313
Log:
Adding artifacts for Camel K 1.0.0-RC1 and Camel K Runtime 1.0.9
Added:
dev/camel/camel-k-runtime/1.0.9/
dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9-source-release.zip
(with props)
dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9-source-release.zip.asc
(with props)
dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9-source-release.zip.md5
dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9-source-release.zip.sha1
dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9.pom
dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9.pom.asc
(with props)
dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9.pom.md5
dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9.pom.sha1
dev/camel/camel-k/1.0.0-RC1/
dev/camel/camel-k/1.0.0-RC1/camel-k-client-1.0.0-RC1-linux-64bit.tar.gz
(with props)
dev/camel/camel-k/1.0.0-RC1/camel-k-client-1.0.0-RC1-linux-64bit.tar.gz.asc
(with props)
dev/camel/camel-k/1.0.0-RC1/camel-k-client-1.0.0-RC1-linux-64bit.tar.gz.sha512
dev/camel/camel-k/1.0.0-RC1/camel-k-client-1.0.0-RC1-mac-64bit.tar.gz
(with props)
dev/camel/camel-k/1.0.0-RC1/camel-k-client-1.0.0-RC1-mac-64bit.tar.gz.asc
(with props)
dev/camel/camel-k/1.0.0-RC1/camel-k-client-1.0.0-RC1-mac-64bit.tar.gz.sha512
dev/camel/camel-k/1.0.0-RC1/camel-k-client-1.0.0-RC1-windows-64bit.tar.gz
(with props)
dev/camel/camel-k/1.0.0-RC1/camel-k-client-1.0.0-RC1-windows-64bit.tar.gz.asc
(with props)
dev/camel/camel-k/1.0.0-RC1/camel-k-client-1.0.0-RC1-windows-64bit.tar.gz.sha512
dev/camel/camel-k/1.0.0-RC1/camel-k-examples-1.0.0-RC1.tar.gz (with props)
dev/camel/camel-k/1.0.0-RC1/camel-k-examples-1.0.0-RC1.tar.gz.asc (with
props)
dev/camel/camel-k/1.0.0-RC1/camel-k-examples-1.0.0-RC1.tar.gz.sha512
dev/camel/camel-k/1.0.0-RC1/camel-k-sources-1.0.0-RC1.tar.gz (with props)
dev/camel/camel-k/1.0.0-RC1/camel-k-sources-1.0.0-RC1.tar.gz.asc (with
props)
dev/camel/camel-k/1.0.0-RC1/camel-k-sources-1.0.0-RC1.tar.gz.sha512
Added:
dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9-source-release.zip
==
Binary file - no diff available.
Propchange:
dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9-source-release.zip
--
svn:mime-type = application/zip
Added:
dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9-source-release.zip.asc
==
Binary file - no diff available.
Propchange:
dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9-source-release.zip.asc
--
svn:mime-type = application/pgp-signature
Added:
dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9-source-release.zip.md5
==
---
dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9-source-release.zip.md5
(added)
+++
dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9-source-release.zip.md5
Fri Dec 20 00:14:42 2019
@@ -0,0 +1 @@
+5cbcb7d105ab064d15ce8b0740df0a13
\ No newline at end of file
Added:
dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9-source-release.zip.sha1
==
---
dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9-source-release.zip.sha1
(added)
+++
dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9-source-release.zip.sha1
Fri Dec 20 00:14:42 2019
@@ -0,0 +1 @@
+7944104e4f0754ae7412dfe6c377768686ee74ad
\ No newline at end of file
Added: dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9.pom
==
--- dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9.pom (added)
+++ dev/camel/camel-k-runtime/1.0.9/apache-camel-k-runtime-1.0.9.pom Fri Dec 20
00:14:42 2019
@@ -0,0 +1,59 @@
+
+
+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;>
+
+org.apache.camel.k
+camel-k-runtime-parent
+1.0.9
+
+ 4.0.0
+ pom
+
+ apache-camel-k-runtime
+
+
+ release
+
+
+
+org.apache.maven.plugins
+maven-assembly-plugin
+${maven-assembly-plugin.version}
+
+
+source-release
+package
+
+ single
+
+
+
[camel-k] 01/01: Release 1.0.0-RC1
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to tag 1.0.0-RC1
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit f448eb9e21f8df79950e7b93ccafbaa922bdeea6
Author: Nicola Ferraro
AuthorDate: Fri Dec 20 01:06:36 2019 +0100
Release 1.0.0-RC1
---
.../camel-k.v1.0.0-rc1.clusterserviceversion.yaml}| 8
.../camel-k/{1.0.0-rc1-snapshot => 1.0.0-rc1}/crd-build.yaml | 0
.../{1.0.0-rc1-snapshot => 1.0.0-rc1}/crd-camel-catalog.yaml | 0
.../{1.0.0-rc1-snapshot => 1.0.0-rc1}/crd-integration-kit.yaml| 0
.../crd-integration-platform.yaml | 0
.../{1.0.0-rc1-snapshot => 1.0.0-rc1}/crd-integration.yaml| 0
deploy/olm-catalog/camel-k/camel-k.package.yaml | 2 +-
deploy/operator-deployment.yaml | 2 +-
deploy/resources.go | 2 +-
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 2 +-
11 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/camel-k.v1.0.0-rc1-snapshot.clusterserviceversion.yaml
b/deploy/olm-catalog/camel-k/1.0.0-rc1/camel-k.v1.0.0-rc1.clusterserviceversion.yaml
similarity index 98%
rename from
deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/camel-k.v1.0.0-rc1-snapshot.clusterserviceversion.yaml
rename to
deploy/olm-catalog/camel-k/1.0.0-rc1/camel-k.v1.0.0-rc1.clusterserviceversion.yaml
index 9ce7df6..307e604 100644
---
a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/camel-k.v1.0.0-rc1-snapshot.clusterserviceversion.yaml
+++
b/deploy/olm-catalog/camel-k/1.0.0-rc1/camel-k.v1.0.0-rc1.clusterserviceversion.yaml
@@ -66,13 +66,13 @@ metadata:
capabilities: Basic Install
categories: Integration & Delivery
certified: "false"
-containerImage: docker.io/apache/camel-k:1.0.0-RC1-SNAPSHOT
+containerImage: docker.io/apache/camel-k:1.0.0-RC1
createdAt: "2019-07-26T02:45:00Z"
description: Apache Camel K is a lightweight integration platform, born on
Kubernetes,
with serverless superpowers.
repository: https://github.com/apache/camel-k
support: Camel
- name: camel-k-operator.v1.0.0-rc1-SNAPSHOT
+ name: camel-k-operator.v1.0.0-rc1
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -185,7 +185,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
-image: docker.io/apache/camel-k:1.0.0-RC1-SNAPSHOT
+image: docker.io/apache/camel-k:1.0.0-RC1
imagePullPolicy: IfNotPresent
name: camel-k-operator
resources: {}
@@ -399,4 +399,4 @@ spec:
selector:
matchLabels:
name: camel-k-operator
- version: 1.0.0-rc1-snapshot
+ version: 1.0.0-rc1
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-build.yaml
b/deploy/olm-catalog/camel-k/1.0.0-rc1/crd-build.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-build.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-rc1/crd-build.yaml
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-camel-catalog.yaml
b/deploy/olm-catalog/camel-k/1.0.0-rc1/crd-camel-catalog.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-camel-catalog.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-rc1/crd-camel-catalog.yaml
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-kit.yaml
b/deploy/olm-catalog/camel-k/1.0.0-rc1/crd-integration-kit.yaml
similarity index 100%
rename from
deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-kit.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-rc1/crd-integration-kit.yaml
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-platform.yaml
b/deploy/olm-catalog/camel-k/1.0.0-rc1/crd-integration-platform.yaml
similarity index 100%
rename from
deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-platform.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-rc1/crd-integration-platform.yaml
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration.yaml
b/deploy/olm-catalog/camel-k/1.0.0-rc1/crd-integration.yaml
similarity index 100%
rename from deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration.yaml
rename to deploy/olm-catalog/camel-k/1.0.0-rc1/crd-integration.yaml
diff --git a/deploy/olm-catalog/camel-k/camel-k.package.yaml
b/deploy/olm-catalog/camel-k/camel-k.package.yaml
index 7ca59a7..d3eb255 100644
--- a/deploy/olm-catalog/camel-k/camel-k.package.yaml
+++ b/deploy/olm-catalog/camel-k/camel-k.package.yaml
@@ -16,7 +16,7 @@
# ---
channels:
-- currentCSV: camel-k-operator.v1.0.0-rc1-snapshot
+-
[camel-k] tag 1.0.0-RC1 created (now f448eb9)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to tag 1.0.0-RC1 in repository https://gitbox.apache.org/repos/asf/camel-k.git. at f448eb9 (commit) This tag includes the following new commits: new f448eb9 Release 1.0.0-RC1 The 1 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.
[camel-k] branch master updated: chore(release): fix missing licenses
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/master by this push: new aaf63fa chore(release): fix missing licenses aaf63fa is described below commit aaf63fa2547c752835bd2fd798b108a1a406ee14 Author: Nicola Ferraro AuthorDate: Fri Dec 20 00:33:53 2019 +0100 chore(release): fix missing licenses --- .github/workflows/pr-build.yml | 4 ++-- .github/workflows/pr-kind.yml | 4 ++-- .github/workflows/pr-validate.yml | 4 ++-- deploy/olm-catalog/camel-k/camel-k.package.yaml | 17 ++ examples/amqp.groovy| 30 + examples/saga/lra-coordinator-kub.yaml | 17 ++ examples/saga/lra-coordinator.yaml | 17 ++ 7 files changed, 73 insertions(+), 20 deletions(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 4125468..579eaab 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -1,4 +1,4 @@ -# +# --- # 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. @@ -13,7 +13,7 @@ # 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. -# +# --- name: Build PR diff --git a/.github/workflows/pr-kind.yml b/.github/workflows/pr-kind.yml index cc67db7..0abd374 100644 --- a/.github/workflows/pr-kind.yml +++ b/.github/workflows/pr-kind.yml @@ -1,4 +1,4 @@ -# +# --- # 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. @@ -13,7 +13,7 @@ # 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. -# +# --- name: KinD Integration Tests PR diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml index f18c051..d6aafa0 100644 --- a/.github/workflows/pr-validate.yml +++ b/.github/workflows/pr-validate.yml @@ -1,4 +1,4 @@ -# +# --- # 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. @@ -13,7 +13,7 @@ # 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. -# +# --- name: Validate PR diff --git a/deploy/olm-catalog/camel-k/camel-k.package.yaml b/deploy/olm-catalog/camel-k/camel-k.package.yaml index 5802837..7ca59a7 100644 --- a/deploy/olm-catalog/camel-k/camel-k.package.yaml +++ b/deploy/olm-catalog/camel-k/camel-k.package.yaml @@ -1,3 +1,20 @@ +# --- +# 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. +# --- + channels: - currentCSV: camel-k-operator.v1.0.0-rc1-snapshot name: alpha diff --git a/examples/amqp.groovy b/examples/amqp.groovy index 39860d2..9d691fc 100644 --- a/examples/amqp.groovy +++ b/examples/amqp.groovy @@ -1,18 +1,20 @@ // camel-k: language=groovy -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor
[camel-k] branch master updated: chore(test): fix Knative e2e tests
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new 0c3127e chore(test): fix Knative e2e tests
0c3127e is described below
commit 0c3127eefc13cb1ede3c4abfdc55106d5dc1609c
Author: Nicola Ferraro
AuthorDate: Fri Dec 20 00:21:33 2019 +0100
chore(test): fix Knative e2e tests
---
e2e/knative_test.go | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/e2e/knative_test.go b/e2e/knative_test.go
index cbd09cd..1648a13 100644
--- a/e2e/knative_test.go
+++ b/e2e/knative_test.go
@@ -65,11 +65,13 @@ func TestRunChannelComboGetToPost(t *testing.T) {
Expect(kamel("run", "-n", ns,
"files/knativegetpost1.groovy").Execute()).Should(BeNil())
Eventually(integrationPodPhase(ns, "knativegetpost2"),
10*time.Minute).Should(Equal(v1.PodRunning))
Eventually(integrationPodPhase(ns, "knativegetpost1"),
10*time.Minute).Should(Equal(v1.PodRunning))
- Eventually(integrationLogs(ns, "knativech2"),
5*time.Minute).Should(ContainSubstring(`Received ""`))
+ Eventually(integrationLogs(ns, "knativegetpost2"),
5*time.Minute).Should(ContainSubstring(`Received ""`))
Expect(kamel("delete", "--all", "-n",
ns).Execute()).Should(BeNil())
})
}
+/*
+// FIXME: uncomment when https://github.com/apache/camel-k-runtime/issues/69
is resolved
func TestRunMultiChannelChain(t *testing.T) {
withNewTestNamespace(t, func(ns string) {
Expect(createKnativeChannel(ns, "messages")()).Should(BeNil())
@@ -86,11 +88,11 @@ func TestRunMultiChannelChain(t *testing.T) {
Eventually(integrationLogs(ns, "knativemultihop3"),
5*time.Minute).Should(ContainSubstring(`From words: transformed message`))
Eventually(integrationLogs(ns, "knativemultihop3"),
10*time.Second).ShouldNot(ContainSubstring(`From messages: word`))
Eventually(integrationLogs(ns, "knativemultihop3"),
10*time.Second).ShouldNot(ContainSubstring(`From words: message`))
- // FIXME: uncomment next test when
https://github.com/apache/camel-k-runtime/issues/69 is resolved
- // Eventually(integrationLogs(ns, "knativemultihop3"),
10*time.Second).ShouldNot(ContainSubstring(`From messages: transformed
message`))
+ Eventually(integrationLogs(ns, "knativemultihop3"),
10*time.Second).ShouldNot(ContainSubstring(`From messages: transformed
message`))
Expect(kamel("delete", "--all", "-n",
ns).Execute()).Should(BeNil())
})
}
+*/
func TestRunBroker(t *testing.T) {
withNewTestNamespaceWithKnativeBroker(t, func(ns string) {
[GitHub] [camel-kafka-connector] orpiske opened a new issue #55: Unstable test: CamelSourceTaskTest.testSourcePollingTimeout
orpiske opened a new issue #55: Unstable test: CamelSourceTaskTest.testSourcePollingTimeout URL: https://github.com/apache/camel-kafka-connector/issues/55 I am noticing some sporadic failures on the CamelSourceTaskTest.testSourcePollingTimeout test. From time to time I get this: ``` [ERROR] Tests run: 6, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 8.009 s <<< FAILURE! - in org.apache.camel.kafkaconnector.CamelSourceTaskTest [ERROR] org.apache.camel.kafkaconnector.CamelSourceTaskTest.testSourcePollingTimeout Time elapsed: 3.033 s <<< FAILURE! java.lang.AssertionError: expected:<1> but was:<2> at org.apache.camel.kafkaconnector.CamelSourceTaskTest.testSourcePollingTimeout(CamelSourceTaskTest.java:196) ``` I did not have time to investigate it in depth, but I can take when I get back. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-k] branch master updated: Upgrade to Runtime 1.0.9 and Kaniko 0.14.0
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/master by this push: new e9f37e3 Upgrade to Runtime 1.0.9 and Kaniko 0.14.0 e9f37e3 is described below commit e9f37e37ed775abcd4d5de2a1c5183a4a8572157 Author: Nicola Ferraro AuthorDate: Thu Dec 19 18:29:39 2019 +0100 Upgrade to Runtime 1.0.9 and Kaniko 0.14.0 --- ...g-3.0.0-1.0.8.yaml => camel-catalog-3.0.0-1.0.9.yaml} | 6 +++--- 8.yaml => camel-catalog-quarkus-1.0.0-M1-1.0.9.yaml} | 6 +++--- deploy/resources.go | 16 docs/modules/ROOT/pages/traits/quarkus.adoc | 4 pkg/util/defaults/defaults.go| 4 ++-- script/Makefile | 6 +++--- 6 files changed, 23 insertions(+), 19 deletions(-) diff --git a/deploy/camel-catalog-3.0.0-1.0.8.yaml b/deploy/camel-catalog-3.0.0-1.0.9.yaml similarity index 99% rename from deploy/camel-catalog-3.0.0-1.0.8.yaml rename to deploy/camel-catalog-3.0.0-1.0.9.yaml index 963f485..22c3eb8 100644 --- a/deploy/camel-catalog-3.0.0-1.0.8.yaml +++ b/deploy/camel-catalog-3.0.0-1.0.9.yaml @@ -18,15 +18,15 @@ apiVersion: camel.apache.org/v1 kind: CamelCatalog metadata: - name: camel-catalog-3.0.0-1.0.8 + name: camel-catalog-3.0.0-1.0.9 labels: app: camel-k camel.apache.org/catalog.version: 3.0.0 camel.apache.org/catalog.loader.version: 3.0.0 -camel.apache.org/runtime.version: 1.0.8 +camel.apache.org/runtime.version: 1.0.9 spec: version: 3.0.0 - runtimeVersion: 1.0.8 + runtimeVersion: 1.0.9 artifacts: camel-activemq: groupId: org.apache.camel diff --git a/deploy/camel-catalog-quarkus-1.0.0-M1-1.0.8.yaml b/deploy/camel-catalog-quarkus-1.0.0-M1-1.0.9.yaml similarity index 99% rename from deploy/camel-catalog-quarkus-1.0.0-M1-1.0.8.yaml rename to deploy/camel-catalog-quarkus-1.0.0-M1-1.0.9.yaml index d77a638..4ffa04f 100644 --- a/deploy/camel-catalog-quarkus-1.0.0-M1-1.0.8.yaml +++ b/deploy/camel-catalog-quarkus-1.0.0-M1-1.0.9.yaml @@ -18,16 +18,16 @@ apiVersion: camel.apache.org/v1 kind: CamelCatalog metadata: - name: camel-catalog-quarkus-1.0.0-m1-1.0.8 + name: camel-catalog-quarkus-1.0.0-m1-1.0.9 labels: app: camel-k camel.apache.org/catalog.version: 3.0.0 camel.apache.org/catalog.loader.version: 3.0.0 -camel.apache.org/runtime.version: 1.0.8 +camel.apache.org/runtime.version: 1.0.9 camel.apache.org/runtime.provider: quarkus spec: version: 3.0.0 - runtimeVersion: 1.0.8 + runtimeVersion: 1.0.9 runtimeProvider: quarkus: camelQuarkusVersion: 1.0.0-M1 diff --git a/deploy/resources.go b/deploy/resources.go index eb90634..cec53a4 100644 --- a/deploy/resources.go +++ b/deploy/resources.go @@ -243,7 +243,7 @@ metadata: app: "camel-k" ` - Resources["camel-catalog-3.0.0-1.0.8.yaml"] = + Resources["camel-catalog-3.0.0-1.0.9.yaml"] = ` # --- # Licensed to the Apache Software Foundation (ASF) under one or more @@ -265,15 +265,15 @@ metadata: apiVersion: camel.apache.org/v1 kind: CamelCatalog metadata: - name: camel-catalog-3.0.0-1.0.8 + name: camel-catalog-3.0.0-1.0.9 labels: app: camel-k camel.apache.org/catalog.version: 3.0.0 camel.apache.org/catalog.loader.version: 3.0.0 -camel.apache.org/runtime.version: 1.0.8 +camel.apache.org/runtime.version: 1.0.9 spec: version: 3.0.0 - runtimeVersion: 1.0.8 + runtimeVersion: 1.0.9 artifacts: camel-activemq: groupId: org.apache.camel @@ -3166,7 +3166,7 @@ spec: - org.apache.camel.component.zookeepermaster.MasterComponent ` - Resources["camel-catalog-quarkus-1.0.0-M1-1.0.8.yaml"] = + Resources["camel-catalog-quarkus-1.0.0-M1-1.0.9.yaml"] = ` # --- # Licensed to the Apache Software Foundation (ASF) under one or more @@ -3188,16 +3188,16 @@ spec: apiVersion: camel.apache.org/v1 kind: CamelCatalog metadata: - name: camel-catalog-quarkus-1.0.0-m1-1.0.8 + name: camel-catalog-quarkus-1.0.0-m1-1.0.9 labels: app: camel-k camel.apache.org/catalog.version: 3.0.0 camel.apache.org/catalog.loader.version: 3.0.0 -camel.apache.org/runtime.version: 1.0.8 +camel.apache.org/runtime.version: 1.0.9 camel.apache.org/runtime.provider: quarkus spec: version: 3.0.0 - runtimeVersion: 1.0.8 + runtimeVersion: 1.0.9 runtimeProvider: quarkus: camelQuarkusVersion: 1.0.0-M1 diff --git a/docs/modules/ROOT/pages/traits/quarkus.adoc b/docs/modules/ROOT/pages/traits/quarkus.adoc index ffe20e1..cd4b030 100755 --- a/docs/modules/ROOT/pages/traits/quarkus.adoc +++
[camel-quarkus] branch master updated: Restored the native profile for camel-quarkus-pdf integration tests
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-quarkus.git The following commit(s) were added to refs/heads/master by this push: new 9fad67d Restored the native profile for camel-quarkus-pdf integration tests new f51de5f Merge pull request #556 from aldettinger/camel-quarkus-472 9fad67d is described below commit 9fad67d49f529fa09b6eb53804e86b4ee07c46c7 Author: aldettinger AuthorDate: Thu Dec 19 15:08:13 2019 +0100 Restored the native profile for camel-quarkus-pdf integration tests --- integration-tests/pdf/pom.xml | 31 ++- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/integration-tests/pdf/pom.xml b/integration-tests/pdf/pom.xml index 535844a..d8426ea 100644 --- a/integration-tests/pdf/pom.xml +++ b/integration-tests/pdf/pom.xml @@ -64,37 +64,10 @@ - - native-pdf + native - native-pdf + native
[GitHub] [camel-k] nicolaferraro opened a new pull request #1167: Upgrade to Runtime 1.0.9 and Kaniko 0.14.0
nicolaferraro opened a new pull request #1167: Upgrade to Runtime 1.0.9 and Kaniko 0.14.0 URL: https://github.com/apache/camel-k/pull/1167 **Release Note** ```release-note Upgrade to Camel K Runtime 1.0.9 Upgrade to Kaniko 0.14.0 ``` This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] branch camel-2.23.x updated: CAMEL-14318: Properly generate xs:element "proxy" for camel-blueprint.xsd
This is an automated email from the ASF dual-hosted git repository. ggrzybek 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 af77e70 CAMEL-14318: Properly generate xs:element "proxy" for camel-blueprint.xsd af77e70 is described below commit af77e70a60af9637685ab3e22d7c1cd3b70bc422 Author: Grzegorz Grzybek AuthorDate: Thu Dec 19 18:33:47 2019 +0100 CAMEL-14318: Properly generate xs:element "proxy" for camel-blueprint.xsd (cherry picked from commit e8f0a130722a182a414b67aa20de936b3e481224) --- components/camel-blueprint/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml index aa1d8df..55faa47 100644 --- a/components/camel-blueprint/pom.xml +++ b/components/camel-blueprint/pom.xml @@ -358,6 +358,7 @@ +
[camel] branch camel-2.24.x updated: CAMEL-14318: Properly generate xs:element "proxy" for camel-blueprint.xsd
This is an automated email from the ASF dual-hosted git repository. ggrzybek 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 57204c8 CAMEL-14318: Properly generate xs:element "proxy" for camel-blueprint.xsd 57204c8 is described below commit 57204c88d021741f3f47beca18505b51ff73596f Author: Grzegorz Grzybek AuthorDate: Thu Dec 19 18:33:47 2019 +0100 CAMEL-14318: Properly generate xs:element "proxy" for camel-blueprint.xsd (cherry picked from commit e8f0a130722a182a414b67aa20de936b3e481224) --- components/camel-blueprint/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml index 6453d3d..79e21e0 100644 --- a/components/camel-blueprint/pom.xml +++ b/components/camel-blueprint/pom.xml @@ -358,6 +358,7 @@ +
[camel] branch camel-2.x updated: CAMEL-14318: Properly generate xs:element "proxy" for camel-blueprint.xsd
This is an automated email from the ASF dual-hosted git repository. ggrzybek 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 e8f0a13 CAMEL-14318: Properly generate xs:element "proxy" for camel-blueprint.xsd e8f0a13 is described below commit e8f0a130722a182a414b67aa20de936b3e481224 Author: Grzegorz Grzybek AuthorDate: Thu Dec 19 18:33:47 2019 +0100 CAMEL-14318: Properly generate xs:element "proxy" for camel-blueprint.xsd --- components/camel-blueprint/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml index 674fec4..d501680 100644 --- a/components/camel-blueprint/pom.xml +++ b/components/camel-blueprint/pom.xml @@ -358,6 +358,7 @@ +
[camel] branch master updated (1f51236 -> 3ddfb5d)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 1f51236 core-main: modularize BaseMainSupport for easy subclassing add 3ddfb5d CAMEL-14318: Properly generate xs:element "proxy" for camel-blueprint.xsd (#3429) No new revisions were added by this update. Summary of changes: components/camel-blueprint/pom.xml | 1 + .../src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
[camel-k] branch master updated: fix(CLI): Cannot set Kaniko cache option
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
The following commit(s) were added to refs/heads/master by this push:
new 92b635c fix(CLI): Cannot set Kaniko cache option
92b635c is described below
commit 92b635cddae455d849dde343e90c258112dc5466
Author: Antonin Stefanutti
AuthorDate: Thu Dec 19 15:57:15 2019 +0100
fix(CLI): Cannot set Kaniko cache option
---
pkg/cmd/install.go | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index 0048a5b..17ccad2 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -140,7 +140,7 @@ type installCmdOptions struct {
}
// nolint: gocyclo
-func (o *installCmdOptions) install(_ *cobra.Command, _ []string) error {
+func (o *installCmdOptions) install(cobraCmd *cobra.Command, _ []string) error
{
var collection *kubernetes.Collection
if o.OutputFormat != "" {
collection = kubernetes.NewCollection()
@@ -280,7 +280,8 @@ func (o *installCmdOptions) install(_ *cobra.Command, _
[]string) error {
}
}
- if !o.KanikoBuildCache {
+ kanikoBuildCacheFlag :=
cobraCmd.Flags().Lookup("kaniko-build-cache")
+ if kanikoBuildCacheFlag.Changed {
platform.Spec.Build.KanikoBuildCache =
}
[camel] branch master updated (1b6022d -> 1f51236)
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.git. from 1b6022d Merge pull request #3424 from omarsmak/CAMEL-14312 add 1f51236 core-main: modularize BaseMainSupport for easy subclassing No new revisions were added by this update. Summary of changes: .../org/apache/camel/main/BaseMainSupport.java | 35 -- .../java/org/apache/camel/main/MainSupport.java| 26 2 files changed, 46 insertions(+), 15 deletions(-)
[camel-quarkus] branch master updated: Randomize http test port #553
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-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new d2c7fea Randomize http test port #553
new 7231941 Merge pull request #555 from lburgazzoli/github-553
d2c7fea is described below
commit d2c7fea10853c75dc99e59d41633a64977798414
Author: lburgazzoli
AuthorDate: Thu Dec 19 13:53:23 2019 +0100
Randomize http test port #553
---
integration-tests/pom.xml | 42 ++
1 file changed, 42 insertions(+)
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 4cbf371..0232da2 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -212,10 +212,52 @@
true
+
+org.apache.maven.plugins
+maven-surefire-plugin
+
+
+
${test.http.port.jvm}
+
+
+
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+
+
+
+
+
${test.http.port.native}
+
+
+
+
+
+org.codehaus.mojo
+build-helper-maven-plugin
+${build-helper-maven-plugin.version}
+
+
+reserve-network-port
+
+reserve-network-port
+
+process-resources
+
+
+test.http.port.jvm
+test.http.port.native
+
+
+
+
+
+
org.apache.maven.plugins
maven-jar-plugin
[camel] branch master updated: CAMEL-14312: Fix issues reported by lgtm
This is an automated email from the ASF dual-hosted git repository.
oalsafi 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 a112f3b CAMEL-14312: Fix issues reported by lgtm
new 1b6022d Merge pull request #3424 from omarsmak/CAMEL-14312
a112f3b is described below
commit a112f3b6dd7bff78cf230da5913f0992c063d2ce
Author: Omar Al-Safi
AuthorDate: Thu Dec 19 11:38:49 2019 +0100
CAMEL-14312: Fix issues reported by lgtm
---
.../src/main/java/org/apache/camel/component/hbase/HBaseProducer.java | 2 --
.../src/main/java/org/apache/camel/swagger/RestSwaggerReader.java | 4
.../src/main/java/org/apache/camel/component/xslt/XsltBuilder.java| 2 +-
.../java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java | 2 +-
4 files changed, 2 insertions(+), 8 deletions(-)
diff --git
a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java
b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java
index dd99703..4fd8209 100644
---
a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java
+++
b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseProducer.java
@@ -136,7 +136,6 @@ public class HBaseProducer extends DefaultProducer {
*/
private HBaseRow getCells(Table table, HBaseRow hRow) throws Exception {
HBaseRow resultRow = new HBaseRow();
-List resultCells = new LinkedList<>();
ObjectHelper.notNull(hRow, "HBase row");
ObjectHelper.notNull(hRow.getId(), "HBase row id");
ObjectHelper.notNull(hRow.getCells(), "HBase cells");
@@ -172,7 +171,6 @@ public class HBaseProducer extends DefaultProducer {
resultCell.setValue(endpoint.getCamelContext().getTypeConverter().convertTo(cellModel.getValueType(),
CellUtil.cloneValue(kvs.get(0;
resultCell.setTimestamp(kvs.get(0).getTimestamp());
}
-resultCells.add(resultCell);
resultRow.getCells().add(resultCell);
}
return resultRow;
diff --git
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index 68c4ea6..2897ac4 100644
---
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -230,9 +230,6 @@ public class RestSwaggerReader {
}
private void doParseVerbs(Swagger swagger, RestDefinition rest, String
camelContextId, List verbs, String pathAsTag) {
-// used during gathering of apis
-List paths = new ArrayList<>();
-
String basePath = rest.getPath();
for (VerbDefinition verb : verbs) {
@@ -269,7 +266,6 @@ public class RestSwaggerReader {
Path path = swagger.getPath(opPath);
if (path == null) {
path = new Path();
-paths.add(path);
}
path = path.set(method, op);
diff --git
a/components/camel-xslt/src/main/java/org/apache/camel/component/xslt/XsltBuilder.java
b/components/camel-xslt/src/main/java/org/apache/camel/component/xslt/XsltBuilder.java
index 48454d3..2eaabcb 100644
---
a/components/camel-xslt/src/main/java/org/apache/camel/component/xslt/XsltBuilder.java
+++
b/components/camel-xslt/src/main/java/org/apache/camel/component/xslt/XsltBuilder.java
@@ -66,7 +66,7 @@ public class XsltBuilder implements Processor {
private XMLConverterHelper converter = new XMLConverterHelper();
private Templates template;
private volatile BlockingQueue transformers;
-private SourceHandlerFactory sourceHandlerFactory;
+private volatile SourceHandlerFactory sourceHandlerFactory;
private ResultHandlerFactory resultHandlerFactory = new
StringResultHandlerFactory();
private boolean failOnNullBody = true;
private URIResolver uriResolver;
diff --git
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index ca103e0..3df14a6 100644
---
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -941,7 +941,7 @@ public class EndpointAnnotationProcessor extends
AbstractCamelAnnotationProcesso
if (method.getReturnType() instanceof DeclaredType) {
final DeclaredType returnType = (DeclaredType)
method.getReturnType();
-return
"groovy.lang.MetaClass".equals(returnType.asElement().getSimpleName());
+return
[GitHub] [camel-kafka-connector] orpiske opened a new pull request #53: Added support for testing the Kafka service using Strimzi
orpiske opened a new pull request #53: Added support for testing the Kafka service using Strimzi URL: https://github.com/apache/camel-kafka-connector/pull/53 Also updates the default Kafka service to use the containers from the Strimzi project This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-k] astefanutti opened a new pull request #1166: fix(CLI): Cannot set Kaniko cache option
astefanutti opened a new pull request #1166: fix(CLI): Cannot set Kaniko cache option URL: https://github.com/apache/camel-k/pull/1166 **Release Note** ```release-note NONE ``` This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-quarkus] branch master updated (f3e6fce -> f1441f7)
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-quarkus.git. from f3e6fce Modular RoutesCollector add f1441f7 A JUnit dependency is required to run our integration tests outside of our source tree, e.g. inside Quarkus Platform No new revisions were added by this update. Summary of changes: integration-tests/aws/pom.xml | 2 +- integration-tests/core-impl/pom.xml | 6 ++ 2 files changed, 7 insertions(+), 1 deletion(-)
[GitHub] [camel-quarkus] aldettinger opened a new pull request #556: Restored the native profile for camel-quarkus-pdf integration tests
aldettinger opened a new pull request #556: Restored the native profile for camel-quarkus-pdf integration tests URL: https://github.com/apache/camel-quarkus/pull/556 This test is running on my machine, so the first aim of this PR is to check whether the issue is present on CI. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] branch master updated: CAMEL-14303: Handle duplicate matchOnUriPrefix on api docs. Polish.
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 e1ebc60 CAMEL-14303: Handle duplicate matchOnUriPrefix on api docs.
Polish.
e1ebc60 is described below
commit e1ebc6071187a424fb293699683f39c415d3b47d
Author: Bob Paulin
AuthorDate: Wed Dec 18 21:28:12 2019 -0600
CAMEL-14303: Handle duplicate matchOnUriPrefix on api docs. Polish.
---
components/camel-servlet/pom.xml | 5 ++
.../camel/component/servlet/ServletComponent.java | 35 ++-
.../servlet/rest/RestApiMatchUriServletTest.java | 62 +++
.../apache/camel/support/RestComponentHelper.java | 71 +++---
4 files changed, 136 insertions(+), 37 deletions(-)
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index 7a3f699..1594d44 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -144,6 +144,11 @@
test
+org.apache.camel
+camel-swagger-java
+test
+
+
io.rest-assured
rest-assured
${rest-assured-version}
diff --git
a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
index b62aa8f..de4b955 100644
---
a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
+++
b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
@@ -35,6 +35,7 @@ import org.apache.camel.spi.RestApiConsumerFactory;
import org.apache.camel.spi.RestConfiguration;
import org.apache.camel.spi.RestConsumerFactory;
import org.apache.camel.spi.annotations.Component;
+import org.apache.camel.support.RestComponentHelper;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
@@ -279,43 +280,19 @@ public class ServletComponent extends HttpCommonComponent
implements RestConsume
config = camelContext.getRestConfiguration("servlet", true);
}
-Map map = new HashMap<>();
-// build query string, and append any endpoint configuration properties
-if (config.getComponent() == null ||
config.getComponent().equals("servlet")) {
-// setup endpoint options
-if (config.getEndpointProperties() != null &&
!config.getEndpointProperties().isEmpty()) {
-map.putAll(config.getEndpointProperties());
-}
-}
+Map map =
RestComponentHelper.initRestEndpointProperties("servlet", config);
boolean cors = config.isEnableCORS();
if (cors) {
// allow HTTP Options as we want to handle CORS in rest-dsl
map.put("optionsEnabled", "true");
}
-
-// do not append with context-path as the servlet path should be
without context-path
-
-String query = URISupport.createQueryString(map);
-
-String url;
+
if (api) {
-url = "servlet:///%s?matchOnUriPrefix=true=%s";
-} else {
-url = "servlet:///%s?httpMethodRestrict=%s";
-}
+map.put("matchOnUriPrefix", "true");
+}
-// must use upper case for restrict
-String restrict = verb.toUpperCase(Locale.US);
-if (cors) {
-restrict += ",OPTIONS";
-}
-// get the endpoint
-url = String.format(url, path, restrict);
-
-if (!query.isEmpty()) {
-url = url + "&" + query;
-}
+String url = RestComponentHelper.createRestConsumerUrl("servlet",
verb, path, cors, map);
ServletEndpoint endpoint = camelContext.getEndpoint(url,
ServletEndpoint.class);
setProperties(camelContext, endpoint, parameters);
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestApiMatchUriServletTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestApiMatchUriServletTest.java
new file mode 100644
index 000..003506f
--- /dev/null
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestApiMatchUriServletTest.java
@@ -0,0 +1,62 @@
+/*
+ * 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
+ *
+ *
[camel] branch master updated: Camel-Aws-Translate: Fixed CS
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 d9414fd Camel-Aws-Translate: Fixed CS d9414fd is described below commit d9414fd336a77cdda42611cf6799b810719d8ae0 Author: Andrea Cosentino AuthorDate: Thu Dec 19 14:42:47 2019 +0100 Camel-Aws-Translate: Fixed CS --- .../org/apache/camel/component/aws/translate/TranslateProducer.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateProducer.java b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateProducer.java index e3e6626..2896bf9 100644 --- a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateProducer.java +++ b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateProducer.java @@ -16,13 +16,12 @@ */ package org.apache.camel.component.aws.translate; +import java.util.Collection; + import com.amazonaws.AmazonServiceException; import com.amazonaws.services.translate.AmazonTranslate; import com.amazonaws.services.translate.model.TranslateTextRequest; import com.amazonaws.services.translate.model.TranslateTextResult; - -import java.util.Collection; - import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.Message;
[camel-kafka-connector] branch master updated (e989f4b -> 0d511e8)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from e989f4b Clean up add 2658307 Disable integration tests run by default. add 4b431d1 Polished documentation and ordered example's documentation. new 0d511e8 Fixes (#52) The 1 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: .github/workflows/pr-build.yml | 2 +- README.adoc| 11 ++-- docs/try-it-out-locally.adoc | 113 - tests/pom.xml | 30 ++- 4 files changed, 91 insertions(+), 65 deletions(-)
[camel-kafka-connector] 01/01: Fixes (#52)
This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit 0d511e804e5988ae26289722f5d718c89d27f3f0 Merge: e989f4b 4b431d1 Author: Andrea Tarocchi AuthorDate: Thu Dec 19 14:38:50 2019 +0100 Fixes (#52) Fixes .github/workflows/pr-build.yml | 2 +- README.adoc| 11 ++-- docs/try-it-out-locally.adoc | 113 - tests/pom.xml | 30 ++- 4 files changed, 91 insertions(+), 65 deletions(-)
[GitHub] [camel-quarkus] lburgazzoli opened a new pull request #555: Randomize http test port
lburgazzoli opened a new pull request #555: Randomize http test port URL: https://github.com/apache/camel-quarkus/pull/555 Fixes #553 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] branch release/2.24.3 created (now d373c4c)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/2.24.3 in repository https://gitbox.apache.org/repos/asf/camel.git. at d373c4c [maven-release-plugin] prepare release camel-2.24.3 This branch includes the following new commits: new d373c4c [maven-release-plugin] prepare release camel-2.24.3 The 1 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.
[camel] annotated tag camel-2.24.3 created (now 6b55bbf)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to annotated tag camel-2.24.3 in repository https://gitbox.apache.org/repos/asf/camel.git. at 6b55bbf (tag) tagging d373c4c321ad45a949b568d5503e80a3cc486518 (commit) replaces camel-2.24.2 by Gregor Zurowski on Thu Dec 19 04:51:01 2019 -0800 - Log - [maven-release-plugin] copy for tag camel-2.24.3 --- No new revisions were added by this update.
[camel-k-runtime] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/master by this push: new 3417639 [maven-release-plugin] prepare for next development iteration 3417639 is described below commit 34176392725c79370f21d834aba5f153f5e4c0cc Author: Nicola Ferraro AuthorDate: Thu Dec 19 12:26:44 2019 +0100 [maven-release-plugin] prepare for next development iteration --- camel-k-loader-groovy/pom.xml | 2 +- camel-k-loader-java/pom.xml | 2 +- camel-k-loader-js/pom.xml | 2 +- camel-k-loader-knative/pom.xml| 2 +- camel-k-loader-kotlin/pom.xml | 2 +- camel-k-loader-xml/pom.xml| 2 +- camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml| 2 +- camel-k-loader-yaml/camel-k-loader-yaml/pom.xml | 2 +- camel-k-loader-yaml/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-core/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-core/it/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-core/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-core/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-knative/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-knative/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-knative/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-groovy/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-groovy/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-groovy/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-java/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-java/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-java/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/it/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-knative/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-knative/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-knative/runtime/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-kotlin/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-kotlin/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-kotlin/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/it/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/runtime/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/it/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-runtime-quarkus/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-runtime-quarkus/pom.xml | 2 +- camel-k-quarkus/camel-k-runtime-quarkus/runtime/pom.xml | 2 +- camel-k-quarkus/pom.xml | 2 +- camel-k-runtime-bom/pom.xml | 4 ++-- camel-k-runtime-core/pom.xml | 2 +- camel-k-runtime-health/pom.xml| 2 +- camel-k-runtime-knative/pom.xml | 2 +- camel-k-runtime-main/pom.xml | 2 +- camel-k-runtime-servlet/pom.xml | 2 +- camel-k-runtime-webhook/pom.xml | 2 +- camel-knative/camel-knative-api/pom.xml | 2 +- camel-knative/camel-knative-http/pom.xml | 2 +- camel-knative/camel-knative/pom.xml | 2 +- camel-knative/pom.xml | 2 +- distribution/pom.xml | 2 +- examples/camel-k-runtime-example-health/pom.xml | 2 +- examples/camel-k-runtime-example-knative/pom.xml | 2 +- examples/camel-k-runtime-example-quarkus-groovy/pom.xml | 2 +- examples/camel-k-runtime-example-quarkus-java/pom.xml | 2 +-
[camel-k-runtime] annotated tag camel-k-runtime-parent-1.0.9 created (now dda62dd)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to annotated tag camel-k-runtime-parent-1.0.9 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git. at dda62dd (tag) tagging 7c61af45a14717bf0e98cafcd69866026183e29d (commit) replaces camel-k-runtime-parent-1.0.8 by Nicola Ferraro on Thu Dec 19 12:26:29 2019 +0100 - Log - [maven-release-plugin] copy for tag camel-k-runtime-parent-1.0.9 --- No new revisions were added by this update.
[camel-k-runtime] branch master updated: [maven-release-plugin] prepare release camel-k-runtime-parent-1.0.9
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/master by this push: new 7c61af4 [maven-release-plugin] prepare release camel-k-runtime-parent-1.0.9 7c61af4 is described below commit 7c61af45a14717bf0e98cafcd69866026183e29d Author: Nicola Ferraro AuthorDate: Thu Dec 19 12:15:44 2019 +0100 [maven-release-plugin] prepare release camel-k-runtime-parent-1.0.9 --- camel-k-loader-groovy/pom.xml | 2 +- camel-k-loader-java/pom.xml | 2 +- camel-k-loader-js/pom.xml | 2 +- camel-k-loader-knative/pom.xml| 2 +- camel-k-loader-kotlin/pom.xml | 2 +- camel-k-loader-xml/pom.xml| 2 +- camel-k-loader-yaml/camel-k-loader-yaml-common/pom.xml| 2 +- camel-k-loader-yaml/camel-k-loader-yaml/pom.xml | 2 +- camel-k-loader-yaml/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-core/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-core/it/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-core/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-core/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-knative/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-knative/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-knative/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-groovy/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-groovy/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-groovy/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-java/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-java/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-java/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/it/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-js/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-knative/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-knative/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-knative/runtime/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-kotlin/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-kotlin/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-kotlin/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/it/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-xml/runtime/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/it/pom.xml| 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/pom.xml | 2 +- camel-k-quarkus/camel-k-quarkus-loader-yaml/runtime/pom.xml | 2 +- camel-k-quarkus/camel-k-runtime-quarkus/deployment/pom.xml| 2 +- camel-k-quarkus/camel-k-runtime-quarkus/pom.xml | 2 +- camel-k-quarkus/camel-k-runtime-quarkus/runtime/pom.xml | 2 +- camel-k-quarkus/pom.xml | 2 +- camel-k-runtime-bom/pom.xml | 4 ++-- camel-k-runtime-core/pom.xml | 2 +- camel-k-runtime-health/pom.xml| 2 +- camel-k-runtime-knative/pom.xml | 2 +- camel-k-runtime-main/pom.xml | 2 +- camel-k-runtime-servlet/pom.xml | 2 +- camel-k-runtime-webhook/pom.xml | 2 +- camel-knative/camel-knative-api/pom.xml | 2 +- camel-knative/camel-knative-http/pom.xml | 2 +- camel-knative/camel-knative/pom.xml | 2 +- camel-knative/pom.xml | 2 +- distribution/pom.xml | 2 +- examples/camel-k-runtime-example-health/pom.xml | 2 +- examples/camel-k-runtime-example-knative/pom.xml | 2 +- examples/camel-k-runtime-example-quarkus-groovy/pom.xml | 2 +- examples/camel-k-runtime-example-quarkus-java/pom.xml | 2
[camel-spring-boot] branch master updated: Regen
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-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 0c638e4 Regen
0c638e4 is described below
commit 0c638e45e1803b425c4c12827114065e3933f413
Author: Andrea Cosentino
AuthorDate: Thu Dec 19 12:08:15 2019 +0100
Regen
---
components-starter/camel-corda-starter/pom.xml | 4
tooling/camel-spring-boot-dependencies/pom.xml | 5 -
2 files changed, 9 deletions(-)
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index 82ae9ca..fccd36e 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -48,10 +48,6 @@
ch.qos.logback
logback-core
-
- commons-logging
- commons-logging
-
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 8daffad..2f20948 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -1757,11 +1757,6 @@
${project.version}
-org.apache.camel.springboot
-target
-${project.version}
-
-
org.apache.camel.tests
org.apache.camel.tests.mock-javamail_1.7
3.0.0
[GitHub] [camel-kafka-connector] valdar opened a new pull request #52: Fixes
valdar opened a new pull request #52: Fixes URL: https://github.com/apache/camel-kafka-connector/pull/52 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] branch master updated: Upgrade GRPC to version 1.26.0
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 f076c70 Upgrade GRPC to version 1.26.0 f076c70 is described below commit f076c701faaf9cc1dea2fa07f2c9f156b0f61879 Author: Andrea Cosentino AuthorDate: Thu Dec 19 11:59:23 2019 +0100 Upgrade GRPC to version 1.26.0 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index c2f50d4..89de66d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -239,7 +239,7 @@ 0.30 13.0 2.3.25 -1.25.0 +1.26.0 0.13.0 28.1-jre 3.7.0
[camel-quarkus] branch master updated: Modular RoutesCollector
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 f3e6fce Modular RoutesCollector
f3e6fce is described below
commit f3e6fce8cd727f577914cd43f03c486326079350
Author: lburgazzoli
AuthorDate: Wed Dec 18 21:30:06 2019 +0100
Modular RoutesCollector
The aim here is to make the RoutesCollector more flexible so platform
such as camel-k can fine tune the behavior of the collector i.e. by
providing am ad-hoc way of discovery certain routes from the registry
---
.../component/xml/deployment/XmlProcessor.java | 13 +--
...tXmlLoader.java => DefaultXmlRoutesLoader.java} | 4 +-
.../camel/quarkus/component/xml/XmlRecorder.java | 12 +--
.../quarkus/core/deployment/BuildProcessor.java| 31 --
.../deployment/CamelRoutesLoaderBuildItems.java| 57 +++
.../camel/quarkus/core/CamelMainRecorder.java | 8 +-
.../apache/camel/quarkus/core/CamelRecorder.java | 10 +-
.../camel/quarkus/core/CamelRoutesCollector.java | 104 +
...XmlLoader.java => DisabledXmlRoutesLoader.java} | 2 +-
.../org/apache/camel/quarkus/core/FastModel.java | 4 +-
.../{XmlLoader.java => RegistryRoutesLoader.java} | 13 +--
.../camel/quarkus/core/RegistryRoutesLoaders.java | 103
.../core/{XmlLoader.java => XmlRoutesLoader.java} | 2 +-
integration-tests/core-main-collector/pom.xml | 94 +++
.../apache/camel/quarkus/core/CamelServlet.java| 38 +---
.../src/main/resources/application.properties | 22 -
.../org/apache/camel/quarkus/core/CamelTest.java | 33 ---
.../{core-main => core-main-xml}/pom.xml | 26 +-
.../apache/camel/quarkus/core/CamelServlet.java| 72 ++
.../src/main/resources/application.properties | 18
.../org/apache/camel/quarkus/core/CamelTest.java | 53 +++
.../src/test/resources/my-routes.xml | 0
integration-tests/core-main/pom.xml| 4 -
.../apache/camel/quarkus/core/CamelServlet.java| 9 ++
.../src/main/resources/application.properties | 1 -
.../org/apache/camel/quarkus/core/CamelTest.java | 29 +-
integration-tests/pom.xml | 7 ++
.../support/core-main-collector/deployment/pom.xml | 73 +++
.../core/runtime/support/deployment/Feature.java | 20 ++--
.../support/deployment/SupportBuildStep.java | 32 +++
.../support/{ => core-main-collector}/pom.xml | 16 +---
.../support/core-main-collector/runtime/pom.xml| 71 ++
.../core/runtime/support/SupportRecorder.java | 24 ++---
.../runtime/support/SupportRoutesCollector.java| 23 +++--
integration-tests/support/pom.xml | 1 +
35 files changed, 797 insertions(+), 232 deletions(-)
diff --git
a/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java
b/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java
index f43af15..ec99180 100644
---
a/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java
+++
b/extensions/core-xml/deployment/src/main/java/org/apache/camel/quarkus/component/xml/deployment/XmlProcessor.java
@@ -23,9 +23,8 @@ import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.jaxb.deployment.JaxbFileRootBuildItem;
import org.apache.camel.quarkus.component.xml.XmlRecorder;
import
org.apache.camel.quarkus.core.deployment.CamelModelJAXBContextFactoryBuildItem;
-import org.apache.camel.quarkus.core.deployment.CamelRoutesCollectorBuildItem;
+import org.apache.camel.quarkus.core.deployment.CamelRoutesLoaderBuildItems;
import org.apache.camel.quarkus.core.deployment.CamelSupport;
-import org.apache.camel.quarkus.core.deployment.CamelXmlLoaderBuildItem;
import org.apache.camel.quarkus.support.common.CamelCapabilities;
class XmlProcessor {
@@ -50,14 +49,8 @@ class XmlProcessor {
@BuildStep
@Record(value = ExecutionTime.STATIC_INIT, optional = true)
-CamelXmlLoaderBuildItem xmlLoader(XmlRecorder recorder) {
-return new CamelXmlLoaderBuildItem(recorder.newDefaultXmlLoader());
-}
-
-@BuildStep
-@Record(value = ExecutionTime.STATIC_INIT, optional = true)
-public CamelRoutesCollectorBuildItem routesCollector(XmlRecorder recorder)
{
-return new
CamelRoutesCollectorBuildItem(recorder.newDefaultRoutesCollector());
+CamelRoutesLoaderBuildItems.Xml xmlLoader(XmlRecorder recorder) {
+return new
CamelRoutesLoaderBuildItems.Xml(recorder.newDefaultXmlLoader());
}
@BuildStep
diff --git
[camel-spring-boot] 01/02: Add a fastinstall profile
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 579d3f020ae4d6ba14c36880664f0be3476d91b5 Author: Guillaume Nodet AuthorDate: Thu Dec 19 10:49:25 2019 +0100 Add a fastinstall profile --- pom.xml | 15 +++ 1 file changed, 15 insertions(+) diff --git a/pom.xml b/pom.xml index 187..82e1ddd 100644 --- a/pom.xml +++ b/pom.xml @@ -532,6 +532,21 @@ +fastinstall + + +fastinstall + + + +true +true +true +true + + + + setup.eclipse
[camel-spring-boot] branch master updated (750446e -> 48041ba)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. from 750446e Upgrade logger new 579d3f0 Add a fastinstall profile new 48041ba Refactor module names to 52 characters so that they display nicely in the build 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: camel-catalog-provider-springboot/pom.xml | 2 +- camel-itest-spring-boot/pom.xml| 2 +- camel-spring-boot/pom.xml | 2 +- camel-spring-cloud-consul/pom.xml | 2 +- camel-spring-cloud-netflix/pom.xml | 2 +- camel-spring-cloud-zookeeper/pom.xml | 2 +- camel-spring-cloud/pom.xml | 2 +- components-starter/camel-activemq-starter/pom.xml | 2 +- components-starter/camel-ahc-starter/pom.xml | 2 +- components-starter/camel-ahc-ws-starter/pom.xml| 2 +- components-starter/camel-amqp-starter/pom.xml | 2 +- components-starter/camel-any23-starter/pom.xml | 2 +- components-starter/camel-apns-starter/pom.xml | 2 +- components-starter/camel-as2-starter/pom.xml | 2 +- components-starter/camel-asn1-starter/pom.xml | 2 +- components-starter/camel-asterisk-starter/pom.xml | 2 +- components-starter/camel-atmos-starter/pom.xml | 2 +- .../camel-atmosphere-websocket-starter/pom.xml | 2 +- components-starter/camel-atom-starter/pom.xml | 2 +- components-starter/camel-atomix-starter/pom.xml| 2 +- components-starter/camel-avro-starter/pom.xml | 2 +- components-starter/camel-aws-cw-starter/pom.xml| 2 +- components-starter/camel-aws-ddb-starter/pom.xml | 2 +- components-starter/camel-aws-ec2-starter/pom.xml | 2 +- components-starter/camel-aws-ecs-starter/pom.xml | 2 +- components-starter/camel-aws-eks-starter/pom.xml | 2 +- components-starter/camel-aws-iam-starter/pom.xml | 2 +- components-starter/camel-aws-kinesis-starter/pom.xml | 2 +- components-starter/camel-aws-kms-starter/pom.xml | 2 +- components-starter/camel-aws-lambda-starter/pom.xml| 2 +- components-starter/camel-aws-mq-starter/pom.xml| 2 +- components-starter/camel-aws-msk-starter/pom.xml | 2 +- components-starter/camel-aws-s3-starter/pom.xml| 2 +- components-starter/camel-aws-sdb-starter/pom.xml | 2 +- components-starter/camel-aws-ses-starter/pom.xml | 2 +- components-starter/camel-aws-sns-starter/pom.xml | 2 +- components-starter/camel-aws-sqs-starter/pom.xml | 2 +- components-starter/camel-aws-swf-starter/pom.xml | 2 +- components-starter/camel-aws-translate-starter/pom.xml | 2 +- components-starter/camel-aws-xray-starter/pom.xml | 2 +- components-starter/camel-azure-starter/pom.xml | 2 +- components-starter/camel-barcode-starter/pom.xml | 2 +- components-starter/camel-base64-starter/pom.xml| 2 +- components-starter/camel-bean-starter/pom.xml | 2 +- .../camel-bean-validator-starter/pom.xml | 2 +- components-starter/camel-beanio-starter/pom.xml| 2 +- components-starter/camel-beanstalk-starter/pom.xml | 2 +- components-starter/camel-bindy-starter/pom.xml | 2 +- components-starter/camel-bonita-starter/pom.xml| 2 +- components-starter/camel-box-starter/pom.xml | 2 +- components-starter/camel-braintree-starter/pom.xml | 2 +- components-starter/camel-browse-starter/pom.xml| 2 +- components-starter/camel-caffeine-starter/pom.xml | 2 +- components-starter/camel-cassandraql-starter/pom.xml | 2 +- components-starter/camel-cbor-starter/pom.xml | 2 +- components-starter/camel-chatscript-starter/pom.xml| 2 +- components-starter/camel-chunk-starter/pom.xml | 2 +- components-starter/camel-cm-sms-starter/pom.xml| 2 +- components-starter/camel-cmis-starter/pom.xml | 2 +- components-starter/camel-coap-starter/pom.xml | 2 +- components-starter/camel-cometd-starter/pom.xml| 2 +- components-starter/camel-consul-starter/pom.xml| 2 +- components-starter/camel-controlbus-starter/pom.xml| 2 +- components-starter/camel-corda-starter/pom.xml | 18 +- components-starter/camel-core-starter/pom.xml | 2 +- components-starter/camel-couchbase-starter/pom.xml | 2 +- components-starter/camel-couchdb-starter/pom.xml | 2 +- components-starter/camel-crypto-cms-starter/pom.xml| 2 +-
[GitHub] [camel-k] nicolaferraro opened a new pull request #1165: Fix #1162: Add Knative Integration Tests
nicolaferraro opened a new pull request #1165: Fix #1162: Add Knative Integration Tests URL: https://github.com/apache/camel-k/pull/1165 Fix #1162 **Release Note** ```release-note NONE ``` This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-k] nicolaferraro opened a new pull request #1164: Fix #1162: Add Knative Integration Tests
nicolaferraro opened a new pull request #1164: Fix #1162: Add Knative Integration Tests URL: https://github.com/apache/camel-k/pull/1164 Fix #1162 **Release Note** ```release-note NONE ``` This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel] branch master updated: Upgrade Netty to version 4.1.44.Final
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 aab6d99 Upgrade Netty to version 4.1.44.Final aab6d99 is described below commit aab6d9951ed5019aebff041730c3c82d671bfd8b Author: Andrea Cosentino AuthorDate: Thu Dec 19 11:00:16 2019 +0100 Upgrade Netty to version 4.1.44.Final --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index a5f41fb..c2f50d4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -477,7 +477,7 @@ 1.0.0.RC4 0.4.0 3.10.6.Final -4.1.43.Final +4.1.44.Final 2.0.3 4.0.56.Final 1.0.26
[camel] branch camel-3.0.x updated: CAMEL-14318: camel-blueprint - in XSD is anyType
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.0.x by this push:
new da01f10 CAMEL-14318: camel-blueprint - in XSD is anyType
da01f10 is described below
commit da01f1021fc7fbb9b9ce444783e8e4c398e99727
Author: Claus Ibsen
AuthorDate: Thu Dec 19 11:13:22 2019 +0100
CAMEL-14318: camel-blueprint - in XSD is anyType
---
.../camel-blueprint/src/main/docs/blueprint.adoc | 20 ++--
.../camel/blueprint/CamelProxyFactoryBean.java | 2 +-
.../org/apache/camel/test/blueprint/IEcho.java | 23 +
.../org/apache/camel/test/blueprint/ProxyTest.java | 35
.../org/apache/camel/test/blueprint/proxy.xml | 38 ++
docs/components/modules/ROOT/pages/blueprint.adoc | 20 ++--
6 files changed, 117 insertions(+), 21 deletions(-)
diff --git a/components/camel-blueprint/src/main/docs/blueprint.adoc
b/components/camel-blueprint/src/main/docs/blueprint.adoc
index dc091e3..9b45aed 100644
--- a/components/camel-blueprint/src/main/docs/blueprint.adoc
+++ b/components/camel-blueprint/src/main/docs/blueprint.adoc
@@ -6,13 +6,13 @@ implementation, which is the one used by Apache Karaf.
== Overview
-The XML schema is mostly the same as the one for Spring, so all the xml
snippets throughout the documentation
+The XML schema is mostly the same as the one for Spring, so all the XML
snippets throughout the documentation
referring to Spring XML also apply to Blueprint routes.
-Here is a very simple route definition using blueprint:
+Here is a very simple route definition using Blueprint:
[source,xml]
-
+
http://www.osgi.org/xmlns/blueprint/v1.0.0;>
http://camel.apache.org/schema/blueprint;>
@@ -23,16 +23,16 @@ Here is a very simple route definition using blueprint:
-
+
-There are a few limitations at this point about the supported xml elements
(compared to the Spring xml syntax):
+There are a few limitations at this point about the supported xml elements
(compared to the Spring XML syntax):
-- beanPostProcessor are specific to Spring and aren't allowed
+- `beanPostProcessor` and `` are specific to Spring and are not in use
-However, using blueprint when you deploy your applications in an OSGi
enviroment has several advantages:
+However, using Blueprint when you deploy your applications in an OSGi
environment has several advantages:
-- when upgrading to a new camel version, you don't have to change the
namespace, as the correct version will be
- selected based on the camel packages that are imported by your bundle
+- when upgrading to a new Camel version, you don't have to change the
namespace, as the correct version will be
+ selected based on the Camel packages that are imported by your bundle
- no startup ordering issue with respect to the custom namespaces and your
bundles
- you can use Blueprint property placeholders
@@ -40,6 +40,6 @@ However, using blueprint when you deploy your applications in
an OSGi enviroment
== Using camel-blueprint
To leverage camel-blueprint in OSGi, you only need the Aries Blueprint bundle
and the camel-blueprint bundle,
-in addition to camel-core and its dependencies.
+in addition to camel-core-xml and its dependencies.
If you use Karaf, you can use the feature named camel-blueprint which will
install all the required bundles.
\ No newline at end of file
diff --git
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
index cd42c74d..8358c66 100644
---
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
+++
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
@@ -36,7 +36,7 @@ import org.apache.camel.support.service.ServiceHelper;
/**
* A factory to create a Proxy to a a Camel Pojo Endpoint.
*/
-@XmlRootElement(name = "proxy")
+@XmlRootElement(name = "proxyFactoryBean")
@XmlAccessorType(XmlAccessType.FIELD)
public class CamelProxyFactoryBean extends AbstractCamelFactoryBean {
diff --git
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/IEcho.java
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/IEcho.java
new file mode 100644
index 000..79a869c
--- /dev/null
+++
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/IEcho.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for
[camel] branch master updated: CAMEL-14318: camel-blueprint - in XSD is anyType
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 52d713d CAMEL-14318: camel-blueprint - in XSD is anyType
52d713d is described below
commit 52d713d05432e5af6aa0a69441b9315059383102
Author: Claus Ibsen
AuthorDate: Thu Dec 19 11:13:22 2019 +0100
CAMEL-14318: camel-blueprint - in XSD is anyType
---
.../camel-blueprint/src/main/docs/blueprint.adoc | 20 ++--
.../camel/blueprint/CamelProxyFactoryBean.java | 2 +-
.../org/apache/camel/test/blueprint/IEcho.java | 23 +
.../org/apache/camel/test/blueprint/ProxyTest.java | 35
.../org/apache/camel/test/blueprint/proxy.xml | 38 ++
docs/components/modules/ROOT/pages/blueprint.adoc | 20 ++--
6 files changed, 117 insertions(+), 21 deletions(-)
diff --git a/components/camel-blueprint/src/main/docs/blueprint.adoc
b/components/camel-blueprint/src/main/docs/blueprint.adoc
index dc091e3..9b45aed 100644
--- a/components/camel-blueprint/src/main/docs/blueprint.adoc
+++ b/components/camel-blueprint/src/main/docs/blueprint.adoc
@@ -6,13 +6,13 @@ implementation, which is the one used by Apache Karaf.
== Overview
-The XML schema is mostly the same as the one for Spring, so all the xml
snippets throughout the documentation
+The XML schema is mostly the same as the one for Spring, so all the XML
snippets throughout the documentation
referring to Spring XML also apply to Blueprint routes.
-Here is a very simple route definition using blueprint:
+Here is a very simple route definition using Blueprint:
[source,xml]
-
+
http://www.osgi.org/xmlns/blueprint/v1.0.0;>
http://camel.apache.org/schema/blueprint;>
@@ -23,16 +23,16 @@ Here is a very simple route definition using blueprint:
-
+
-There are a few limitations at this point about the supported xml elements
(compared to the Spring xml syntax):
+There are a few limitations at this point about the supported xml elements
(compared to the Spring XML syntax):
-- beanPostProcessor are specific to Spring and aren't allowed
+- `beanPostProcessor` and `` are specific to Spring and are not in use
-However, using blueprint when you deploy your applications in an OSGi
enviroment has several advantages:
+However, using Blueprint when you deploy your applications in an OSGi
environment has several advantages:
-- when upgrading to a new camel version, you don't have to change the
namespace, as the correct version will be
- selected based on the camel packages that are imported by your bundle
+- when upgrading to a new Camel version, you don't have to change the
namespace, as the correct version will be
+ selected based on the Camel packages that are imported by your bundle
- no startup ordering issue with respect to the custom namespaces and your
bundles
- you can use Blueprint property placeholders
@@ -40,6 +40,6 @@ However, using blueprint when you deploy your applications in
an OSGi enviroment
== Using camel-blueprint
To leverage camel-blueprint in OSGi, you only need the Aries Blueprint bundle
and the camel-blueprint bundle,
-in addition to camel-core and its dependencies.
+in addition to camel-core-xml and its dependencies.
If you use Karaf, you can use the feature named camel-blueprint which will
install all the required bundles.
\ No newline at end of file
diff --git
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
index cd42c74d..8358c66 100644
---
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
+++
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
@@ -36,7 +36,7 @@ import org.apache.camel.support.service.ServiceHelper;
/**
* A factory to create a Proxy to a a Camel Pojo Endpoint.
*/
-@XmlRootElement(name = "proxy")
+@XmlRootElement(name = "proxyFactoryBean")
@XmlAccessorType(XmlAccessType.FIELD)
public class CamelProxyFactoryBean extends AbstractCamelFactoryBean {
diff --git
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/IEcho.java
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/IEcho.java
new file mode 100644
index 000..79a869c
--- /dev/null
+++
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/IEcho.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional
[GitHub] [camel-k] nicolaferraro opened a new issue #1163: Create a Github Action for Camel K
nicolaferraro opened a new issue #1163: Create a Github Action for Camel K URL: https://github.com/apache/camel-k/issues/1163 Prospect feature. We may add a github action that setups a Kubernetes environment ready for Camel K (e.g. based on KinD) and brings the kamel CLI. Users can use it to deploy Camel K integrations and check their state.. In the future with BDD testing features. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [camel-k] nicolaferraro opened a new issue #1162: Add Knative Integration Tests on KinD
nicolaferraro opened a new issue #1162: Add Knative Integration Tests on KinD URL: https://github.com/apache/camel-k/issues/1162 KinD seems to work on github actions for our tests and it seems possible to install Knative on it. Let's try to add it before releasing. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[camel-k] 10/10: Fix #921: fix flacky test
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 8a719066009fae5cade8001958ab3ec6708bc1e6
Author: Nicola Ferraro
AuthorDate: Thu Dec 19 00:31:20 2019 +0100
Fix #921: fix flacky test
---
e2e/test_support.go | 14 --
e2e/upgrade_test.go | 2 +-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/e2e/test_support.go b/e2e/test_support.go
index b8852bd..a05066d 100644
--- a/e2e/test_support.go
+++ b/e2e/test_support.go
@@ -422,13 +422,15 @@ func deletePlatform(ns string) func() bool {
}
}
-func setPlatformVersion(ns string, version string) error {
- p := platform(ns)()
- if p == nil {
- return errors.New("no platform found")
+func setPlatformVersion(ns string, version string) func()error {
+ return func() error {
+ p := platform(ns)()
+ if p == nil {
+ return errors.New("no platform found")
+ }
+ p.Status.Version = version
+ return testClient.Status().Update(testContext, p)
}
- p.Status.Version = version
- return testClient.Status().Update(testContext, p)
}
func platformVersion(ns string) func() string {
diff --git a/e2e/upgrade_test.go b/e2e/upgrade_test.go
index 2017670..ede2b5d 100644
--- a/e2e/upgrade_test.go
+++ b/e2e/upgrade_test.go
@@ -40,7 +40,7 @@ func TestPlatformUpgrade(t *testing.T) {
Eventually(operatorPod(ns)).Should(BeNil())
// Change the version to an older one
- Expect(setPlatformVersion(ns, "an.older.one")).Should(BeNil())
+ Eventually(setPlatformVersion(ns,
"an.older.one")).Should(BeNil())
Eventually(platformVersion(ns)).Should(Equal("an.older.one"))
// Scale the operator up
[camel-k] 02/10: Fix #921: applying golangci-lint --fix
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 a83e34b792c5fa14655b7002a3809187e7bfc44a Author: Nicola Ferraro AuthorDate: Wed Dec 18 17:34:05 2019 +0100 Fix #921: applying golangci-lint --fix --- .golangci.yml | 3 +++ cmd/util/doc-gen/generators/traitdocgen.go | 2 +- cmd/util/json-schema-gen/jsonschemagen.go | 2 +- pkg/apis/addtoscheme_camel_v1.go| 2 +- pkg/builder/builder.go | 2 +- pkg/builder/builder_steps.go| 2 +- pkg/builder/builder_steps_test.go | 2 +- pkg/builder/builder_test.go | 2 +- pkg/builder/builder_types.go| 2 +- pkg/builder/builder_utils.go| 2 +- pkg/builder/runtime/main.go | 2 +- pkg/builder/runtime/main_test.go| 2 +- pkg/builder/runtime/quarkus.go | 2 +- pkg/cmd/builder/builder.go | 2 +- pkg/cmd/completion_bash.go | 2 +- pkg/cmd/delete.go | 2 +- pkg/cmd/describe.go | 2 +- pkg/cmd/describe_integration.go | 2 +- pkg/cmd/describe_kit.go | 2 +- pkg/cmd/describe_platform.go| 2 +- pkg/cmd/get.go | 2 +- pkg/cmd/install.go | 2 +- pkg/cmd/install_test.go | 2 +- pkg/cmd/kit_create.go | 2 +- pkg/cmd/kit_delete.go | 2 +- pkg/cmd/kit_get.go | 2 +- pkg/cmd/log.go | 2 +- pkg/cmd/rebuild.go | 2 +- pkg/cmd/reset.go| 2 +- pkg/cmd/run.go | 2 +- pkg/cmd/util.go | 2 +- pkg/controller/build/action.go | 2 +- pkg/controller/build/build_controller.go| 2 +- pkg/controller/build/error.go | 2 +- pkg/controller/build/initialize_pod.go | 2 +- pkg/controller/build/initialize_routine.go | 2 +- pkg/controller/build/monitor_pod.go | 2 +- pkg/controller/build/monitor_routine.go | 2 +- pkg/controller/build/recovery.go| 2 +- pkg/controller/build/schedule_pod.go| 2 +- pkg/controller/build/schedule_routine.go| 2 +- pkg/controller/integration/action.go| 2 +- pkg/controller/integration/build_kit.go | 2 +- pkg/controller/integration/deploy.go| 2 +- pkg/controller/integration/error.go | 2 +- pkg/controller/integration/initialize.go| 2 +- pkg/controller/integration/integration_controller.go| 2 +- pkg/controller/integration/monitor.go | 2 +- pkg/controller/integration/platform_setup.go| 2 +- pkg/controller/integration/util.go | 2 +- pkg/controller/integration/util_test.go | 2 +- pkg/controller/integrationkit/action.go | 2 +- pkg/controller/integrationkit/build.go | 2 +- pkg/controller/integrationkit/error.go | 2 +- pkg/controller/integrationkit/initialize.go | 2 +- pkg/controller/integrationkit/integrationkit_controller.go | 2 +- pkg/controller/integrationkit/monitor.go| 2 +- pkg/controller/integrationplatform/action.go| 2 +- pkg/controller/integrationplatform/create.go| 2 +- pkg/controller/integrationplatform/create_test.go | 2 +- pkg/controller/integrationplatform/initialize.go| 2 +-
[camel-k] branch master updated (7f3675a -> 8a71906)
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 7f3675a [quarkus] in JVM mode we should no restrict the languages we
can use #1154
new 187cda2 Fix #921: initial migration to v1 API
new a83e34b Fix #921: applying golangci-lint --fix
new adffd39 Fix #921: add integration tests on Kind
new f5b3b30 Fix #921: fix yaml formatting
new 6383d31 Fix #921: upgrade ocp version
new 23d8716 Fix #921: fix hash in ocp version
new 8006e55 Fix #921: update OLM and add v1alpha1 compat test
new 6ac761d Fix #921: add more info on test failure
new d43872f Fix #921: fix doc
new 8a71906 Fix #921: fix flacky test
The 10 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:
.github/workflows/pr-kind.yml | 98 ++
.golangci.yml | 3 +
.travis.yml| 4 +-
README.adoc| 2 +-
assets/json-schema/CamelCatalog.json | 141 +---
assets/json-schema/Integration.json| 144 ++---
assets/json-schema/IntegrationKit.json | 141 +---
cmd/util/doc-gen/generators/traitdocgen.go | 4 +-
cmd/util/json-schema-gen/jsonschemagen.go | 10 +-
deploy/camel-catalog-3.0.0-1.0.8.yaml | 2 +-
deploy/camel-catalog-quarkus-1.0.0-M1-1.0.8.yaml | 2 +-
deploy/cr-example.yaml | 2 +-
deploy/crd-build.yaml | 8 +-
deploy/crd-camel-catalog.yaml | 8 +-
deploy/crd-integration-kit.yaml| 8 +-
deploy/crd-integration-platform.yaml | 8 +-
deploy/crd-integration.yaml| 8 +-
.../camel-k/1.0.0-rc1-snapshot/crd-build.yaml | 12 +-
.../1.0.0-rc1-snapshot/crd-camel-catalog.yaml | 16 ++-
.../1.0.0-rc1-snapshot/crd-integration-kit.yaml| 8 +-
.../crd-integration-platform.yaml | 8 +-
.../1.0.0-rc1-snapshot/crd-integration.yaml| 19 ++-
deploy/olm-catalog/camel-k/camel-k.package.yaml| 23 +---
deploy/platform-cr.yaml| 2 +-
deploy/platform-integration-kit-groovy.yaml| 2 +-
deploy/platform-integration-kit-java.yaml | 2 +-
deploy/platform-integration-kit-js.yaml| 2 +-
deploy/platform-integration-kit-knative.yaml | 2 +-
deploy/platform-integration-kit-kotlin.yaml| 2 +-
deploy/platform-integration-kit-main.yaml | 2 +-
deploy/platform-integration-kit-xml.yaml | 2 +-
deploy/platform-integration-kit-yaml.yaml | 2 +-
deploy/resources.go| 64 ++---
e2e/backward_compat_test.go| 49 ++-
e2e/build_test.go | 6 +-
e2e/client_test.go | 10 +-
e2e/knative_platform_test.go | 26 ++--
e2e/platformless_run_test.go | 8 +-
e2e/test_support.go| 106 +++
e2e/upgrade_test.go| 2 +-
e2e/util/dump.go | 22 +++-
go.sum | 1 +
...e_camel_v1alpha1.go => addtoscheme_camel_v1.go} | 4 +-
pkg/apis/camel/{v1alpha1 => v1}/build_types.go | 11 +-
.../camel/{v1alpha1 => v1}/build_types_support.go | 2 +-
.../camel/{v1alpha1 => v1}/camelcatalog_types.go | 2 +-
.../{v1alpha1 => v1}/camelcatalog_types_support.go | 2 +-
pkg/apis/camel/{v1alpha1 => v1}/common_types.go| 2 +-
.../camel/{v1alpha1 => v1}/common_types_support.go | 2 +-
pkg/apis/camel/{v1alpha1 => v1}/doc.go | 4 +-
.../camel/{v1alpha1 => v1}/integration_types.go| 2 +-
.../{v1alpha1 => v1}/integration_types_support.go | 2 +-
.../integration_types_support_test.go | 2 +-
.../camel/{v1alpha1 => v1}/integrationkit_types.go | 2 +-
.../integrationkit_types_support.go| 2 +-
.../{v1alpha1 => v1}/integrationplatform_types.go | 2 +-
.../integrationplatform_types_support.go | 2 +-
pkg/apis/camel/{v1alpha1 => v1}/knative/types.go | 0
.../{v1alpha1 => v1}/knative/types_support.go | 0
pkg/apis/camel/{v1alpha1 => v1}/register.go| 6 +-
.../{v1alpha1 => v1}/zz_generated.deepcopy.go | 16 +--
.../{v1alpha1 => v1}/zz_generated.defaults.go | 2 +-
pkg/builder/builder.go | 22 ++--
[camel-k] 07/10: Fix #921: update OLM and add v1alpha1 compat test
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 8006e557b4311940a3f1566809d997e2e4a72c27
Author: Nicola Ferraro
AuthorDate: Wed Dec 18 20:30:19 2019 +0100
Fix #921: update OLM and add v1alpha1 compat test
---
.../camel-k/1.0.0-rc1-snapshot/crd-build.yaml | 12 ++-
.../1.0.0-rc1-snapshot/crd-camel-catalog.yaml | 16 +++--
.../1.0.0-rc1-snapshot/crd-integration-kit.yaml| 8 -
.../crd-integration-platform.yaml | 8 -
.../1.0.0-rc1-snapshot/crd-integration.yaml| 19 --
deploy/olm-catalog/camel-k/camel-k.package.yaml| 23 ++--
e2e/backward_compat_test.go| 41 ++
7 files changed, 98 insertions(+), 29 deletions(-)
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-build.yaml
b/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-build.yaml
index 6cad421..29e3276 100644
--- a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-build.yaml
+++ b/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-build.yaml
@@ -24,7 +24,13 @@ metadata:
spec:
group: camel.apache.org
scope: Namespaced
- version: v1alpha1
+ versions:
+ - name: v1alpha1
+served: true
+storage: false
+ - name: v1
+served: true
+storage: true
names:
kind: Build
listKind: BuildList
@@ -39,6 +45,10 @@ spec:
JSONPath: .status.phase
- name: Age
type: date
+ description: The time at which the build was created
+ JSONPath: .metadata.creationTimestamp
+- name: Started
+ type: date
description: The time at which the build was last (re-)started
JSONPath: .status.startedAt
- name: Duration
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-camel-catalog.yaml
b/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-camel-catalog.yaml
index 858bd0f..8a67c6d 100644
--- a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-camel-catalog.yaml
+++ b/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-camel-catalog.yaml
@@ -31,12 +31,22 @@ spec:
shortNames:
- cc
scope: Namespaced
- version: v1alpha1
+ versions:
+ - name: v1alpha1
+served: true
+storage: false
+ - name: v1
+served: true
+storage: true
subresources:
status: {}
additionalPrinterColumns:
-- name: Version
+- name: Camel Version
type: string
- description: The Catalog version
+ description: The Camel version
JSONPath: .spec.version
+- name: Runtime Version
+ type: string
+ description: The Camel K Runtime version
+ JSONPath: .spec.runtimeVersion
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-kit.yaml
b/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-kit.yaml
index 04f3e81..59a34da 100644
--- a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-kit.yaml
+++ b/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-kit.yaml
@@ -24,7 +24,13 @@ metadata:
spec:
group: camel.apache.org
scope: Namespaced
- version: v1alpha1
+ versions:
+ - name: v1alpha1
+served: true
+storage: false
+ - name: v1
+served: true
+storage: true
subresources:
status: {}
names:
diff --git
a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-platform.yaml
b/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-platform.yaml
index 532ad86..7b581d0 100644
---
a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-platform.yaml
+++
b/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration-platform.yaml
@@ -24,7 +24,13 @@ metadata:
spec:
group: camel.apache.org
scope: Namespaced
- version: v1alpha1
+ versions:
+ - name: v1alpha1
+served: true
+storage: false
+ - name: v1
+served: true
+storage: true
subresources:
status: {}
names:
diff --git a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration.yaml
b/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration.yaml
index 0b0f905..9a63ac4 100644
--- a/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration.yaml
+++ b/deploy/olm-catalog/camel-k/1.0.0-rc1-snapshot/crd-integration.yaml
@@ -24,9 +24,18 @@ metadata:
spec:
group: camel.apache.org
scope: Namespaced
- version: v1alpha1
+ versions:
+ - name: v1alpha1
+served: true
+storage: false
+ - name: v1
+served: true
+storage: true
subresources:
status: {}
+scale:
+ specReplicasPath: .spec.replicas
+ statusReplicasPath: .status.replicas
names:
kind: Integration
listKind: IntegrationList
@@ -37,9 +46,13 @@ spec:
additionalPrinterColumns:
- name: Phase
type: string
- description: The Integration phase
+ description: The integration phase
JSONPath: .status.phase
- name: Kit
type: string
-
[camel-k] 08/10: Fix #921: add more info on test failure
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 6ac761d488c689fc98c23d86226866a11f729771
Author: Nicola Ferraro
AuthorDate: Wed Dec 18 23:25:55 2019 +0100
Fix #921: add more info on test failure
---
e2e/util/dump.go | 22 +-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/e2e/util/dump.go b/e2e/util/dump.go
index b07f2ed..f5ae69c 100644
--- a/e2e/util/dump.go
+++ b/e2e/util/dump.go
@@ -23,6 +23,8 @@ import (
"testing"
"github.com/apache/camel-k/pkg/client"
+ "github.com/apache/camel-k/pkg/client/clientset/versioned"
+ "github.com/apache/camel-k/pkg/util/kubernetes"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
@@ -32,12 +34,30 @@ func Dump(c client.Client, ns string, t *testing.T) error {
t.Logf(" start dumping namespace %s
\n", ns)
+ camelClient, err := versioned.NewForConfig(c.GetConfig())
+ if err != nil {
+ return err
+ }
+ pls, err :=
camelClient.CamelV1().IntegrationPlatforms(ns).List(metav1.ListOptions{})
+ if err != nil {
+ return err
+ }
+ t.Logf("Found %d platforms:\n", len(pls.Items))
+ for _, p := range pls.Items {
+ ref := p
+ pdata, err := kubernetes.ToYAML()
+ if err != nil {
+ return err
+ }
+ t.Logf("---\n%s\n---\n", string(pdata))
+ }
+
lst, err := c.CoreV1().Pods(ns).List(metav1.ListOptions{})
if err != nil {
return err
}
- t.Logf("Found %d pods:\n", len(lst.Items))
+ t.Logf("\nFound %d pods:\n", len(lst.Items))
for _, pod := range lst.Items {
t.Logf("name=%s\n", pod.Name)
dumpConditions(" ", pod.Status.Conditions, t)
[camel-k] 03/10: Fix #921: add integration tests on Kind
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 adffd3943009bbb9377cf6c3da9bda5d0b1334e2
Author: Nicola Ferraro
AuthorDate: Wed Dec 18 17:43:57 2019 +0100
Fix #921: add integration tests on Kind
---
.github/workflows/pr-kind.yml | 98 +++
1 file changed, 98 insertions(+)
diff --git a/.github/workflows/pr-kind.yml b/.github/workflows/pr-kind.yml
new file mode 100644
index 000..6cfb391
--- /dev/null
+++ b/.github/workflows/pr-kind.yml
@@ -0,0 +1,98 @@
+#
+# 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.
+#
+
+name: Kind Integration Tests PR
+
+on:
+ pull_request:
+branches:
+ - master
+
+jobs:
+ build:
+
+runs-on: ubuntu-latest
+
+steps:
+- name: Checkout code
+ uses: actions/checkout@v1
+- name: Info
+ run: |
+ls -lart
+- name: Set Up Java
+ uses: actions/setup-java@v1
+ with:
+java-version: 1.8
+- name: Set Go
+ uses: actions/setup-go@v1
+ with:
+go-version: 1.13.x
+- name: Get KinD (Kubernetes in Docker)
+ uses: engineerd/setup-kind@v0.1.0
+ with:
+version: v0.6.1
+skipClusterCreation: "true"
+- name: Start KinD Cluster with Internal Registry
+ run: |
+CLUSTER_NAME="kind"
+REGISTRY_CONTAINER_NAME='kind-registry'
+REGISTRY_PORT='5000'
+docker run -d -p "${REGISTRY_PORT}:5000" --restart=always --name
"${REGISTRY_CONTAINER_NAME}" registry:2
+REGISTRY_IP=$(docker inspect --format '{{.NetworkSettings.IPAddress
}}' "${REGISTRY_CONTAINER_NAME}")
+cat >
/etc/hosts"
+done
+- name: Info
+ run: |
+kubectl cluster-info
+kubectl describe nodes
+- name: Run IT
+ run: |
+# Compute registry parameters
+CAMEL_K_REGISTRY=$(docker inspect --format
'{{.NetworkSettings.IPAddress }}' "kind-registry")
+echo "Using registry ${CAMEL_K_REGISTRY}:5000"
+
+echo "Build project"
+make build-kamel
+echo "Adding maven artifacts to the image context"
+make PACKAGE_ARTIFACTS_STRATEGY=download package-artifacts
+echo "Copying binary file to docker dir"
+mkdir -p ./build/_output/bin
+cp ./kamel ./build/_output/bin/
+echo "Building the images"
+export LOCAL_IMAGE=localhost:5000/apache/camel-k:$(make version)
+export IMAGE=${CAMEL_K_REGISTRY}:5000/apache/camel-k:$(make version)
+docker build -t "${LOCAL_IMAGE}" -f build/Dockerfile .
+docker push ${LOCAL_IMAGE}
+echo "installing camel k cluster resources"
+./kamel install --cluster-setup
+
+# Then run integration tests
+export KAMEL_INSTALL_REGISTRY=${CAMEL_K_REGISTRY}:5000
+export KAMEL_INSTALL_REGISTRY_INSECURE=true
+export KAMEL_INSTALL_OPERATOR_IMAGE=${IMAGE}
+export CAMEL_K_TEST_IMAGE_NAME=${CAMEL_K_REGISTRY}:5000/apache/camel-k
+export CAMEL_K_TEST_IMAGE_VERSION=$(make version)
+make test-integration
[camel-k] 04/10: Fix #921: fix yaml formatting
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 f5b3b30f83f9c81b8bc3311499d4827821604107
Author: Nicola Ferraro
AuthorDate: Wed Dec 18 18:13:43 2019 +0100
Fix #921: fix yaml formatting
---
deploy/crd-build.yaml| 12
deploy/crd-camel-catalog.yaml| 12
deploy/crd-integration-kit.yaml | 12
deploy/crd-integration-platform.yaml | 12
deploy/crd-integration.yaml | 14 -
deploy/resources.go | 58
6 files changed, 63 insertions(+), 57 deletions(-)
diff --git a/deploy/crd-build.yaml b/deploy/crd-build.yaml
index 73404d3..29e3276 100644
--- a/deploy/crd-build.yaml
+++ b/deploy/crd-build.yaml
@@ -25,12 +25,12 @@ spec:
group: camel.apache.org
scope: Namespaced
versions:
-- name: v1alpha1
- served: true
- storage: false
-- name: v1
- served: true
- storage: true
+ - name: v1alpha1
+served: true
+storage: false
+ - name: v1
+served: true
+storage: true
names:
kind: Build
listKind: BuildList
diff --git a/deploy/crd-camel-catalog.yaml b/deploy/crd-camel-catalog.yaml
index 512042c..8a67c6d 100644
--- a/deploy/crd-camel-catalog.yaml
+++ b/deploy/crd-camel-catalog.yaml
@@ -32,12 +32,12 @@ spec:
- cc
scope: Namespaced
versions:
-- name: v1alpha1
- served: true
- storage: false
-- name: v1
- served: true
- storage: true
+ - name: v1alpha1
+served: true
+storage: false
+ - name: v1
+served: true
+storage: true
subresources:
status: {}
additionalPrinterColumns:
diff --git a/deploy/crd-integration-kit.yaml b/deploy/crd-integration-kit.yaml
index c8ccac5..59a34da 100644
--- a/deploy/crd-integration-kit.yaml
+++ b/deploy/crd-integration-kit.yaml
@@ -25,12 +25,12 @@ spec:
group: camel.apache.org
scope: Namespaced
versions:
-- name: v1alpha1
- served: true
- storage: false
-- name: v1
- served: true
- storage: true
+ - name: v1alpha1
+served: true
+storage: false
+ - name: v1
+served: true
+storage: true
subresources:
status: {}
names:
diff --git a/deploy/crd-integration-platform.yaml
b/deploy/crd-integration-platform.yaml
index 8f8e30b..7b581d0 100644
--- a/deploy/crd-integration-platform.yaml
+++ b/deploy/crd-integration-platform.yaml
@@ -25,12 +25,12 @@ spec:
group: camel.apache.org
scope: Namespaced
versions:
-- name: v1alpha1
- served: true
- storage: false
-- name: v1
- served: true
- storage: true
+ - name: v1alpha1
+served: true
+storage: false
+ - name: v1
+served: true
+storage: true
subresources:
status: {}
names:
diff --git a/deploy/crd-integration.yaml b/deploy/crd-integration.yaml
index c22703c..9a63ac4 100644
--- a/deploy/crd-integration.yaml
+++ b/deploy/crd-integration.yaml
@@ -25,12 +25,12 @@ spec:
group: camel.apache.org
scope: Namespaced
versions:
-- name: v1alpha1
- served: true
- storage: false
-- name: v1
- served: true
- storage: true
+ - name: v1alpha1
+served: true
+storage: false
+ - name: v1
+served: true
+storage: true
subresources:
status: {}
scale:
@@ -42,7 +42,7 @@ spec:
plural: integrations
singular: integration
shortNames:
- - it
+- it
additionalPrinterColumns:
- name: Phase
type: string
diff --git a/deploy/resources.go b/deploy/resources.go
index de26ccf..eb90634 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -3814,7 +3814,13 @@ metadata:
spec:
group: camel.apache.org
scope: Namespaced
- version: v1alpha1
+ versions:
+ - name: v1alpha1
+served: true
+storage: false
+ - name: v1
+served: true
+storage: true
names:
kind: Build
listKind: BuildList
@@ -3884,12 +3890,12 @@ spec:
- cc
scope: Namespaced
versions:
-- name: v1alpha1
- served: true
- storage: false
-- name: v1
- served: true
- storage: true
+ - name: v1alpha1
+served: true
+storage: false
+ - name: v1
+served: true
+storage: true
subresources:
status: {}
additionalPrinterColumns:
@@ -3933,12 +3939,12 @@ spec:
group: camel.apache.org
scope: Namespaced
versions:
-- name: v1alpha1
- served: true
- storage: false
-- name: v1
- served: true
- storage: true
+ - name: v1alpha1
+served: true
+storage: false
+ - name: v1
+served: true
+storage: true
subresources:
status: {}
names:
@@ -3992,12 +3998,12 @@ spec:
group: camel.apache.org
scope: Namespaced
versions:
-- name: v1alpha1
- served: true
- storage: false
-- name: v1
- served: true
- storage: true
+ - name: v1alpha1
+
[camel-k] 06/10: Fix #921: fix hash in ocp version
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 23d8716d467c48dadb2430d346b76f3f97d835e2 Author: Nicola Ferraro AuthorDate: Wed Dec 18 19:29:21 2019 +0100 Fix #921: fix hash in ocp version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 72270b7..855daed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ install: env: global: - OPENSHIFT_VERSION=3.11.0 -- OPENSHIFT_COMMIT=0cbc58b117403b9d9169dbafdfac59ef104bb997 +- OPENSHIFT_COMMIT=0cbc58b - MAVEN_OPTS=-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn services:
[camel] branch master updated (c322f18 -> c5ccf1c)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from c322f18 Camel-google-pubsub: Fixed CS add c5ccf1c Fix indentation No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch master updated (e213782 -> c322f18)
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 e213782 use slf4j-api for logging add 9db767d Camel-google-pubsub: use slf4j-api for logging add c322f18 Camel-google-pubsub: Fixed CS No new revisions were added by this update. Summary of changes: components/camel-google-pubsub/pom.xml | 3 ++ .../google/pubsub/GooglePubsubComponent.java | 8 ++-- .../pubsub/GooglePubsubConnectionFactory.java | 41 +++--- .../google/pubsub/GooglePubsubConstants.java | 3 +- .../google/pubsub/GooglePubsubConsumer.java| 17 +++- .../google/pubsub/GooglePubsubEndpoint.java| 32 ++ .../google/pubsub/GooglePubsubProducer.java| 35 ++- .../pubsub/consumer/ExchangeAckTransaction.java| 16 +++ .../pubsub/consumer/PubsubAcknowledgement.java | 34 +-- .../component/google/pubsub/PubsubTestSupport.java | 37 .../google/pubsub/integration/AckModeNoneTest.java | 23 -- .../pubsub/integration/AcknowledgementTest.java| 50 -- .../google/pubsub/integration/BodyTypesTest.java | 35 +-- .../integration/GroupedExchangeRoundtripTest.java | 20 +++-- .../integration/PubsubConnectionFactoryTest.java | 28 .../integration/SingleExchangeRoundtripTest.java | 31 -- .../google/pubsub/unit/PubsubComponentTest.java| 8 ++-- .../google/pubsub/unit/PubsubEndpointTest.java | 13 +++--- .../google/pubsub/unit/PubsubProducerTest.java | 5 +-- 19 files changed, 148 insertions(+), 291 deletions(-)
[camel] branch master updated (93162c6 -> e213782)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 93162c6 Regen add e213782 use slf4j-api for logging No new revisions were added by this update. Summary of changes: components/camel-google-bigquery/pom.xml| 3 +++ .../component/google/bigquery/GoogleBigQueryConnectionFactory.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)
[camel] branch master updated: Regen
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 93162c6 Regen
93162c6 is described below
commit 93162c65f9c1571af23722a7835b29d38c837e3f
Author: Andrea Cosentino
AuthorDate: Thu Dec 19 09:28:15 2019 +0100
Regen
---
docs/components/modules/ROOT/nav.adoc | 1 +
docs/components/modules/ROOT/pages/aws-translate-component.adoc | 4 +---
docs/components/modules/ROOT/pages/infinispan-component.adoc| 4 +++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/docs/components/modules/ROOT/nav.adoc
b/docs/components/modules/ROOT/nav.adoc
index ee5e565..fab718f 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -42,6 +42,7 @@
* xref:aws-sqs-component.adoc[AWS Simple Queue Service Component]
* xref:aws-swf-component.adoc[AWS Simple Workflow Component]
* xref:aws-translate-component.adoc[AWS Translate Component]
+* xref:aws-translate-component.adoc[AWS Translate Component]
* xref:aws-xray.adoc[AWS XRay Component]
* xref:azure-blob-component.adoc[Azure Storage Blob Service Component]
* xref:azure-queue-component.adoc[Azure Storage Queue Service Component]
diff --git a/docs/components/modules/ROOT/pages/aws-translate-component.adoc
b/docs/components/modules/ROOT/pages/aws-translate-component.adoc
index 82505c6..9c667da 100644
--- a/docs/components/modules/ROOT/pages/aws-translate-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-translate-component.adoc
@@ -1,6 +1,6 @@
[[aws-translate-component]]
= AWS Translate Component
-:page-source:
components/camel-aws-translate/src/main/docs/aws-translate-component.adoc
+:page-source:
components/camel-aws-translate/bin/src/main/docs/aws-translate-component.adoc
*Since Camel 3.0*
@@ -153,8 +153,6 @@ the https://aws.amazon.com/translate/[Amazon Translate]
service.
|`CamelAwsTranslateTargetLanguage` |`String` |The text target language
-|`CamelAwsTranslateTerminologyNames` |`String` |The terminologies to use
-
|`CamelAwsTranslateOperation` |`String` |The operation to perform
|===
diff --git a/docs/components/modules/ROOT/pages/infinispan-component.adoc
b/docs/components/modules/ROOT/pages/infinispan-component.adoc
index 6065960..66f4695 100644
--- a/docs/components/modules/ROOT/pages/infinispan-component.adoc
+++ b/docs/components/modules/ROOT/pages/infinispan-component.adoc
@@ -55,6 +55,8 @@ configured in the registry, or to a remote cache using the
HotRod
protocol. The consumer allows listening for events from local infinispan cache
accessible from the registry.
+If no cache configuration is provided, embedded cacheContainer is created
directly in the component.
+
// component options: START
The Infinispan component supports 5 options, which are listed below.
@@ -461,7 +463,7 @@ from("direct:start")
-* Retrieve a specific key from a named cache:
+* Put a key/value into a named cache:
+
[source,java]
[camel] branch master updated (5cf9f33 -> ec47fe0)
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 5cf9f33 Upgrade Mongodb Java driver to version 3.12.0 add ec47fe0 Camel-elasticsearch-rest: Fixed Karaf feature after log4j upgraded to 2.13.0 No new revisions were added by this update. Summary of changes: platforms/karaf/features/src/main/resources/features.xml | 1 + 1 file changed, 1 insertion(+)
