(camel-spring-boot) branch config created (now 216477c716c)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch config in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at 216477c716c camel-opentelemetry: make it possible to configure OpenTelemetryTracingStrategy via auto-configuration This branch includes the following new commits: new 216477c716c camel-opentelemetry: make it possible to configure OpenTelemetryTracingStrategy via auto-configuration 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-spring-boot) 01/01: camel-opentelemetry: make it possible to configure OpenTelemetryTracingStrategy via auto-configuration
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch config
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 216477c716c88fa154a77519bfbf553b4413dbb8
Author: John Poth
AuthorDate: Thu May 30 17:19:51 2024 +0200
camel-opentelemetry: make it possible to configure
OpenTelemetryTracingStrategy via auto-configuration
---
.../src/main/docs/opentelemetry.json | 6 ++
.../starter/OpenTelemetryAutoConfiguration.java| 6 ++
.../starter/OpenTelemetryConfigurationProperties.java | 14 ++
3 files changed, 26 insertions(+)
diff --git
a/components-starter/camel-opentelemetry-starter/src/main/docs/opentelemetry.json
b/components-starter/camel-opentelemetry-starter/src/main/docs/opentelemetry.json
index bf4fe3c046c..d5e49124dba 100644
---
a/components-starter/camel-opentelemetry-starter/src/main/docs/opentelemetry.json
+++
b/components-starter/camel-opentelemetry-starter/src/main/docs/opentelemetry.json
@@ -25,6 +25,12 @@
"type": "java.lang.String",
"description": "Sets exclude pattern(s) that will disable tracing for
Camel messages that matches the pattern. Multiple patterns can be separated by
comma.",
"sourceType":
"org.apache.camel.opentelemetry.starter.OpenTelemetryConfigurationProperties"
+},
+{
+ "name": "camel.opentelemetry.trace-processors",
+ "type": "java.lang.Boolean",
+ "description": "Setting this to true will create new OpenTelemetry Spans
for each Camel Processors. Use the excludePattern property to filter out
Processors.",
+ "sourceType":
"org.apache.camel.opentelemetry.starter.OpenTelemetryConfigurationProperties"
}
],
"hints": []
diff --git
a/components-starter/camel-opentelemetry-starter/src/main/java/org/apache/camel/opentelemetry/starter/OpenTelemetryAutoConfiguration.java
b/components-starter/camel-opentelemetry-starter/src/main/java/org/apache/camel/opentelemetry/starter/OpenTelemetryAutoConfiguration.java
index 34022047660..629beb56b8d 100644
---
a/components-starter/camel-opentelemetry-starter/src/main/java/org/apache/camel/opentelemetry/starter/OpenTelemetryAutoConfiguration.java
+++
b/components-starter/camel-opentelemetry-starter/src/main/java/org/apache/camel/opentelemetry/starter/OpenTelemetryAutoConfiguration.java
@@ -20,6 +20,7 @@ import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.propagation.ContextPropagators;
import org.apache.camel.CamelContext;
import org.apache.camel.opentelemetry.OpenTelemetryTracer;
+import org.apache.camel.opentelemetry.OpenTelemetryTracingStrategy;
import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -56,6 +57,11 @@ public class OpenTelemetryAutoConfiguration {
if (config.getEncoding() != null) {
ottracer.setEncoding(config.getEncoding().booleanValue());
}
+if (config.getTraceProcessors() != null &&
config.getTraceProcessors()) {
+OpenTelemetryTracingStrategy tracingStrategy = new
OpenTelemetryTracingStrategy(ottracer);
+tracingStrategy.setPropagateContext(true);
+ottracer.setTracingStrategy(tracingStrategy);
+}
ottracer.init(camelContext);
return ottracer;
diff --git
a/components-starter/camel-opentelemetry-starter/src/main/java/org/apache/camel/opentelemetry/starter/OpenTelemetryConfigurationProperties.java
b/components-starter/camel-opentelemetry-starter/src/main/java/org/apache/camel/opentelemetry/starter/OpenTelemetryConfigurationProperties.java
index 7a903a58607..98ded3ddf98 100644
---
a/components-starter/camel-opentelemetry-starter/src/main/java/org/apache/camel/opentelemetry/starter/OpenTelemetryConfigurationProperties.java
+++
b/components-starter/camel-opentelemetry-starter/src/main/java/org/apache/camel/opentelemetry/starter/OpenTelemetryConfigurationProperties.java
@@ -35,6 +35,20 @@ public class OpenTelemetryConfigurationProperties {
*/
private Boolean encoding;
+/**
+ * Setting this to true will create new OpenTelemetry Spans for each Camel
Processors. Use the excludePattern
+ * property to filter out Processors.
+ */
+private Boolean traceProcessors;
+
+public Boolean getTraceProcessors() {
+return traceProcessors;
+}
+
+public void setTraceProcessors(Boolean traceProcessors) {
+this.traceProcessors = traceProcessors;
+}
+
public boolean isEnabled() {
return enabled;
}
(camel) branch main updated: CAMEL-20643: Add option to propagate Opentelemtry Context even when tracing is disabled for a Camel Processor
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 26dd138bac5 CAMEL-20643: Add option to propagate Opentelemtry Context
even when tracing is disabled for a Camel Processor
26dd138bac5 is described below
commit 26dd138bac51761fb4e82684dbffb3e9c6195587
Author: John Poth
AuthorDate: Wed Apr 3 11:11:56 2024 +0200
CAMEL-20643: Add option to propagate Opentelemtry Context even when tracing
is disabled for a Camel Processor
---
.../OpenTelemetryTracingStrategy.java | 72 +++-
.../CamelOpenTelemetryTestSupport.java | 4 +
...lemetryTracingStrategyPropagateContextTest.java | 128 +
3 files changed, 201 insertions(+), 3 deletions(-)
diff --git
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
index 7208d53dd8b..c827ca06c5a 100644
---
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
+++
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
@@ -36,6 +36,8 @@ public class OpenTelemetryTracingStrategy implements
InterceptStrategy {
private final OpenTelemetryTracer tracer;
+private boolean propagateContext;
+
public OpenTelemetryTracingStrategy(OpenTelemetryTracer tracer) {
this.tracer = tracer;
}
@@ -45,11 +47,34 @@ public class OpenTelemetryTracingStrategy implements
InterceptStrategy {
CamelContext camelContext,
NamedNode processorDefinition, Processor target, Processor
nextTarget)
throws Exception {
-if (!shouldTrace(processorDefinition)) {
+if (shouldTrace(processorDefinition)) {
+return new PropagateContextAndCreateSpan(processorDefinition,
target);
+} else if (isPropagateContext()) {
+return new PropagateContext(target);
+} else {
return new DelegateAsyncProcessor(target);
}
+}
+
+public boolean isPropagateContext() {
+return propagateContext;
+}
+
+public void setPropagateContext(boolean propagateContext) {
+this.propagateContext = propagateContext;
+}
-return new DelegateAsyncProcessor((Exchange exchange) -> {
+private class PropagateContextAndCreateSpan implements Processor {
+private final NamedNode processorDefinition;
+private final Processor target;
+
+public PropagateContextAndCreateSpan(NamedNode processorDefinition,
Processor target) {
+this.processorDefinition = processorDefinition;
+this.target = target;
+}
+
+@Override
+public void process(Exchange exchange) throws Exception {
Span span = null;
OpenTelemetrySpanAdapter spanWrapper = (OpenTelemetrySpanAdapter)
ActiveSpanManager.getSpan(exchange);
if (spanWrapper != null) {
@@ -86,7 +111,48 @@ public class OpenTelemetryTracingStrategy implements
InterceptStrategy {
processorSpan.end();
}
-});
+}
+}
+
+private class PropagateContext implements Processor {
+private final Processor target;
+
+public PropagateContext(Processor target) {
+this.target = target;
+}
+
+@Override
+public void process(Exchange exchange) throws Exception {
+Span span = null;
+OpenTelemetrySpanAdapter spanWrapper = (OpenTelemetrySpanAdapter)
ActiveSpanManager.getSpan(exchange);
+if (spanWrapper != null) {
+span = spanWrapper.getOpenTelemetrySpan();
+}
+
+if (span == null) {
+target.process(exchange);
+return;
+}
+
+boolean activateExchange = !(target instanceof
GetCorrelationContextProcessor
+|| target instanceof SetCorrelationContextProcessor);
+
+if (activateExchange) {
+ActiveSpanManager.activate(exchange, new
OpenTelemetrySpanAdapter(span));
+}
+
+try {
+target.process(exchange);
+} catch (Exception ex) {
+span.setStatus(StatusCode.ERROR);
+span.recordException(ex);
+throw ex;
+} finally {
+if (activateExchange) {
+ActiveSpanManager.deactivate(exchange);
+}
+}
+}
}
private static String getComponentName(NamedNode processorDefinition) {
diff --git
a/components/camel-opentelemetry/src/test/java/org/apache/camel/openteleme
(camel-spring-boot-examples) branch activemq deleted (was 6c230e1)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch activemq in repository https://gitbox.apache.org/repos/asf/camel-spring-boot-examples.git was 6c230e1 Add activemq to list of modules The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-spring-boot-examples) branch main updated: Add activemq to list of modules (#129)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot-examples.git The following commit(s) were added to refs/heads/main by this push: new 85afcda Add activemq to list of modules (#129) 85afcda is described below commit 85afcda71fa6e29a446f4bc34de5186c940d6f69 Author: John Poth AuthorDate: Tue Mar 26 14:06:00 2024 +0100 Add activemq to list of modules (#129) --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 194bf64..fa1e4df 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,7 @@ spring-boot + activemq actuator-http-metrics amqp aot-basic
(camel-spring-boot-examples) branch activemq created (now 6c230e1)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch activemq in repository https://gitbox.apache.org/repos/asf/camel-spring-boot-examples.git at 6c230e1 Add activemq to list of modules This branch includes the following new commits: new 6c230e1 Add activemq to list of modules 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-spring-boot-examples) 01/01: Add activemq to list of modules
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a commit to branch activemq in repository https://gitbox.apache.org/repos/asf/camel-spring-boot-examples.git commit 6c230e16524f8ab69cc8bc7ac8d2a96dcb0066de Author: John Poth AuthorDate: Tue Mar 26 11:22:18 2024 +0100 Add activemq to list of modules --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 8c333c8..da54401 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,7 @@ spring-boot + activemq actuator-http-metrics amqp aot-basic
(camel-spring-boot-examples) branch main updated: CAMEL-20212 FileStateRepository was moved to package org.apache.camel.support.processor.state
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot-examples.git The following commit(s) were added to refs/heads/main by this push: new 8d9f290 CAMEL-20212 FileStateRepository was moved to package org.apache.camel.support.processor.state 8d9f290 is described below commit 8d9f2909607a58ad59693fef81297523d524f33b Author: John Poth AuthorDate: Wed Feb 28 14:49:30 2024 +0100 CAMEL-20212 FileStateRepository was moved to package org.apache.camel.support.processor.state --- kafka-offsetrepository/src/main/resources/spring/camel-context.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kafka-offsetrepository/src/main/resources/spring/camel-context.xml b/kafka-offsetrepository/src/main/resources/spring/camel-context.xml index 303a845..6ddc59c 100644 --- a/kafka-offsetrepository/src/main/resources/spring/camel-context.xml +++ b/kafka-offsetrepository/src/main/resources/spring/camel-context.xml @@ -37,7 +37,7 @@ -
(camel) branch CAMEL-20261 created (now a034003ecd9)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch CAMEL-20261 in repository https://gitbox.apache.org/repos/asf/camel.git at a034003ecd9 CAMEL-20261 - camel-http: update doc on httpClient.cookieSpec option (#12497) This branch includes the following new commits: new a034003ecd9 CAMEL-20261 - camel-http: update doc on httpClient.cookieSpec option (#12497) 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) 01/01: CAMEL-20261 - camel-http: update doc on httpClient.cookieSpec option (#12497)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a commit to branch CAMEL-20261 in repository https://gitbox.apache.org/repos/asf/camel.git commit a034003ecd96d7a0847b9328e29fbfbc3f43cd11 Author: John Poth AuthorDate: Wed Dec 20 11:35:47 2023 +0100 CAMEL-20261 - camel-http: update doc on httpClient.cookieSpec option (#12497) (cherry picked from commit d4d810371dbf450ff351e9aa8aa149ddc975ad1f) --- components/camel-http/src/main/docs/http-component.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-http/src/main/docs/http-component.adoc b/components/camel-http/src/main/docs/http-component.adoc index ee2bc8f878f..4f78b3a4100 100644 --- a/components/camel-http/src/main/docs/http-component.adoc +++ b/components/camel-http/src/main/docs/http-component.adoc @@ -334,8 +334,8 @@ int responseCode = out.getHeader(Exchange.HTTP_RESPONSE_CODE, Integer.class); == Disabling Cookies -To disable cookies you can set the HTTP Client to ignore cookies by -adding this URI option: `httpClient.cookieSpec=ignoreCookies` +To disable cookies in the CookieStore you can set the HTTP Client to ignore cookies by +adding this URI option: `httpClient.cookieSpec=ignore`. This doesn't affect cookies manually set in the `Cookie` header == Basic auth with the streaming message body
(camel) branch CAMEL-20261 deleted (was 551a659996d)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch CAMEL-20261 in repository https://gitbox.apache.org/repos/asf/camel.git was 551a659996d CAMEL-20261 - camel-http: update doc on httpClient.cookieSpec option The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) 01/01: CAMEL-20261 - camel-http: update doc on httpClient.cookieSpec option
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a commit to branch CAMEL-20261 in repository https://gitbox.apache.org/repos/asf/camel.git commit 551a659996dbe747a6aea9218aa0d9f622bbc2e2 Author: John Poth AuthorDate: Wed Dec 20 11:15:11 2023 +0100 CAMEL-20261 - camel-http: update doc on httpClient.cookieSpec option --- components/camel-http/src/main/docs/http-component.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-http/src/main/docs/http-component.adoc b/components/camel-http/src/main/docs/http-component.adoc index f47e29be15e..ae341e8bd93 100644 --- a/components/camel-http/src/main/docs/http-component.adoc +++ b/components/camel-http/src/main/docs/http-component.adoc @@ -334,8 +334,8 @@ int responseCode = out.getHeader(Exchange.HTTP_RESPONSE_CODE, Integer.class); == Disabling Cookies -To disable cookies you can set the HTTP Client to ignore cookies by -adding this URI option: `httpClient.cookieSpec=ignoreCookies` +To disable cookies in the CookieStore you can set the HTTP Client to ignore cookies by +adding this URI option: `httpClient.cookieSpec=ignore`. This doesn't affect cookies manually set in the `Cookie` header == Basic auth with the streaming message body
(camel) branch CAMEL-20261 created (now 551a659996d)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch CAMEL-20261 in repository https://gitbox.apache.org/repos/asf/camel.git at 551a659996d CAMEL-20261 - camel-http: update doc on httpClient.cookieSpec option This branch includes the following new commits: new 551a659996d CAMEL-20261 - camel-http: update doc on httpClient.cookieSpec option 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-spring-boot) branch main updated: CAMEL-20238: camel-jdbc-starter - add spring-boot-starter-jdbc (#1047)
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new a5d087a9858 CAMEL-20238: camel-jdbc-starter - add
spring-boot-starter-jdbc (#1047)
a5d087a9858 is described below
commit a5d087a9858dcbe85cabfbeea7fce8e672174b30
Author: John Poth
AuthorDate: Fri Dec 15 12:29:39 2023 +0100
CAMEL-20238: camel-jdbc-starter - add spring-boot-starter-jdbc (#1047)
---
components-starter/camel-spring-jdbc-starter/pom.xml | 5 +
1 file changed, 5 insertions(+)
diff --git a/components-starter/camel-spring-jdbc-starter/pom.xml
b/components-starter/camel-spring-jdbc-starter/pom.xml
index 0e3c38aba19..134d4afa87a 100644
--- a/components-starter/camel-spring-jdbc-starter/pom.xml
+++ b/components-starter/camel-spring-jdbc-starter/pom.xml
@@ -33,6 +33,11 @@
spring-boot-starter
${spring-boot-version}
+
+ org.springframework.boot
+ spring-boot-starter-jdbc
+ ${spring-boot-version}
+
org.apache.camel
camel-spring-jdbc
(camel-spring-boot) branch CAMEL-20238 deleted (was 0fb51874bc5)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch CAMEL-20238 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was 0fb51874bc5 CAMEL-20238: camel-jdbc-starter - add spring-boot-starter-jdbc The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-spring-boot) 01/01: CAMEL-20238: camel-jdbc-starter - add spring-boot-starter-jdbc
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch CAMEL-20238
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 0fb51874bc5e325e8f32e8de8e8dd7137e7ea2bb
Author: John Poth
AuthorDate: Fri Dec 15 10:28:13 2023 +0100
CAMEL-20238: camel-jdbc-starter - add spring-boot-starter-jdbc
---
components-starter/camel-spring-jdbc-starter/pom.xml | 5 +
1 file changed, 5 insertions(+)
diff --git a/components-starter/camel-spring-jdbc-starter/pom.xml
b/components-starter/camel-spring-jdbc-starter/pom.xml
index 0e3c38aba19..134d4afa87a 100644
--- a/components-starter/camel-spring-jdbc-starter/pom.xml
+++ b/components-starter/camel-spring-jdbc-starter/pom.xml
@@ -33,6 +33,11 @@
spring-boot-starter
${spring-boot-version}
+
+ org.springframework.boot
+ spring-boot-starter-jdbc
+ ${spring-boot-version}
+
org.apache.camel
camel-spring-jdbc
(camel-spring-boot) branch CAMEL-20238 created (now 0fb51874bc5)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch CAMEL-20238 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at 0fb51874bc5 CAMEL-20238: camel-jdbc-starter - add spring-boot-starter-jdbc This branch includes the following new commits: new 0fb51874bc5 CAMEL-20238: camel-jdbc-starter - add spring-boot-starter-jdbc 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] branch main updated: CAMEL-18915: add note to migration guide about hapi-fhir upgrade
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 4415860e19c CAMEL-18915: add note to migration guide about hapi-fhir upgrade 4415860e19c is described below commit 4415860e19c42515840c9bf45339526d51fef240 Author: John Poth AuthorDate: Tue Feb 7 10:58:40 2023 +0100 CAMEL-18915: add note to migration guide about hapi-fhir upgrade --- docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc | 4 1 file changed, 4 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc index d409a8a873b..117e5f608d4 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc @@ -59,3 +59,7 @@ All the `camel-test` modules that were JUnit 4.x based has been removed. All tes === camel-caffeine The `keyType` parameter has been removed. The Key for the cache will now be only `String` type. More information in CAMEL-18877. + +=== camel-fhir + +The underlying `hapi-fhir` library has been upgraded from 4.2.0 to 6.2.4. Only the `Delete` API method has changed and now returns `ca.uhn.fhir.rest.api.MethodOutcome` instead of `org.hl7.fhir.instance.model.api.IBaseOperationOutcome`. See https://hapifhir.io/hapi-fhir/blog/ for a more detailed list of underlying changes (only the hapi-fhir client is used in Camel).
[camel] branch main updated: CAMEL-18915: Upgrade FHIR from 4.2.0 to 6.2.4
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 6c71d44c11a CAMEL-18915: Upgrade FHIR from 4.2.0 to 6.2.4
6c71d44c11a is described below
commit 6c71d44c11aeac9128388405cc07984124988cb3
Author: John Poth
AuthorDate: Thu Jan 19 17:01:11 2023 +0100
CAMEL-18915: Upgrade FHIR from 4.2.0 to 6.2.4
---
.../apache/camel/component/fhir/api/FhirDelete.java| 18 +-
.../fhir/FhirDeleteEndpointConfiguration.java | 2 +-
.../component/fhir/internal/FhirDeleteApiMethod.java | 8
.../org/apache/camel/component/fhir/fhir.json | 6 +++---
.../camel/component/fhir/AbstractFhirTestSupport.java | 1 +
.../org/apache/camel/component/fhir/FhirDeleteIT.java | 12 ++--
parent/pom.xml | 2 +-
.../infra/fhir/services/FhirLocalContainerService.java | 13 -
8 files changed, 33 insertions(+), 29 deletions(-)
diff --git
a/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirDelete.java
b/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirDelete.java
index 5b5c6aad966..5a71294c2ff 100644
---
a/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirDelete.java
+++
b/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirDelete.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.fhir.api;
import java.util.Map;
+import ca.uhn.fhir.rest.api.MethodOutcome;
import ca.uhn.fhir.rest.client.api.IGenericClient;
import ca.uhn.fhir.rest.gclient.IDeleteTyped;
-import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
import org.hl7.fhir.instance.model.api.IBaseResource;
import org.hl7.fhir.instance.model.api.IIdType;
@@ -40,9 +40,9 @@ public class FhirDelete {
*
* @param resourcethe {@link IBaseResource} to delete
* @param extraParameters see {@link ExtraParameters} for a full list of
parameters that can be passed, may be NULL
- * @return the {@link IBaseOperationOutcome}
+ * @return the {@link MethodOutcome}
*/
-public IBaseOperationOutcome resource(IBaseResource resource,
Map extraParameters) {
+public MethodOutcome resource(IBaseResource resource, Map extraParameters) {
IDeleteTyped deleteTyped = client.delete().resource(resource);
ExtraParameters.process(extraParameters, deleteTyped);
return deleteTyped.execute();
@@ -53,9 +53,9 @@ public class FhirDelete {
*
* @param id the {@link IIdType} referencing the resource
* @param extraParameters see {@link ExtraParameters} for a full list of
parameters that can be passed, may be NULL
- * @return the {@link IBaseOperationOutcome}
+ * @return the {@link MethodOutcome}
*/
-public IBaseOperationOutcome resourceById(IIdType id, Map extraParameters) {
+public MethodOutcome resourceById(IIdType id, Map
extraParameters) {
IDeleteTyped deleteTyped = client.delete().resourceById(id);
ExtraParameters.process(extraParameters, deleteTyped);
return deleteTyped.execute();
@@ -67,9 +67,9 @@ public class FhirDelete {
* @param typethe resource type e.g "Patient"
* @param stringIdit's id
* @param extraParameters see {@link ExtraParameters} for a full list of
parameters that can be passed, may be NULL
- * @return the {@link IBaseOperationOutcome}
+ * @return the {@link MethodOutcome}
*/
-public IBaseOperationOutcome resourceById(String type, String stringId,
Map extraParameters) {
+public MethodOutcome resourceById(String type, String stringId,
Map extraParameters) {
IDeleteTyped deleteTyped = client.delete().resourceById(type,
stringId);
ExtraParameters.process(extraParameters, deleteTyped);
return deleteTyped.execute();
@@ -82,9 +82,9 @@ public class FhirDelete {
* [ResourceType]?[Parameters], for
example:
*
Patient?name=Smithidentifier=13.2.4.11.4%7C847366
* @param extraParameters see {@link ExtraParameters} for a full list of
parameters that can be passed, may be NULL
- * @return the {@link IBaseOperationOutcome}
+ * @return the {@link MethodOutcome}
*/
-public IBaseOperationOutcome resourceConditionalByUrl(String url,
Map extraParameters) {
+public MethodOutcome resourceConditionalByUrl(String url,
Map extraParameters) {
IDeleteTyped deleteTyped =
client.delete().resourceConditionalByUrl(url);
ExtraParameters.process(extra
[camel-k-examples] branch johnpoth-patch-1 created (now 2e0e38e)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch johnpoth-patch-1 in repository https://gitbox.apache.org/repos/asf/camel-k-examples.git at 2e0e38e fix: README in pojo-jar example This branch includes the following new commits: new 2e0e38e fix: README in pojo-jar example 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-examples] 01/01: fix: README in pojo-jar example
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a commit to branch johnpoth-patch-1 in repository https://gitbox.apache.org/repos/asf/camel-k-examples.git commit 2e0e38e839a71f2a588cbce298708c286e0b2f46 Author: John Poth AuthorDate: Wed Nov 16 16:57:48 2022 +0100 fix: README in pojo-jar example --- generic-examples/pojo-jar/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic-examples/pojo-jar/README.md b/generic-examples/pojo-jar/README.md index 9a863e3..8b9d98a 100644 --- a/generic-examples/pojo-jar/README.md +++ b/generic-examples/pojo-jar/README.md @@ -27,5 +27,5 @@ It's important to add the JAR file as resource to be compressed. ### Run this route To run this integration use the following command: ```bash -kamel run ./src/main/org/apache/camel/OpenApiRoute.java +kamel run ./src/main/java/org/apache/camel/OpenApiRoute.java ```
[camel-k] branch main updated (8920fe446 -> 33c27cae4)
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from 8920fe446 fix(e2e): increase timeout for each native build test: 60m
-> 90m
add 33c27cae4 feat(cli): Support build time dependencies for dependencies
uploaded to the Image Registry
No new revisions were added by this update.
Summary of changes:
.../{LaughingRoute.java => classpath/Xslt.java}| 14
.../files/classpath/cheese.xsl}| 38 --
e2e/global/registry/registry_maven_wagon_test.go | 11 +++
pkg/cmd/run.go | 9 -
pkg/util/camel/camel_dependencies.go | 11 +--
5 files changed, 56 insertions(+), 27 deletions(-)
copy e2e/global/registry/files/{LaughingRoute.java => classpath/Xslt.java}
(77%)
copy e2e/global/{common/languages/files/xml.xml =>
registry/files/classpath/cheese.xsl} (56%)
[camel-k] 01/06: Add verbose flag for the run command
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch release-1.9.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 95b1df62c7ef2186b27c24c2e2f815eae934bbb9
Author: John Poth
AuthorDate: Tue Apr 12 12:36:32 2022 +0200
Add verbose flag for the run command
(cherry picked from commit 24f63caf4e71952b384d5b152c3269f8d00dedd6)
---
pkg/cmd/root.go | 19 ++
pkg/cmd/run.go | 60 ++---
2 files changed, 51 insertions(+), 28 deletions(-)
diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
index a01a02a5d..b137bf1bc 100644
--- a/pkg/cmd/root.go
+++ b/pkg/cmd/root.go
@@ -46,6 +46,7 @@ type RootCmdOptions struct {
_client client.Client `mapstructure:"-"`
KubeConfigstring `mapstructure:"kube-config"`
Namespace string `mapstructure:"namespace"`
+ Verbose bool `mapstructure:"verbose"
yaml:",omitempty"`
}
// NewKamelCommand --.
@@ -82,6 +83,7 @@ func kamelPreAddCommandInit(options *RootCmdOptions)
*cobra.Command {
cmd.PersistentFlags().StringVar(, "kube-config",
os.Getenv("KUBECONFIG"), "Path to the kube config file to use for CLI requests")
cmd.PersistentFlags().StringVarP(, "namespace", "n",
"", "Namespace to use for all operations")
+ cmd.PersistentFlags().BoolVarP(, "verbose", "V", false,
"Verbose logging")
return
}
@@ -237,3 +239,20 @@ func (command *RootCmdOptions) GetCamelCmdClient()
(*v1.CamelV1Client, error) {
func (command *RootCmdOptions) NewCmdClient() (client.Client, error) {
return client.NewOutOfClusterClient(command.KubeConfig)
}
+
+func (command *RootCmdOptions) PrintVerboseOut(cmd *cobra.Command, a
...interface{}) {
+ if command.Verbose {
+ fmt.Fprintln(cmd.OutOrStdout(), a...)
+ }
+}
+
+func (command *RootCmdOptions) PrintfVerboseOutf(cmd *cobra.Command, format
string, a ...interface{}) {
+ if command.Verbose {
+ fmt.Fprintf(cmd.OutOrStdout(), format, a...)
+ }
+}
+func (command *RootCmdOptions) PrintfVerboseErrf(cmd *cobra.Command, format
string, a ...interface{}) {
+ if command.Verbose {
+ fmt.Fprintf(cmd.ErrOrStderr(), format, a...)
+ }
+}
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index ac1cbd202..147597d16 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -598,17 +598,17 @@ func (o *runCmdOptions) createOrUpdateIntegration(cmd
*cobra.Command, c client.C
return nil, err
}
if platform.Spec.Build.Registry.CA != "" {
- fmt.Printf("We've noticed the image
registry is configured with a custom certificate [%s] \n",
platform.Spec.Build.Registry.CA)
- fmt.Println("Please make sure Kamel CLI
is configured to use it or the operation will fail.")
- fmt.Println("More information can be
found here https://nodejs.org/api/cli.html#cli_node_extra_ca_certs_file;)
+ o.PrintfVerboseOutf(cmd, "We've noticed
the image registry is configured with a custom certificate [%s] \n",
platform.Spec.Build.Registry.CA)
+ o.PrintVerboseOut(cmd, "Please make
sure Kamel CLI is configured to use it or the operation will fail.")
+ o.PrintVerboseOut(cmd, "More
information can be found here
https://nodejs.org/api/cli.html#cli_node_extra_ca_certs_file;)
}
if platform.Spec.Build.Registry.Secret != "" {
- fmt.Printf("We've noticed the image
registry is configured with a Secret [%s] \n",
platform.Spec.Build.Registry.Secret)
- fmt.Println("Please configure Docker
authentication correctly or the operation will fail (by default it's
$HOME/.docker/config.json).")
- fmt.Println("More information can be
found here https://docs.docker.com/engine/reference/commandline/login/;)
+ o.PrintfVerboseOutf(cmd, "We've noticed
the image registry is configured with a Secret [%s] \n",
platform.Spec.Build.Registry.Secret)
+ o.PrintVerboseOut(cmd, "Please
configure Docker authentication correctly or the operation will fail (by
default it's $HOME/.docker/config.json).")
+ o.PrintVerboseOut(c
[camel-k] 04/06: feat(cli): Add option to specify registry url when uploading artifacts. Move options into file:// URI syntax
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch release-1.9.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit c7bcef95a7e3f3dc717b6aa4b5b6a7f3ae50935d
Author: John Poth
AuthorDate: Thu May 19 18:18:52 2022 +0200
feat(cli): Add option to specify registry url when uploading artifacts.
Move options into file:// URI syntax
(cherry picked from commit d545b70be9b7483716bf10c16fad3e05e9c09df7)
---
e2e/registry/registry_maven_wagon_test.go | 4 +-
pkg/cmd/run.go| 66 ++-
pkg/cmd/run_test.go | 66 ---
3 files changed, 41 insertions(+), 95 deletions(-)
diff --git a/e2e/registry/registry_maven_wagon_test.go
b/e2e/registry/registry_maven_wagon_test.go
index 76e2bbc99..7a978d46d 100644
--- a/e2e/registry/registry_maven_wagon_test.go
+++ b/e2e/registry/registry_maven_wagon_test.go
@@ -89,7 +89,7 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
Expect(Kamel("run", "files/LaughingRoute.java",
"--name", name,
"-p", fmt.Sprintf("location=%s", customPath),
- "-d",
fmt.Sprintf("file://files/laugh.txt:%slaugh.txt", customPath),
+ "-d",
fmt.Sprintf("file://files/laugh.txt?targetPath=%slaugh.txt", customPath),
"-n", ns,
).Execute()).To(Succeed())
@@ -104,7 +104,7 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
Expect(Kamel("run", "files/LaughingRoute.java",
"--name", name,
"-p", "location=files/",
- "-d",
fmt.Sprintf("file://files/laughs/:files/"),
+ "-d",
fmt.Sprintf("file://files/laughs/?targetPath=files/"),
"-n", ns,
).Execute()).To(Succeed())
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 4f2235cfb..955b4aaeb 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -34,6 +34,7 @@ import (
"io"
"io/fs"
"io/ioutil"
+ "net/url"
"os"
"os/signal"
"path/filepath"
@@ -93,7 +94,7 @@ func newCmdRun(rootCmdOptions *RootCmdOptions)
(*cobra.Command, *runCmdOptions)
cmd.Flags().String("name", "", "The integration name")
cmd.Flags().StringArrayP("connect", "c", nil, "A Service that the
integration should bind to, specified as
[[apigroup/]version:]kind:[namespace/]name")
- cmd.Flags().StringArrayP("dependency", "d", nil, "A dependency that
should be included, e.g., \"-d camel-mail\" for a Camel component, \"-d
mvn:org.my:app:1.0\" for a Maven dependency or
\"file://localPath[:targetPath]\" for local files (experimental)")
+ cmd.Flags().StringArrayP("dependency", "d", nil, "A dependency that
should be included, e.g., \"-d camel-mail\" for a Camel component, \"-d
mvn:org.my:app:1.0\" for a Maven dependency or
\"file://localPath[?targetPath==]\" for local
files (experimental)")
cmd.Flags().BoolP("wait", "w", false, "Wait for the integration to be
running")
cmd.Flags().StringP("kit", "k", "", "The kit used to run the
integration")
cmd.Flags().StringArrayP("property", "p", nil, "Add a runtime property
or properties file (syntax:
[my-key=my-value|file:/path/to/my-conf.properties])")
@@ -153,6 +154,7 @@ type runCmdOptions struct {
Labels []string `mapstructure:"labels" yaml:",omitempty"`
Annotations []string `mapstructure:"annotations" yaml:",omitempty"`
Sources []string `mapstructure:"sources" yaml:",omitempty"`
+ RegistryOptions url.Values
}
func (o *runCmdOptions) decode(cmd *cobra.Command, args []string) error {
@@ -789,9 +791,36 @@ func resolvePodTemplate(ctx context.Context, cmd
*cobra.Command, templateSrc str
return err
}
+func parseFileURI(uri string) *url.URL {
+ file := new(url.URL)
+ file.Scheme = "file"
+ path := strings.TrimPrefix(uri, "file://")
+ i := strings.IndexByte(path, '?')
+ if i > 0 {
+ file.Path = path[:i]
+ file.RawQuery = path[i
[camel-k] 06/06: feat(cli): Add option to skip uploading POM from JAR when uploading artifacts to the image registry
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch release-1.9.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 8e76dc113640cbb9911b274120cbe459dacf45fb
Author: John Poth
AuthorDate: Tue May 24 09:31:40 2022 +0200
feat(cli): Add option to skip uploading POM from JAR when uploading
artifacts to the image registry
(cherry picked from commit f5e39aaa4dcf97ce9ef9fd4e0d8517ca0a35f61f)
---
e2e/registry/registry_maven_wagon_test.go | 2 +-
pkg/cmd/run.go| 16
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/e2e/registry/registry_maven_wagon_test.go
b/e2e/registry/registry_maven_wagon_test.go
index 7a978d46d..4abebc239 100644
--- a/e2e/registry/registry_maven_wagon_test.go
+++ b/e2e/registry/registry_maven_wagon_test.go
@@ -50,7 +50,7 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
t.Run("image registry is a maven repository", func(t
*testing.T) {
// Create integration that should decrypt an encrypted
message to "foobar" and log it
name := "foobar-decryption"
- jar, err :=
filepath.Abs("files/sample-decryption-1.0.jar")
+ jar, err :=
filepath.Abs("files/sample-decryption-1.0.jar?skipPOM=true")
assert.Nil(t, err)
pom, err :=
filepath.Abs("files/sample-decryption-1.0.pom")
assert.Nil(t, err)
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 249460dce..2e55e1a99 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -94,7 +94,7 @@ func newCmdRun(rootCmdOptions *RootCmdOptions)
(*cobra.Command, *runCmdOptions)
cmd.Flags().String("name", "", "The integration name")
cmd.Flags().StringArrayP("connect", "c", nil, "A Service that the
integration should bind to, specified as
[[apigroup/]version:]kind:[namespace/]name")
- cmd.Flags().StringArrayP("dependency", "d", nil, "A dependency that
should be included, e.g., \"-d camel-mail\" for a Camel component, \"-d
mvn:org.my:app:1.0\" for a Maven dependency or
\"file://localPath[?targetPath===]\" for local files (experimental)")
+ cmd.Flags().StringArrayP("dependency", "d", nil, "A dependency that
should be included, e.g., \"-d camel-mail\" for a Camel component, \"-d
mvn:org.my:app:1.0\" for a Maven dependency or
\"file://localPath[?targetPath]\" for local files (experimental)")
cmd.Flags().BoolP("wait", "w", false, "Wait for the integration to be
running")
cmd.Flags().StringP("kit", "k", "", "The kit used to run the
integration")
cmd.Flags().StringArrayP("property", "p", nil, "Add a runtime property
or properties file (syntax:
[my-key=my-value|file:/path/to/my-conf.properties])")
@@ -817,6 +817,10 @@ func (o *runCmdOptions) skipChecksums() bool {
return o.RegistryOptions.Get("skipChecksums") == "true"
}
+func (o *runCmdOptions) skipPom() bool {
+ return o.RegistryOptions.Get("skipPOM") == "true"
+}
+
func (o *runCmdOptions) getTargetPath() string {
return o.RegistryOptions.Get("targetPath")
}
@@ -913,9 +917,13 @@ func (o *runCmdOptions) uploadPomFromJar(gav
maven.Dependency, path string, plat
}
}
if pomExtracted {
- gav.Type = "pom"
- // Swallow error as this is not a mandatory step
- o.uploadAsMavenArtifact(gav, pomPath, platform, ns,
options, cmd)
+ if o.skipPom() {
+ o.PrintfVerboseOutf(cmd, "Skipping uploading
extracted POM from %s \n", path)
+ } else {
+ gav.Type = "pom"
+ // Swallow error as this is not a mandatory step
+ o.uploadAsMavenArtifact(gav, pomPath, platform,
ns, options, cmd)
+ }
}
return nil
})
[camel-k] 03/06: Fix #3257: fix uploading checksum files to the image registry on Windows
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch release-1.9.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 6e946b656642ad56066ac7b01bb09430ae7c25d1
Author: John Poth
AuthorDate: Wed May 18 11:50:47 2022 +0200
Fix #3257: fix uploading checksum files to the image registry on Windows
(cherry picked from commit 0ec183bbbff0347ff4bda18f7286f67e57fbc879)
---
pkg/cmd/run.go | 9 +
1 file changed, 9 insertions(+)
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 2607be584..4f2235cfb 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -1053,6 +1053,15 @@ func uploadChecksumFile(hash hash.Hash, tmpDir string,
ext string, path string,
filename := "maven_" + filepath.Base(path) + ext
filepath := filepath.Join(tmpDir, filename)
+ if runtimeos.GOOS == "windows" {
+ // workaround for
https://github.com/container-tools/spectrum/issues/8
+ // work with relative paths instead
+ rel, err := getRelativeToWorkingDirectory(path)
+ if err != nil {
+ return err
+ }
+ filepath = rel
+ }
if err = writeChecksumToFile(filepath, hash); err != nil {
return err
[camel-k] 02/06: Fix: use platform.Status instead of platform.Spec
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch release-1.9.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit d9f6ed8f04363c0657fa9d8f612adbbf051cf623
Author: John Poth
AuthorDate: Wed May 18 12:25:21 2022 +0200
Fix: use platform.Status instead of platform.Spec
(cherry picked from commit 17eb25a86a1d2c9e6d059a6f22da0dca3207a3cc)
---
pkg/cmd/run.go| 18 ++
pkg/trait/registry.go | 8
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 147597d16..2607be584 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -597,13 +597,15 @@ func (o *runCmdOptions) createOrUpdateIntegration(cmd
*cobra.Command, c client.C
if err != nil {
return nil, err
}
- if platform.Spec.Build.Registry.CA != "" {
- o.PrintfVerboseOutf(cmd, "We've noticed
the image registry is configured with a custom certificate [%s] \n",
platform.Spec.Build.Registry.CA)
+ ca := platform.Status.Build.Registry.CA
+ if ca != "" {
+ o.PrintfVerboseOutf(cmd, "We've noticed
the image registry is configured with a custom certificate [%s] \n", ca)
o.PrintVerboseOut(cmd, "Please make
sure Kamel CLI is configured to use it or the operation will fail.")
o.PrintVerboseOut(cmd, "More
information can be found here
https://nodejs.org/api/cli.html#cli_node_extra_ca_certs_file;)
}
- if platform.Spec.Build.Registry.Secret != "" {
- o.PrintfVerboseOutf(cmd, "We've noticed
the image registry is configured with a Secret [%s] \n",
platform.Spec.Build.Registry.Secret)
+ secret := platform.Status.Build.Registry.Secret
+ if secret != "" {
+ o.PrintfVerboseOutf(cmd, "We've noticed
the image registry is configured with a Secret [%s] \n", secret)
o.PrintVerboseOut(cmd, "Please
configure Docker authentication correctly or the operation will fail (by
default it's $HOME/.docker/config.json).")
o.PrintVerboseOut(cmd, "More
information can be found here
https://docs.docker.com/engine/reference/commandline/login/;)
}
@@ -964,7 +966,7 @@ func (o *runCmdOptions) extractGav(src *zip.File, localPath
string, cmd *cobra.C
func (o *runCmdOptions) uploadAsMavenArtifact(dependency maven.Dependency,
path string, platform *v1.IntegrationPlatform, ns string, options
spectrum.Options, cmd *cobra.Command) error {
artifactHTTPPath := getArtifactHTTPPath(dependency, platform, ns)
- options.Target = fmt.Sprintf("%s/%s:%s",
platform.Spec.Build.Registry.Address, artifactHTTPPath, dependency.Version)
+ options.Target = fmt.Sprintf("%s/%s:%s",
platform.Status.Build.Registry.Address, artifactHTTPPath, dependency.Version)
if runtimeos.GOOS == "windows" {
// workaround for
https://github.com/container-tools/spectrum/issues/8
// work with relative paths instead
@@ -1055,7 +1057,7 @@ func uploadChecksumFile(hash hash.Hash, tmpDir string,
ext string, path string,
if err = writeChecksumToFile(filepath, hash); err != nil {
return err
}
- options.Target = fmt.Sprintf("%s/%s%s:%s",
platform.Spec.Build.Registry.Address, artifactHTTPPath, ext, dependency.Version)
+ options.Target = fmt.Sprintf("%s/%s%s:%s",
platform.Status.Build.Registry.Address, artifactHTTPPath, ext,
dependency.Version)
_, err = spectrum.Build(options, fmt.Sprintf("%s:.", filepath))
return err
}
@@ -1072,7 +1074,7 @@ func writeChecksumToFile(filepath string, hash hash.Hash)
error {
}
func (o *runCmdOptions) getSpectrumOptions(platform *v1.IntegrationPlatform,
cmd *cobra.Command) spectrum.Options {
- insecure := platform.Spec.Build.Registry.Insecure
+ insecure := platform.Status.Build.Registry.Insecure
var stdout io.Writer
if o.Verbose {
stdout = cmd.OutOrStdout()
@@ -1097,7 +1099,7 @@ func getArtifactHTTPPath(dependency maven.Dependency,
platform *v1.IntegrationPl
// Some vendors don't allow '/' or '.' in repository name so let's
replace them with '_'
artifactHTTPPath = strings.ReplaceAll(artifactHTTPPath, "/", "_")
artifactH
[camel-k] 05/06: feat(cli): Add option to skip checksum files when uploading artifacts
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch release-1.9.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 00fe5d756d8d8fbde7843676d7c8b2eb42eee59e
Author: John Poth
AuthorDate: Mon May 23 17:26:13 2022 +0200
feat(cli): Add option to skip checksum files when uploading artifacts
(cherry picked from commit 5ef7236fa51bb93d30d07e597ed5854ef41e8d92)
---
pkg/cmd/run.go | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 955b4aaeb..249460dce 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -94,7 +94,7 @@ func newCmdRun(rootCmdOptions *RootCmdOptions)
(*cobra.Command, *runCmdOptions)
cmd.Flags().String("name", "", "The integration name")
cmd.Flags().StringArrayP("connect", "c", nil, "A Service that the
integration should bind to, specified as
[[apigroup/]version:]kind:[namespace/]name")
- cmd.Flags().StringArrayP("dependency", "d", nil, "A dependency that
should be included, e.g., \"-d camel-mail\" for a Camel component, \"-d
mvn:org.my:app:1.0\" for a Maven dependency or
\"file://localPath[?targetPath==]\" for local
files (experimental)")
+ cmd.Flags().StringArrayP("dependency", "d", nil, "A dependency that
should be included, e.g., \"-d camel-mail\" for a Camel component, \"-d
mvn:org.my:app:1.0\" for a Maven dependency or
\"file://localPath[?targetPath===]\" for local files (experimental)")
cmd.Flags().BoolP("wait", "w", false, "Wait for the integration to be
running")
cmd.Flags().StringP("kit", "k", "", "The kit used to run the
integration")
cmd.Flags().StringArrayP("property", "p", nil, "Add a runtime property
or properties file (syntax:
[my-key=my-value|file:/path/to/my-conf.properties])")
@@ -813,6 +813,10 @@ func (o *runCmdOptions) getRegistry(platform
*v1.IntegrationPlatform) string {
return platform.Status.Build.Registry.Address
}
+func (o *runCmdOptions) skipChecksums() bool {
+ return o.RegistryOptions.Get("skipChecksums") == "true"
+}
+
func (o *runCmdOptions) getTargetPath() string {
return o.RegistryOptions.Get("targetPath")
}
@@ -993,6 +997,10 @@ func (o *runCmdOptions) uploadAsMavenArtifact(dependency
maven.Dependency, path
return err
}
o.PrintfVerboseOutf(cmd, "Uploaded: %s to %s \n", path, options.Target)
+ if o.skipChecksums() {
+ o.PrintfVerboseOutf(cmd, "Skipping generating and uploading
checksum files for %s \n", path)
+ return nil
+ }
return o.uploadChecksumFiles(path, options, platform, artifactHTTPPath,
dependency)
}
[camel-k] branch release-1.9.x updated (6cd266c9e -> 8e76dc113)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch release-1.9.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from 6cd266c9e [TEST] Add autoscaling test new 95b1df62c Add verbose flag for the run command new d9f6ed8f0 Fix: use platform.Status instead of platform.Spec new 6e946b656 Fix #3257: fix uploading checksum files to the image registry on Windows new c7bcef95a feat(cli): Add option to specify registry url when uploading artifacts. Move options into file:// URI syntax new 00fe5d756 feat(cli): Add option to skip checksum files when uploading artifacts new 8e76dc113 feat(cli): Add option to skip uploading POM from JAR when uploading artifacts to the image registry The 6 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: e2e/registry/registry_maven_wagon_test.go | 6 +- pkg/cmd/root.go | 19 pkg/cmd/run.go| 165 +++--- pkg/cmd/run_test.go | 66 pkg/trait/registry.go | 8 +- 5 files changed, 130 insertions(+), 134 deletions(-)
[camel-k] 03/03: feat(cli): Add option to skip uploading POM from JAR when uploading artifacts to the image registry
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit f5e39aaa4dcf97ce9ef9fd4e0d8517ca0a35f61f
Author: John Poth
AuthorDate: Tue May 24 09:31:40 2022 +0200
feat(cli): Add option to skip uploading POM from JAR when uploading
artifacts to the image registry
---
e2e/registry/registry_maven_wagon_test.go | 2 +-
pkg/cmd/run.go| 16
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/e2e/registry/registry_maven_wagon_test.go
b/e2e/registry/registry_maven_wagon_test.go
index 7a978d46d..4abebc239 100644
--- a/e2e/registry/registry_maven_wagon_test.go
+++ b/e2e/registry/registry_maven_wagon_test.go
@@ -50,7 +50,7 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
t.Run("image registry is a maven repository", func(t
*testing.T) {
// Create integration that should decrypt an encrypted
message to "foobar" and log it
name := "foobar-decryption"
- jar, err :=
filepath.Abs("files/sample-decryption-1.0.jar")
+ jar, err :=
filepath.Abs("files/sample-decryption-1.0.jar?skipPOM=true")
assert.Nil(t, err)
pom, err :=
filepath.Abs("files/sample-decryption-1.0.pom")
assert.Nil(t, err)
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 04f342665..ae9e3384c 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -96,7 +96,7 @@ func newCmdRun(rootCmdOptions *RootCmdOptions)
(*cobra.Command, *runCmdOptions)
cmd.Flags().String("name", "", "The integration name")
cmd.Flags().StringArrayP("connect", "c", nil, "A Service that the
integration should bind to, specified as
[[apigroup/]version:]kind:[namespace/]name")
- cmd.Flags().StringArrayP("dependency", "d", nil, "A dependency that
should be included, e.g., \"-d camel-mail\" for a Camel component, \"-d
mvn:org.my:app:1.0\" for a Maven dependency or
\"file://localPath[?targetPath===]\" for local files (experimental)")
+ cmd.Flags().StringArrayP("dependency", "d", nil, "A dependency that
should be included, e.g., \"-d camel-mail\" for a Camel component, \"-d
mvn:org.my:app:1.0\" for a Maven dependency or
\"file://localPath[?targetPath]\" for local files (experimental)")
cmd.Flags().BoolP("wait", "w", false, "Wait for the integration to be
running")
cmd.Flags().StringP("kit", "k", "", "The kit used to run the
integration")
cmd.Flags().StringArrayP("property", "p", nil, "Add a runtime property
or properties file (syntax:
[my-key=my-value|file:/path/to/my-conf.properties])")
@@ -829,6 +829,10 @@ func (o *runCmdOptions) skipChecksums() bool {
return o.RegistryOptions.Get("skipChecksums") == "true"
}
+func (o *runCmdOptions) skipPom() bool {
+ return o.RegistryOptions.Get("skipPOM") == "true"
+}
+
func (o *runCmdOptions) getTargetPath() string {
return o.RegistryOptions.Get("targetPath")
}
@@ -925,9 +929,13 @@ func (o *runCmdOptions) uploadPomFromJar(gav
maven.Dependency, path string, plat
}
}
if pomExtracted {
- gav.Type = "pom"
- // Swallow error as this is not a mandatory step
- o.uploadAsMavenArtifact(gav, pomPath, platform, ns,
options, cmd)
+ if o.skipPom() {
+ o.PrintfVerboseOutf(cmd, "Skipping uploading
extracted POM from %s \n", path)
+ } else {
+ gav.Type = "pom"
+ // Swallow error as this is not a mandatory step
+ o.uploadAsMavenArtifact(gav, pomPath, platform,
ns, options, cmd)
+ }
}
return nil
})
[camel-k] 02/03: feat(cli): Add option to skip checksum files when uploading artifacts
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 5ef7236fa51bb93d30d07e597ed5854ef41e8d92
Author: John Poth
AuthorDate: Mon May 23 17:26:13 2022 +0200
feat(cli): Add option to skip checksum files when uploading artifacts
---
pkg/cmd/run.go | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 82b16a513..04f342665 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -96,7 +96,7 @@ func newCmdRun(rootCmdOptions *RootCmdOptions)
(*cobra.Command, *runCmdOptions)
cmd.Flags().String("name", "", "The integration name")
cmd.Flags().StringArrayP("connect", "c", nil, "A Service that the
integration should bind to, specified as
[[apigroup/]version:]kind:[namespace/]name")
- cmd.Flags().StringArrayP("dependency", "d", nil, "A dependency that
should be included, e.g., \"-d camel-mail\" for a Camel component, \"-d
mvn:org.my:app:1.0\" for a Maven dependency or
\"file://localPath[?targetPath==]\" for local
files (experimental)")
+ cmd.Flags().StringArrayP("dependency", "d", nil, "A dependency that
should be included, e.g., \"-d camel-mail\" for a Camel component, \"-d
mvn:org.my:app:1.0\" for a Maven dependency or
\"file://localPath[?targetPath===]\" for local files (experimental)")
cmd.Flags().BoolP("wait", "w", false, "Wait for the integration to be
running")
cmd.Flags().StringP("kit", "k", "", "The kit used to run the
integration")
cmd.Flags().StringArrayP("property", "p", nil, "Add a runtime property
or properties file (syntax:
[my-key=my-value|file:/path/to/my-conf.properties])")
@@ -825,6 +825,10 @@ func (o *runCmdOptions) getRegistry(platform
*v1.IntegrationPlatform) string {
return platform.Status.Build.Registry.Address
}
+func (o *runCmdOptions) skipChecksums() bool {
+ return o.RegistryOptions.Get("skipChecksums") == "true"
+}
+
func (o *runCmdOptions) getTargetPath() string {
return o.RegistryOptions.Get("targetPath")
}
@@ -1005,6 +1009,10 @@ func (o *runCmdOptions) uploadAsMavenArtifact(dependency
maven.Dependency, path
return err
}
o.PrintfVerboseOutf(cmd, "Uploaded: %s to %s \n", path, options.Target)
+ if o.skipChecksums() {
+ o.PrintfVerboseOutf(cmd, "Skipping generating and uploading
checksum files for %s \n", path)
+ return nil
+ }
return o.uploadChecksumFiles(path, options, platform, artifactHTTPPath,
dependency)
}
[camel-k] branch main updated (61b5017f1 -> f5e39aaa4)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from 61b5017f1 Updated CHANGELOG.md new d545b70be feat(cli): Add option to specify registry url when uploading artifacts. Move options into file:// URI syntax new 5ef7236fa feat(cli): Add option to skip checksum files when uploading artifacts new f5e39aaa4 feat(cli): Add option to skip uploading POM from JAR when uploading artifacts to the image registry The 3 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: e2e/registry/registry_maven_wagon_test.go | 6 +-- pkg/cmd/run.go| 88 --- pkg/cmd/run_test.go | 66 --- 3 files changed, 61 insertions(+), 99 deletions(-)
[camel-k] 01/03: feat(cli): Add option to specify registry url when uploading artifacts. Move options into file:// URI syntax
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit d545b70be9b7483716bf10c16fad3e05e9c09df7
Author: John Poth
AuthorDate: Thu May 19 18:18:52 2022 +0200
feat(cli): Add option to specify registry url when uploading artifacts.
Move options into file:// URI syntax
---
e2e/registry/registry_maven_wagon_test.go | 4 +-
pkg/cmd/run.go| 66 ++-
pkg/cmd/run_test.go | 66 ---
3 files changed, 41 insertions(+), 95 deletions(-)
diff --git a/e2e/registry/registry_maven_wagon_test.go
b/e2e/registry/registry_maven_wagon_test.go
index 76e2bbc99..7a978d46d 100644
--- a/e2e/registry/registry_maven_wagon_test.go
+++ b/e2e/registry/registry_maven_wagon_test.go
@@ -89,7 +89,7 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
Expect(Kamel("run", "files/LaughingRoute.java",
"--name", name,
"-p", fmt.Sprintf("location=%s", customPath),
- "-d",
fmt.Sprintf("file://files/laugh.txt:%slaugh.txt", customPath),
+ "-d",
fmt.Sprintf("file://files/laugh.txt?targetPath=%slaugh.txt", customPath),
"-n", ns,
).Execute()).To(Succeed())
@@ -104,7 +104,7 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
Expect(Kamel("run", "files/LaughingRoute.java",
"--name", name,
"-p", "location=files/",
- "-d",
fmt.Sprintf("file://files/laughs/:files/"),
+ "-d",
fmt.Sprintf("file://files/laughs/?targetPath=files/"),
"-n", ns,
).Execute()).To(Succeed())
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index a51154c5e..82b16a513 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -34,6 +34,7 @@ import (
"io"
"io/fs"
"io/ioutil"
+ "net/url"
"os"
"os/signal"
"path/filepath"
@@ -95,7 +96,7 @@ func newCmdRun(rootCmdOptions *RootCmdOptions)
(*cobra.Command, *runCmdOptions)
cmd.Flags().String("name", "", "The integration name")
cmd.Flags().StringArrayP("connect", "c", nil, "A Service that the
integration should bind to, specified as
[[apigroup/]version:]kind:[namespace/]name")
- cmd.Flags().StringArrayP("dependency", "d", nil, "A dependency that
should be included, e.g., \"-d camel-mail\" for a Camel component, \"-d
mvn:org.my:app:1.0\" for a Maven dependency or
\"file://localPath[:targetPath]\" for local files (experimental)")
+ cmd.Flags().StringArrayP("dependency", "d", nil, "A dependency that
should be included, e.g., \"-d camel-mail\" for a Camel component, \"-d
mvn:org.my:app:1.0\" for a Maven dependency or
\"file://localPath[?targetPath==]\" for local
files (experimental)")
cmd.Flags().BoolP("wait", "w", false, "Wait for the integration to be
running")
cmd.Flags().StringP("kit", "k", "", "The kit used to run the
integration")
cmd.Flags().StringArrayP("property", "p", nil, "Add a runtime property
or properties file (syntax:
[my-key=my-value|file:/path/to/my-conf.properties])")
@@ -155,6 +156,7 @@ type runCmdOptions struct {
Labels []string `mapstructure:"labels" yaml:",omitempty"`
Annotations []string `mapstructure:"annotations" yaml:",omitempty"`
Sources []string `mapstructure:"sources" yaml:",omitempty"`
+ RegistryOptions url.Values
}
func (o *runCmdOptions) preRunE(cmd *cobra.Command, args []string) error {
@@ -801,9 +803,36 @@ func resolvePodTemplate(ctx context.Context, cmd
*cobra.Command, templateSrc str
return err
}
+func parseFileURI(uri string) *url.URL {
+ file := new(url.URL)
+ file.Scheme = "file"
+ path := strings.TrimPrefix(uri, "file://")
+ i := strings.IndexByte(path, '?')
+ if i > 0 {
+ file.Path = path[:i]
+ file.RawQuery = path[i+1:]
+ } else {
+ file.Path = path
+ }
+ return file
[camel-k] branch main updated: Fix #3257: fix uploading checksum files to the image registry on Windows
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 0ec183bbb Fix #3257: fix uploading checksum files to the image
registry on Windows
0ec183bbb is described below
commit 0ec183bbbff0347ff4bda18f7286f67e57fbc879
Author: John Poth
AuthorDate: Wed May 18 11:50:47 2022 +0200
Fix #3257: fix uploading checksum files to the image registry on Windows
---
pkg/cmd/run.go | 9 +
1 file changed, 9 insertions(+)
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index cd9fe0873..a51154c5e 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -1065,6 +1065,15 @@ func uploadChecksumFile(hash hash.Hash, tmpDir string,
ext string, path string,
filename := "maven_" + filepath.Base(path) + ext
filepath := filepath.Join(tmpDir, filename)
+ if runtimeos.GOOS == "windows" {
+ // workaround for
https://github.com/container-tools/spectrum/issues/8
+ // work with relative paths instead
+ rel, err := getRelativeToWorkingDirectory(path)
+ if err != nil {
+ return err
+ }
+ filepath = rel
+ }
if err = writeChecksumToFile(filepath, hash); err != nil {
return err
[camel-k] branch main updated: Fix: use platform.Status instead of platform.Spec
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 17eb25a86 Fix: use platform.Status instead of platform.Spec
17eb25a86 is described below
commit 17eb25a86a1d2c9e6d059a6f22da0dca3207a3cc
Author: John Poth
AuthorDate: Wed May 18 12:25:21 2022 +0200
Fix: use platform.Status instead of platform.Spec
---
pkg/cmd/run.go| 18 ++
pkg/trait/registry.go | 8
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 718cf5884..cd9fe0873 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -609,13 +609,15 @@ func (o *runCmdOptions) createOrUpdateIntegration(cmd
*cobra.Command, c client.C
if err != nil {
return nil, err
}
- if platform.Spec.Build.Registry.CA != "" {
- o.PrintfVerboseOutf(cmd, "We've noticed
the image registry is configured with a custom certificate [%s] \n",
platform.Spec.Build.Registry.CA)
+ ca := platform.Status.Build.Registry.CA
+ if ca != "" {
+ o.PrintfVerboseOutf(cmd, "We've noticed
the image registry is configured with a custom certificate [%s] \n", ca)
o.PrintVerboseOut(cmd, "Please make
sure Kamel CLI is configured to use it or the operation will fail.")
o.PrintVerboseOut(cmd, "More
information can be found here
https://nodejs.org/api/cli.html#cli_node_extra_ca_certs_file;)
}
- if platform.Spec.Build.Registry.Secret != "" {
- o.PrintfVerboseOutf(cmd, "We've noticed
the image registry is configured with a Secret [%s] \n",
platform.Spec.Build.Registry.Secret)
+ secret := platform.Status.Build.Registry.Secret
+ if secret != "" {
+ o.PrintfVerboseOutf(cmd, "We've noticed
the image registry is configured with a Secret [%s] \n", secret)
o.PrintVerboseOut(cmd, "Please
configure Docker authentication correctly or the operation will fail (by
default it's $HOME/.docker/config.json).")
o.PrintVerboseOut(cmd, "More
information can be found here
https://docs.docker.com/engine/reference/commandline/login/;)
}
@@ -976,7 +978,7 @@ func (o *runCmdOptions) extractGav(src *zip.File, localPath
string, cmd *cobra.C
func (o *runCmdOptions) uploadAsMavenArtifact(dependency maven.Dependency,
path string, platform *v1.IntegrationPlatform, ns string, options
spectrum.Options, cmd *cobra.Command) error {
artifactHTTPPath := getArtifactHTTPPath(dependency, platform, ns)
- options.Target = fmt.Sprintf("%s/%s:%s",
platform.Spec.Build.Registry.Address, artifactHTTPPath, dependency.Version)
+ options.Target = fmt.Sprintf("%s/%s:%s",
platform.Status.Build.Registry.Address, artifactHTTPPath, dependency.Version)
if runtimeos.GOOS == "windows" {
// workaround for
https://github.com/container-tools/spectrum/issues/8
// work with relative paths instead
@@ -1067,7 +1069,7 @@ func uploadChecksumFile(hash hash.Hash, tmpDir string,
ext string, path string,
if err = writeChecksumToFile(filepath, hash); err != nil {
return err
}
- options.Target = fmt.Sprintf("%s/%s%s:%s",
platform.Spec.Build.Registry.Address, artifactHTTPPath, ext, dependency.Version)
+ options.Target = fmt.Sprintf("%s/%s%s:%s",
platform.Status.Build.Registry.Address, artifactHTTPPath, ext,
dependency.Version)
_, err = spectrum.Build(options, fmt.Sprintf("%s:.", filepath))
return err
}
@@ -1084,7 +1086,7 @@ func writeChecksumToFile(filepath string, hash hash.Hash)
error {
}
func (o *runCmdOptions) getSpectrumOptions(platform *v1.IntegrationPlatform,
cmd *cobra.Command) spectrum.Options {
- insecure := platform.Spec.Build.Registry.Insecure
+ insecure := platform.Status.Build.Registry.Insecure
var stdout io.Writer
if o.Verbose {
stdout = cmd.OutOrStdout()
@@ -1109,7 +,7 @@ func getArtifactHTTPPath(dependency maven.Dependency,
platform *v1.IntegrationPl
// Some vendors don't allow '/' or '.' in repository name so let's
replace them with '_
[camel-k] branch main updated: Fix #3271: Prepend Organization/Namespace in HTTP path when uploading to the image registry from the command line
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 85bda438f Fix #3271: Prepend Organization/Namespace in HTTP path when
uploading to the image registry from the command line
85bda438f is described below
commit 85bda438f08952b9135887aa06232f579957366d
Author: John Poth
AuthorDate: Mon May 16 15:08:32 2022 +0200
Fix #3271: Prepend Organization/Namespace in HTTP path when uploading to
the image registry from the command line
---
pkg/cmd/run.go| 8
pkg/trait/registry.go | 10 ++
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 3c560f8c9..718cf5884 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -1109,11 +1109,11 @@ func getArtifactHTTPPath(dependency maven.Dependency,
platform *v1.IntegrationPl
// Some vendors don't allow '/' or '.' in repository name so let's
replace them with '_'
artifactHTTPPath = strings.ReplaceAll(artifactHTTPPath, "/", "_")
artifactHTTPPath = strings.ReplaceAll(artifactHTTPPath, ".", "_")
- if platform.Spec.Cluster == v1.IntegrationPlatformClusterOpenShift {
- // image must be uploaded in the namespace
- artifactHTTPPath = fmt.Sprintf("%s/%s", ns, artifactHTTPPath)
+ organization := platform.Spec.Build.Registry.Organization
+ if organization == "" {
+ organization = ns
}
- return artifactHTTPPath
+ return fmt.Sprintf("%s/%s", organization, artifactHTTPPath)
}
func createDefaultGav(path string, dirName string, integrationName string)
(maven.Dependency, error) {
diff --git a/pkg/trait/registry.go b/pkg/trait/registry.go
index 9e6070ac5..b1f47741e 100644
--- a/pkg/trait/registry.go
+++ b/pkg/trait/registry.go
@@ -103,14 +103,16 @@ func (t *registryTrait) Apply(e *Environment) error {
}
build.Maven.Servers = append(build.Maven.Servers, server)
}
- addRegistryAndExtensionToMaven(registryAddress, build,
e.Platform.Status.Cluster, e.Platform.Namespace)
+ addRegistryAndExtensionToMaven(registryAddress, build, e.Platform)
return nil
}
-func addRegistryAndExtensionToMaven(registryAddress string, build
*v1.BuilderTask, clusterType v1.IntegrationPlatformCluster, ns string) {
- if clusterType == v1.IntegrationPlatformClusterOpenShift {
- registryAddress = fmt.Sprintf("%s/%s", registryAddress, ns)
+func addRegistryAndExtensionToMaven(registryAddress string, build
*v1.BuilderTask, platform *v1.IntegrationPlatform) {
+ organization := platform.Spec.Build.Registry.Organization
+ if organization == "" {
+ organization = platform.Namespace
}
+ registryAddress = fmt.Sprintf("%s/%s", registryAddress, organization)
ext := v1.MavenArtifact{
GroupID:"com.github.johnpoth",
ArtifactID: "wagon-docker-registry",
[camel-k] 02/02: Fix: support absolute paths on Windows
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch release-1.9.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 9ad6feedc121e8797b1ab9a4311e2bdc41cf7ba3
Author: John Poth
AuthorDate: Fri May 13 12:10:07 2022 +0200
Fix: support absolute paths on Windows
(cherry picked from commit aa14a2355004288d7e3f13fde06b17d6674a5dc0)
---
pkg/cmd/run.go | 24 ++-
pkg/cmd/run_test.go | 66 +
2 files changed, 84 insertions(+), 6 deletions(-)
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index b32fc6f33..7d015ba1f 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -789,12 +789,7 @@ func resolvePodTemplate(ctx context.Context, cmd
*cobra.Command, templateSrc str
func uploadFileOrDirectory(platform *v1.IntegrationPlatform, item string,
integrationName string, cmd *cobra.Command, integration *v1.Integration) error {
path := strings.TrimPrefix(item, "file://")
- localPath := path
- targetPath := ""
- if i := strings.Index(path, ":"); i > 0 {
- targetPath = path[i+1:]
- localPath = path[:i]
- }
+ localPath, targetPath := getPaths(path, runtimeos.GOOS,
filepath.IsAbs(path))
options := getSpectrumOptions(platform, cmd)
dirName, err := getDirName(localPath)
if err != nil {
@@ -840,6 +835,23 @@ func uploadFileOrDirectory(platform
*v1.IntegrationPlatform, item string, integr
})
}
+func getPaths(path string, os string, isAbs bool) (localPath string,
targetPath string) {
+ localPath = path
+ targetPath = ""
+ parts := strings.Split(path, ":")
+ if len(parts) > 1 {
+ if os != "windows" || !isAbs {
+ localPath = parts[0]
+ targetPath = parts[1]
+ } else if isAbs && len(parts) == 3 {
+ // special case on Windows for absolute paths e.g
C:\foo\bar\test.csv:remote/path
+ localPath = fmt.Sprintf("%s:%s", parts[0], parts[1])
+ targetPath = parts[2]
+ }
+ }
+ return localPath, targetPath
+}
+
func getMountPath(targetPath string, dirName string, path string) (string,
error) {
// if the target path is a file then use that as the exact mount path
if filepath.Ext(targetPath) != "" {
diff --git a/pkg/cmd/run_test.go b/pkg/cmd/run_test.go
index b865fb7ce..f2fe2e6b4 100644
--- a/pkg/cmd/run_test.go
+++ b/pkg/cmd/run_test.go
@@ -680,3 +680,69 @@ func TestMissingTrait(t *testing.T) {
assert.Equal(t, "Error: bogus.fail=i-must-fail is not a valid trait
property\n", output)
assert.NotNil(t, err)
}
+
+func TestGetsPaths(t *testing.T) {
+ tests := []struct {
+ path string
+ localPath string
+ remotePath string
+ os string
+ isAbs bool
+ }{
+ {
+ path: "C:\\USER\\HOME\\:remote/path",
+ localPath: "C:\\USER\\HOME\\",
+ remotePath: "remote/path",
+ os: "windows",
+ isAbs: true,
+ },
+ {
+ path: "src\\main\\resources:remote/path",
+ localPath: "src\\main\\resources",
+ remotePath: "remote/path",
+ os: "windows",
+ },
+ {
+ path: "C:\\USER\\HOME\\",
+ localPath: "C:\\USER\\HOME\\",
+ remotePath: "",
+ os: "windows",
+ isAbs: true,
+ },
+ {
+ path: "src\\main\\resources",
+ localPath: "src\\main\\resources",
+ remotePath: "",
+ os: "windows",
+ },
+ {
+ path: "/home/user/name/dir:/remote/path",
+ localPath: "/home/user/name/dir",
+ remotePath: "/remote/path",
+ os: "linux",
+ isAbs: true,
+ }, {
+ path: "/home/user/name/dir",
+ localPath: "/home/user/name/dir",
+ remotePath: "",
+ os: "linux",
+
[camel-k] 01/02: Fix #3257: work with relative paths on windows to avoid extra semicolon
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch release-1.9.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit add82a8af0266b2a6bba2c9deb0556ef6465d656
Author: John Poth
AuthorDate: Thu May 12 12:13:52 2022 +0200
Fix #3257: work with relative paths on windows to avoid extra semicolon
(cherry picked from commit 89794bfad8184e6f2553ed039892bf512e2de9ea)
---
pkg/cmd/run.go | 27 +++
1 file changed, 27 insertions(+)
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 247d9e1a5..b32fc6f33 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -39,6 +39,7 @@ import (
"path/filepath"
"reflect"
"regexp"
+ runtimeos "runtime"
"strings"
"syscall"
@@ -952,6 +953,15 @@ func extractGav(src *zip.File, localPath string)
(maven.Dependency, bool) {
func uploadAsMavenArtifact(dependency maven.Dependency, path string, platform
*v1.IntegrationPlatform, ns string, options spectrum.Options) error {
artifactHTTPPath := getArtifactHTTPPath(dependency, platform, ns)
options.Target = fmt.Sprintf("%s/%s:%s",
platform.Spec.Build.Registry.Address, artifactHTTPPath, dependency.Version)
+ if runtimeos.GOOS == "windows" {
+ // workaround for
https://github.com/container-tools/spectrum/issues/8
+ // work with relative paths instead
+ rel, err := getRelativeToWorkingDirectory(path)
+ if err != nil {
+ return err
+ }
+ path = rel
+ }
_, err := spectrum.Build(options, fmt.Sprintf("%s:.", path))
if err != nil {
return err
@@ -960,6 +970,23 @@ func uploadAsMavenArtifact(dependency maven.Dependency,
path string, platform *v
return uploadChecksumFiles(path, options, platform, artifactHTTPPath,
dependency)
}
+// Deprecated: workaround for
https://github.com/container-tools/spectrum/issues/8
+func getRelativeToWorkingDirectory(path string) (string, error) {
+ wd, err := os.Getwd()
+ if err != nil {
+ return "", err
+ }
+ abs, err := filepath.Abs(path)
+ if err != nil {
+ return "", err
+ }
+ path, err = filepath.Rel(wd, abs)
+ if err != nil {
+ return "", err
+ }
+ return path, nil
+}
+
// Currently swallows errors because our Project model is incomplete.
// Most of the time it is irrelevant for our use case (GAV).
// nolint:errcheck
[camel-k] branch release-1.9.x updated (ab9e6d75f -> 9ad6feedc)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch release-1.9.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from ab9e6d75f fix(e2e): rest yaml definition as Camel 3.15 new add82a8af Fix #3257: work with relative paths on windows to avoid extra semicolon new 9ad6feedc Fix: support absolute paths on Windows The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pkg/cmd/run.go | 51 - pkg/cmd/run_test.go | 66 + 2 files changed, 111 insertions(+), 6 deletions(-)
[camel-k] branch main updated: Fix: support absolute paths on Windows
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new aa14a2355 Fix: support absolute paths on Windows
aa14a2355 is described below
commit aa14a2355004288d7e3f13fde06b17d6674a5dc0
Author: John Poth
AuthorDate: Fri May 13 12:10:07 2022 +0200
Fix: support absolute paths on Windows
---
pkg/cmd/run.go | 24 ++-
pkg/cmd/run_test.go | 66 +
2 files changed, 84 insertions(+), 6 deletions(-)
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 94e9b15f7..3c560f8c9 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -801,12 +801,7 @@ func resolvePodTemplate(ctx context.Context, cmd
*cobra.Command, templateSrc str
func (o *runCmdOptions) uploadFileOrDirectory(platform
*v1.IntegrationPlatform, item string, integrationName string, cmd
*cobra.Command, integration *v1.Integration) error {
path := strings.TrimPrefix(item, "file://")
- localPath := path
- targetPath := ""
- if i := strings.Index(path, ":"); i > 0 {
- targetPath = path[i+1:]
- localPath = path[:i]
- }
+ localPath, targetPath := getPaths(path, runtimeos.GOOS,
filepath.IsAbs(path))
options := o.getSpectrumOptions(platform, cmd)
dirName, err := getDirName(localPath)
if err != nil {
@@ -852,6 +847,23 @@ func (o *runCmdOptions) uploadFileOrDirectory(platform
*v1.IntegrationPlatform,
})
}
+func getPaths(path string, os string, isAbs bool) (localPath string,
targetPath string) {
+ localPath = path
+ targetPath = ""
+ parts := strings.Split(path, ":")
+ if len(parts) > 1 {
+ if os != "windows" || !isAbs {
+ localPath = parts[0]
+ targetPath = parts[1]
+ } else if isAbs && len(parts) == 3 {
+ // special case on Windows for absolute paths e.g
C:\foo\bar\test.csv:remote/path
+ localPath = fmt.Sprintf("%s:%s", parts[0], parts[1])
+ targetPath = parts[2]
+ }
+ }
+ return localPath, targetPath
+}
+
func getMountPath(targetPath string, dirName string, path string) (string,
error) {
// if the target path is a file then use that as the exact mount path
if filepath.Ext(targetPath) != "" {
diff --git a/pkg/cmd/run_test.go b/pkg/cmd/run_test.go
index be71a8425..46c032bc0 100644
--- a/pkg/cmd/run_test.go
+++ b/pkg/cmd/run_test.go
@@ -677,3 +677,69 @@ func TestMissingTrait(t *testing.T) {
assert.Equal(t, "Error: bogus.fail=i-must-fail is not a valid trait
property\n", output)
assert.NotNil(t, err)
}
+
+func TestGetsPaths(t *testing.T) {
+ tests := []struct {
+ path string
+ localPath string
+ remotePath string
+ os string
+ isAbs bool
+ }{
+ {
+ path: "C:\\USER\\HOME\\:remote/path",
+ localPath: "C:\\USER\\HOME\\",
+ remotePath: "remote/path",
+ os: "windows",
+ isAbs: true,
+ },
+ {
+ path: "src\\main\\resources:remote/path",
+ localPath: "src\\main\\resources",
+ remotePath: "remote/path",
+ os: "windows",
+ },
+ {
+ path: "C:\\USER\\HOME\\",
+ localPath: "C:\\USER\\HOME\\",
+ remotePath: "",
+ os: "windows",
+ isAbs: true,
+ },
+ {
+ path: "src\\main\\resources",
+ localPath: "src\\main\\resources",
+ remotePath: "",
+ os: "windows",
+ },
+ {
+ path: "/home/user/name/dir:/remote/path",
+ localPath: "/home/user/name/dir",
+ remotePath: "/remote/path",
+ os: "linux",
+ isAbs: true,
+ }, {
+ path: "/home/user/name/dir",
+ localPath: "/home/user/name/dir",
+ remot
[camel-k] branch main updated: Add verbose flag for the run command
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 24f63caf4 Add verbose flag for the run command
new 9210eb815 Merge pull request #3193 from johnpoth/run-verbose
24f63caf4 is described below
commit 24f63caf4e71952b384d5b152c3269f8d00dedd6
Author: John Poth
AuthorDate: Tue Apr 12 12:36:32 2022 +0200
Add verbose flag for the run command
---
pkg/cmd/root.go | 19 ++
pkg/cmd/run.go | 60 ++---
2 files changed, 51 insertions(+), 28 deletions(-)
diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
index ea1943ebd..f148ab7e5 100644
--- a/pkg/cmd/root.go
+++ b/pkg/cmd/root.go
@@ -47,6 +47,7 @@ type RootCmdOptions struct {
_client client.Client `mapstructure:"-"`
KubeConfigstring `mapstructure:"kube-config"`
Namespace string `mapstructure:"namespace"`
+ Verbose bool `mapstructure:"verbose"
yaml:",omitempty"`
}
// NewKamelCommand --.
@@ -83,6 +84,7 @@ func kamelPreAddCommandInit(options *RootCmdOptions)
*cobra.Command {
cmd.PersistentFlags().StringVar(, "kube-config",
os.Getenv("KUBECONFIG"), "Path to the kube config file to use for CLI requests")
cmd.PersistentFlags().StringVarP(, "namespace", "n",
"", "Namespace to use for all operations")
+ cmd.PersistentFlags().BoolVarP(, "verbose", "V", false,
"Verbose logging")
cobra.AddTemplateFunc("wrappedFlagUsages", wrappedFlagUsages)
cmd.SetUsageTemplate(usageTemplate)
@@ -242,6 +244,23 @@ func (command *RootCmdOptions) NewCmdClient()
(client.Client, error) {
return client.NewOutOfClusterClient(command.KubeConfig)
}
+func (command *RootCmdOptions) PrintVerboseOut(cmd *cobra.Command, a
...interface{}) {
+ if command.Verbose {
+ fmt.Fprintln(cmd.OutOrStdout(), a...)
+ }
+}
+
+func (command *RootCmdOptions) PrintfVerboseOutf(cmd *cobra.Command, format
string, a ...interface{}) {
+ if command.Verbose {
+ fmt.Fprintf(cmd.OutOrStdout(), format, a...)
+ }
+}
+func (command *RootCmdOptions) PrintfVerboseErrf(cmd *cobra.Command, format
string, a ...interface{}) {
+ if command.Verbose {
+ fmt.Fprintf(cmd.ErrOrStderr(), format, a...)
+ }
+}
+
func wrappedFlagUsages(cmd *cobra.Command) string {
width := 80
if w, _, err := term.GetSize(0); err == nil {
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 247d9e1a5..63142c456 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -597,17 +597,17 @@ func (o *runCmdOptions) createOrUpdateIntegration(cmd
*cobra.Command, c client.C
return nil, err
}
if platform.Spec.Build.Registry.CA != "" {
- fmt.Printf("We've noticed the image
registry is configured with a custom certificate [%s] \n",
platform.Spec.Build.Registry.CA)
- fmt.Println("Please make sure Kamel CLI
is configured to use it or the operation will fail.")
- fmt.Println("More information can be
found here https://nodejs.org/api/cli.html#cli_node_extra_ca_certs_file;)
+ o.PrintfVerboseOutf(cmd, "We've noticed
the image registry is configured with a custom certificate [%s] \n",
platform.Spec.Build.Registry.CA)
+ o.PrintVerboseOut(cmd, "Please make
sure Kamel CLI is configured to use it or the operation will fail.")
+ o.PrintVerboseOut(cmd, "More
information can be found here
https://nodejs.org/api/cli.html#cli_node_extra_ca_certs_file;)
}
if platform.Spec.Build.Registry.Secret != "" {
- fmt.Printf("We've noticed the image
registry is configured with a Secret [%s] \n",
platform.Spec.Build.Registry.Secret)
- fmt.Println("Please configure Docker
authentication correctly or the operation will fail (by default it's
$HOME/.docker/config.json).")
- fmt.Println("More information can be
found here https://docs.docker.com/engine/reference/commandline/login/;)
+ o.PrintfVerboseOutf(cmd, "We've noticed
the image registry
[camel-spring-boot] branch main updated: [CAMEL-17933] Add documentation on configuring camel starters (#510)
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 6002c8d9188 [CAMEL-17933] Add documentation on configuring camel
starters (#510)
6002c8d9188 is described below
commit 6002c8d9188319de8e2484ab4954517909626f5b
Author: John Poth
AuthorDate: Tue Apr 12 10:11:02 2022 +0200
[CAMEL-17933] Add documentation on configuring camel starters (#510)
---
.../src/main/docs/spring-boot.adoc | 2 +-
.../src/main/docs/starter-configuration.adoc | 65 ++
docs/spring-boot/modules/ROOT/nav.adoc | 1 +
docs/spring-boot/modules/ROOT/pages/index.adoc | 2 +-
4 files changed, 68 insertions(+), 2 deletions(-)
diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.adoc
b/core/camel-spring-boot/src/main/docs/spring-boot.adoc
index dfc2d044137..cd5503bf268 100644
--- a/core/camel-spring-boot/src/main/docs/spring-boot.adoc
+++ b/core/camel-spring-boot/src/main/docs/spring-boot.adoc
@@ -248,7 +248,7 @@ following Spring properties:
camel.springboot.consumer-template-cache-size = 100
camel.springboot.producer-template-cache-size = 200
-
+[[typeconverter]]
== Auto-configured TypeConverter
Camel auto-configuration registers a `TypeConverter` instance named
diff --git a/core/camel-spring-boot/src/main/docs/starter-configuration.adoc
b/core/camel-spring-boot/src/main/docs/starter-configuration.adoc
new file mode 100644
index 000..577fe20944f
--- /dev/null
+++ b/core/camel-spring-boot/src/main/docs/starter-configuration.adoc
@@ -0,0 +1,65 @@
+[[Component-configuration]]
+= Starter Configuration
+
+Clear and accessible configuration is a crucial part of any application. Camel
xref:list.adoc[starters] (Components, Data Formats, Languages) fully support
Spring Boot's
https://docs.spring.io/spring-boot/docs/current/reference/html/features.html#features.external-config[external
configuration] mechanism. We've also added the possibility to configure them
through Spring
https://docs.spring.io/spring-framework/docs/current/reference/html/core.html#beans-definition[Beans]
for more complex [...]
+
+== Using External Configuration
+
+Internally, every xref:list.adoc[starter] is configured through Spring Boot's
https://docs.spring.io/spring-boot/docs/current/reference/html/features.html#features.external-config.typesafe-configuration-properties.java-bean-binding[ConfigurationProperties].
Each configuration parameter can be set in various
https://docs.spring.io/spring-boot/docs/current/reference/html/features.html#features.external-config[ways]
(`application.[properties|json|yaml]` files, command line arguments, enviro
[...]
+
+For example to configure the URL of the ActiveMQ broker you can set:
+
+[source]
+
+camel.component.activemq.broker-url=tcp://localhost:61616
+
+
+Or to configure the `delimeter` of the CSV dataformat to be a semicolon(;) you
can set:
+
+[source]
+
+camel.dataformat.csv.delimiter=;
+
+
+Camel will use it's xref:spring-boot.adoc#typeconverter[TypeConverter]
mechanism when setting properties to the desired type.
+
+You can refer to beans in the Registry using the `#bean:name`:
+
+[source]
+
+camel.component.jms.transactionManager=#bean:myjtaTransactionManager
+
+
+The `Bean` would be typically created in Java:
+
+[source,java]
+
+@Bean("myjtaTransactionManager")
+public JmsTransactionManager myjtaTransactionManager(PooledConnectionFactory
pool) {
+JmsTransactionManager manager = new JmsTransactionManager(pool);
+manager.setDefaultTimeout(45);
+return manager;
+}
+
+
+Beans can also be created in
https://camel.apache.org/components/latest/others/main.html#_specifying_custom_beans[configuration
files] but it isn't recommended for complex use cases.
+
+== Using Beans
+
+Starters can also be created and configured via Spring
https://docs.spring.io/spring-framework/docs/current/reference/html/core.html#beans-definition[Beans].
Before creating a starter (Component, Dataformat, Language), Camel will first
lookup it up in the Registry by it's name if it already exists. For example to
configure a Kafka component:
+
+[source,java]
+
+@Bean("kafka")
+public KafkaComponent kafka(KafkaConfiguration kafkaconfiguration){
+return ComponentsBuilderFactory.kafka()
+.brokers("{{kafka.host}}:{{kafka.port}}")
+.build();
+}
+
+
+The `Bean` name has to be equal to that of the Component, Dataformat or
Language your are configuring. If the `Bean` name isn't specified in the
annotation it will be set to the method name.
+
+Typical Camel Spring Boot projects will use a combination of external
configuration and Beans to configure their application. For more complete
examples on how to configure your
[camel-k] branch main updated: fix #2835 address comments
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new eed983795 fix #2835 address comments new dcd7e34f7 Merge pull request #3171 from johnpoth/local-dependencies-2 eed983795 is described below commit eed9837955991c4efd8e47da3d36e51a850a8c50 Author: John Poth AuthorDate: Tue Apr 5 16:08:19 2022 +0200 fix #2835 address comments --- config/crd/bases/camel.apache.org_builds.yaml | 28 .../camel.apache.org_integrationplatforms.yaml | 80 ++ docs/modules/traits/pages/registry.adoc| 2 +- helm/camel-k/crds/crd-build.yaml | 28 helm/camel-k/crds/crd-integration-platform.yaml| 80 ++ pkg/apis/camel/v1/build_types.go | 2 + pkg/apis/camel/v1/maven_types.go | 11 ++- pkg/apis/camel/v1/zz_generated.deepcopy.go | 19 +++-- pkg/builder/project.go | 19 - pkg/cmd/install.go | 2 +- pkg/cmd/run.go | 20 ++ pkg/resources/resources.go | 19 +++-- pkg/trait/openapi.go | 16 - pkg/trait/registry.go | 4 +- pkg/util/camel/camel_dependencies.go | 4 +- pkg/util/camel/catalog.go | 17 - 16 files changed, 247 insertions(+), 104 deletions(-) diff --git a/config/crd/bases/camel.apache.org_builds.yaml b/config/crd/bases/camel.apache.org_builds.yaml index 7ecfb8146..c10a60b1b 100644 --- a/config/crd/bases/camel.apache.org_builds.yaml +++ b/config/crd/bases/camel.apache.org_builds.yaml @@ -151,6 +151,33 @@ spec: application build phase properties: caSecret: + description: 'Deprecated: use CASecrets The Secret name +and key, containing the CA certificate(s) used to +connect to remote Maven repositories. It can contain +X.509 certificates, and PKCS#7 formatted certificate +chains. A JKS formatted keystore is automatically +created to store the CA certificate(s), and configured +to be used as a trusted certificate(s) by the Maven +commands. Note that the root CA certificates are also +imported into the created keystore.' + properties: +key: + description: The key of the secret to select from. Must +be a valid secret key. + type: string +name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names +TODO: Add other useful fields. apiVersion, kind, +uid?' + type: string +optional: + description: Specify whether the Secret or its key +must be defined + type: boolean + required: + - key + type: object +caSecrets: description: The Secrets name and key, containing the CA certificate(s) used to connect to remote Maven repositories. It can contain X.509 certificates, and @@ -287,6 +314,7 @@ spec: type: object type: array servers: + description: Servers (auth) items: properties: configuration: diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml index b54d09be6..91884f24f 100644 --- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -95,6 +95,31 @@ spec: applications properties: caSecret: +description: 'Deprecated: use CASecrets The Secret name and + key
[camel-k] branch main updated (534f9759e -> 346b787f3)
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from 534f9759e Updated CHANGELOG.md
new 67a2595e9 fix 1802: leverage KEP-1755 to retrieve local image
registry host and port
new 0ea95ec15 fix 1802: Add RBAC
new 346b787f3 Merge pull request #2696 from johnpoth/KEP-1755
The 3994 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:
config/rbac/kustomization.yaml | 2 +
...l => operator-cluster-role-local-registry.yaml} | 12 ++-
...l => operator-role-binding-local-registry.yaml} | 7 +-
e2e/common/kustomize/common.go | 3 +-
pkg/install/cluster.go | 6 ++
pkg/install/operator.go| 61 +-
pkg/platform/defaults.go | 15 +++-
pkg/resources/resources.go | 27 +-
pkg/util/registry/kep_1755.go | 95 ++
9 files changed, 210 insertions(+), 18 deletions(-)
copy config/rbac/{operator-cluster-role-custom-resource-definitions.yaml =>
operator-cluster-role-local-registry.yaml} (87%)
copy
config/rbac/{openshift/operator-cluster-role-console-binding-openshift.yaml =>
operator-role-binding-local-registry.yaml} (90%)
create mode 100644 pkg/util/registry/kep_1755.go
[camel-k] branch main updated (a757de401 -> bd12e7f9c)
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from a757de401 fix: fix lint errors
new 844a683d6 Fix #2834: support local dependencies through the Image
repository
new 18a8bf186 Fix #2834: Refactor
new f524f35fd Fix #2834: Handle pom files
new 92caf7dc8 Fix #2834: e2e tests
new b2cf586ed Fix #2834: Update wagon-docker-registry
new 0eb6e9b6f Fix #2834: Update command line option
new 2489fc640 Fix #2834: Support all packaging types
new 087ea5296 Fix #2834: fix tests
new 57dcb9a19 Fix #2834: Let users configure where the files are to be
mounted in the running container
new 69a4dc351 Fix #2834: Support OpenShift
new 0803a061c Fix #2834: Add E2E for local files mounted in a running
countainer
new f630b8632 Fix #2834: Add E2E for local files mounted in custom path
new 5f8ae0a09 Fix #2834: Add ability to upload directory
new 718854116 Fix #2834: Add E2E for local directory
new e6a2821d5 Fix #2834: Let's make the default targetpath relative to
it's parent directory
new f45f7e489 Fix #2834: upload checksum files
new 8680c018c Fix #2834: extract GAV information from JAR and POM files.
Upload pom in JAR file if present
new 8b8a3b75f Fix #2834: add E2E test
new 78f161ac8 Fix #2834: Add useful log messages, update to latest wagon
new 94093f51d Fix #2834:Allow multiple certificates to be configured for
Maven
new 31ffc9b4b Fix #2834:Allow Servers to be configured in Maven settings
file
new 46b20f139 Fix #2834: We should automatically register the Image
Registry's CA and Authentication with Maven when using the Image Registry as a
Maven Registry
new 738ee6f1f Fix #2834: support OpenShift defaults
new feacfacae Fix #2834: don't enable registry trait if explicitely
disabled
new 594a1b93b Fix #2834: generate resource and rebase
new a18823546 Fix #2834: update to latest wagon-docker-registry
new 5e70d2562 Fix #2834: fix lint errors
new 3f90733f0 Fix #2834: enable maven wagon IT tests in github for
kubernetes
new 080d42166 Fix #2834: upgrade Spectrum
new 26423a26f Fix #2834: Update docs
new 6d72554c8 Fix #2834: Update health trait
new e2f1a6ea6 Fix #2834: Refactor E2E test to use single namespace
new 407016f16 Fix #2834: Fix e2e tests, let's wait until camel-k is
installed
new d6660dc7a Fix #2834: kustomize 2e2 test should be executed last
new 3c5ba761a Fix #2834: rebase main
new bd12e7f9c Merge pull request #2835 from johnpoth/local-dependencies
The 3990 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/actions/e2e-kubernetes/exec-tests.sh | 1 +
.github/workflows/kubernetes.yml | 1 +
.../internalclientset/fake/clientset_generated.go | 5 +-
config/crd/bases/camel.apache.org_builds.yaml | 56 ++-
.../camel.apache.org_integrationplatforms.yaml | 104 --
docs/modules/ROOT/nav.adoc | 1 +
docs/modules/ROOT/pages/cli/cli.adoc | 10 +
.../ROOT/pages/configuration/dependencies.adoc | 18 +
docs/modules/traits/pages/gc.adoc | 2 +-
.../pages/{dependencies.adoc => registry.adoc} | 12 +-
.../files/FoobarDecryption.java} | 9 +-
.../files/LaughingRoute.java} | 11 +-
e2e/registry/files/laugh.txt | 1 +
e2e/registry/files/laughs/haha.txt | 1 +
e2e/registry/files/laughs/hehe.txt | 1 +
e2e/registry/files/sample-decryption-1.0.jar | Bin 0 -> 2766 bytes
e2e/registry/files/sample-decryption-1.0.pom | 20 ++
.../main/java/camelk/DeterministicDecryption.java | 48 +++
e2e/registry/registry_maven_wagon_test.go | 137 +++
helm/camel-k/crds/crd-build.yaml | 56 ++-
helm/camel-k/crds/crd-integration-platform.yaml| 104 --
pkg/apis/camel/v1/maven_types.go | 17 +-
.../camel/v1/maven_types_support.go} | 39 +-
pkg/apis/camel/v1/zz_generated.deepcopy.go | 57 ++-
pkg/builder/project.go | 72 +++-
pkg/builder/project_test.go| 224
pkg/cmd/install.go | 2 +-
pkg/cmd/run.go | 396 -
pkg/cmd/util_dependencies.go | 2 +-
pkg/platform/defaults.go | 32 +-
pkg/resources/resources.go | 24 +-
pkg/trait/openapi.go | 4
[camel-spring-boot] branch main updated: [CAMEL-17805] add tests in camel-kafka-starter (#476)
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new e44242f [CAMEL-17805] add tests in camel-kafka-starter (#476)
e44242f is described below
commit e44242f9eef226050c10a0ad3a91c8af805c7e35
Author: John Poth
AuthorDate: Mon Mar 21 12:16:41 2022 +0100
[CAMEL-17805] add tests in camel-kafka-starter (#476)
* [CAMEL-17805] add tests in camel-kafka-starter
* Regen
---
components-starter/camel-kafka-starter/pom.xml | 125 +
.../integration/BaseEmbeddedKafkaTestSupport.java | 108
.../integration/CustomHeaderDeserializer.java | 39 ++
.../KafkaConsumerAsyncManualCommitIT.java | 160 ++
.../integration/KafkaConsumerBatchSizeIT.java | 116 +
.../kafka/integration/KafkaConsumerFullIT.java | 230 +
.../integration/KafkaConsumerHealthCheckIT.java| 211
.../integration/KafkaConsumerIdempotentIT.java | 102
.../KafkaConsumerIdempotentTestSupport.java| 66 +++
...kaConsumerIdempotentWithCustomSerializerIT.java | 97
.../KafkaConsumerIdempotentWithProcessorIT.java| 104
.../KafkaConsumerLastRecordHeaderIT.java | 113 +
.../integration/KafkaConsumerManualCommitIT.java | 180 +++
.../integration/KafkaConsumerRebalanceIT.java | 120 +
.../integration/KafkaConsumerTopicIsPatternIT.java | 113 +
.../KafkaConsumerWithResumeRouteStrategyIT.java| 250 +
.../kafka/integration/KafkaProducerFullIT.java | 561 +
.../component/kafka/integration/KafkaToDIT.java| 71 +++
.../kafka/integration/MockConsumerInterceptor.java | 54 ++
.../kafka/integration/MockProducerInterceptor.java | 49 ++
.../OffsetStateRepositoryConfiguration.java| 35 ++
.../integration/ResumeStrategyConfiguration.java | 35 ++
.../kafka/clients/consumer/KafkaConsumerTest.java | 62 +++
23 files changed, 3001 insertions(+)
diff --git a/components-starter/camel-kafka-starter/pom.xml
b/components-starter/camel-kafka-starter/pom.xml
index 7a55a4a..368c4d6 100644
--- a/components-starter/camel-kafka-starter/pom.xml
+++ b/components-starter/camel-kafka-starter/pom.xml
@@ -52,6 +52,31 @@
-->
+
+
+ org.apache.camel
+ camel-test-infra-kafka
+ ${camel-version}
+ test-jar
+ test
+
+
+ org.apache.camel
+ camel-test-spring-junit5
+
+
+ org.apache.camel
+ camel-spring-xml
+
+
+ test
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ ${spring-boot-version}
+ test
+
org.apache.camel.springboot
@@ -59,4 +84,104 @@
+
+
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+
+true
+
${camel.failsafe.forkTimeout}
+false
+
+ true
+
+
+
+
+
+
+
+
+
+ kafka-integration-tests-docker-file
+
+
+ /var/run/docker.sock
+
+
+
+
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+
+
+integration-test
+verify
+
+ integration-test
+ verify
+
+
+
+kafka-3
+
+
+
local-kafka3-container
+
+ kafka-3
+
+
+ integration-test
+ verify
+
+
+
+
+
+
+
+
+
+ kafka-integration-tests-docker-env
+
+
+ env.DOCKER_HOST
+
+
+
+
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+
+
+integration-test
+verify
+
+ integration-test
+ verify
+
+
+
+kafka-3
+
+
+
local-kafka3-container
+
+ kafka-3
+
+
+ integration-test
+ verify
+
+
+
+
+
+
+
+
diff --git
a/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integration/BaseEmbeddedKafkaTestSupport.java
b/components-starter/camel-kafka-starter/src/test/java/org/apache/camel/component/kafka/integrat
[camel-spring-boot] branch main updated: Add a friendly link to the Spring Boot section of the Camel website (#459)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/main by this push: new 567b00c Add a friendly link to the Spring Boot section of the Camel website (#459) 567b00c is described below commit 567b00c741094bdef3a3d978d184fd0405f5f2c9 Author: John Poth AuthorDate: Wed Mar 9 11:47:01 2022 +0100 Add a friendly link to the Spring Boot section of the Camel website (#459) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 00933b0..5d1504f 100644 --- a/README.md +++ b/README.md @@ -26,3 +26,4 @@ Similarly, to delete the starter for the `zoot` component, run the following com ./starter-delete zoot ``` +More information can be found on the [Camel website](https://camel.apache.org/camel-spring-boot/latest/) \ No newline at end of file
[camel-spring-boot] branch main updated: [CAMEL-17745] fix model generation + regen (#454)
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 7aaecaa [CAMEL-17745] fix model generation + regen (#454)
7aaecaa is described below
commit 7aaecaa03fcda3a6190947721ac09bac5a49b542
Author: John Poth
AuthorDate: Mon Mar 7 13:35:54 2022 +0100
[CAMEL-17745] fix model generation + regen (#454)
---
.../camel-core-starter/src/main/docs/core.json | 32 +++-
.../springboot/CSimpleLanguageConfiguration.java | 2 +-
.../springboot/HeaderLanguageConfiguration.java| 2 +-
.../ExchangePropertyLanguageAutoConfiguration.java | 4 +-
.../ExchangePropertyLanguageConfiguration.java | 4 +-
.../ref/springboot/RefLanguageConfiguration.java | 2 +-
.../springboot/FileLanguageConfiguration.java | 2 +-
.../springboot/SimpleLanguageConfiguration.java| 3 +-
.../springboot/TokenizeLanguageConfiguration.java | 2 +-
.../RestConfigurationDefinitionProperties.java | 94 ++
.../Resilience4jConfigurationDefinitionCommon.java | 20 ++---
.../maven/SpringBootAutoConfigurationMojo.java | 8 +-
12 files changed, 77 insertions(+), 98 deletions(-)
diff --git a/components-starter/camel-core-starter/src/main/docs/core.json
b/components-starter/camel-core-starter/src/main/docs/core.json
index 873d631..04f3cfc 100644
--- a/components-starter/camel-core-starter/src/main/docs/core.json
+++ b/components-starter/camel-core-starter/src/main/docs/core.json
@@ -53,12 +53,12 @@
"sourceMethod": "getCustomizer()"
},
{
- "name": "camel.language.exchangeproperty",
+ "name": "camel.language.exchange-property",
"type":
"org.apache.camel.language.property.springboot.ExchangePropertyLanguageConfiguration",
"sourceType":
"org.apache.camel.language.property.springboot.ExchangePropertyLanguageConfiguration"
},
{
- "name": "camel.language.exchangeproperty.customizer",
+ "name": "camel.language.exchange-property.customizer",
"type":
"org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon$CustomizerProperties",
"sourceType":
"org.apache.camel.language.property.springboot.ExchangePropertyLanguageConfiguration",
"sourceMethod": "getCustomizer()"
@@ -738,18 +738,18 @@
"defaultValue": true
},
{
- "name": "camel.language.exchangeproperty.customizer.enabled",
+ "name": "camel.language.exchange-property.customizer.enabled",
"type": "java.lang.Boolean",
"sourceType":
"org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon$CustomizerProperties"
},
{
- "name": "camel.language.exchangeproperty.enabled",
+ "name": "camel.language.exchange-property.enabled",
"type": "java.lang.Boolean",
"description": "Whether to enable auto configuration of the
exchangeProperty language. This is enabled by default.",
"sourceType":
"org.apache.camel.language.property.springboot.ExchangePropertyLanguageConfiguration"
},
{
- "name": "camel.language.exchangeproperty.trim",
+ "name": "camel.language.exchange-property.trim",
"type": "java.lang.Boolean",
"description": "Whether to trim the value to remove leading and trailing
whitespaces and line breaks",
"sourceType":
"org.apache.camel.language.property.springboot.ExchangePropertyLanguageConfiguration",
@@ -859,13 +859,13 @@
"defaultValue": false
},
{
- "name": "camel.resilience4j.circuit-breaker-ref",
+ "name": "camel.resilience4j.circuit-breaker",
"type": "java.lang.String",
"description": "Refers to an existing
io.github.resilience4j.circuitbreaker.CircuitBreaker instance to lookup and use
from the registry. When using this, then any other circuit breaker options are
not in use.",
"sourceType":
"org.apache.camel.model.springboot.Resilience4jConfigurationDefinitionProperties"
},
{
- "name": "camel.resilience4j.config-ref",
+ "name": "camel.resilience4j.config",
"type": "java.lang.String",
"description": "Refers to an existing
io.github.resilience4j.circuitbreaker.CircuitB
[camel] branch main updated: [CAMEL-17743] Set correct javaTypes in schema
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 4fcfff5 [CAMEL-17743] Set correct javaTypes in schema
4fcfff5 is described below
commit 4fcfff58418ccbdd6409529827fbd31611d8842e
Author: John Poth
AuthorDate: Fri Mar 4 12:07:13 2022 +0100
[CAMEL-17743] Set correct javaTypes in schema
---
.../resources/org/apache/camel/model/faultToleranceConfiguration.json | 2 +-
.../resources/org/apache/camel/model/resilience4jConfiguration.json | 4 ++--
.../org/apache/camel/model/FaultToleranceConfigurationCommon.java | 2 +-
.../java/org/apache/camel/model/Resilience4jConfigurationCommon.java | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json
index ccb1a99..15dfd2c 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/faultToleranceConfiguration.json
@@ -12,7 +12,7 @@
"output": false
},
"properties": {
-"circuitBreaker": { "kind": "attribute", "displayName": "Circuit Breaker",
"label": "advanced", "required": false, "type": "object", "javaType":
"io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker", "deprecated":
false, "autowired": false, "secret": false, "description": "Refers to an
existing io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker
instance to lookup and use from the registry. When using this, then any other
circuit breaker options are not in use." },
+"circuitBreaker": { "kind": "attribute", "displayName": "Circuit Breaker",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Refers to an existing
io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker instance to
lookup and use from the registry. When using this, then any other circuit
breaker options are not in use." },
"delay": { "kind": "attribute", "displayName": "Delay", "required": false,
"type": "duration", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "5000", "description":
"Control how long the circuit breaker stays open. The default is 5 seconds." },
"successThreshold": { "kind": "attribute", "displayName": "Success
Threshold", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "1", "description": "Controls the number of trial calls which
are allowed when the circuit breaker is half-open" },
"requestVolumeThreshold": { "kind": "attribute", "displayName": "Request
Volume Threshold", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "20", "description": "Controls the size of the rolling window
used when the circuit breaker is closed" },
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/resilience4jConfiguration.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/resilience4jConfiguration.json
index 1989a5a..de134cf 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/resilience4jConfiguration.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/resilience4jConfiguration.json
@@ -12,8 +12,8 @@
"output": false
},
"properties": {
-"circuitBreaker": { "kind": "attribute", "displayName": "Circuit Breaker",
"label": "advanced", "required": false, "ty
[camel-examples] branch master updated: Fix camel-fhir example
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-examples.git
The following commit(s) were added to refs/heads/master by this push:
new ffe7ade Fix camel-fhir example
ffe7ade is described below
commit ffe7ade09c3dc9ff8dba8bb77e7efe4103a9b103
Author: John Poth
AuthorDate: Tue Mar 30 11:49:59 2021 +0200
Fix camel-fhir example
---
.../src/main/java/org/apache/camel/example/fhir/Application.java | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git
a/examples/fhir/src/main/java/org/apache/camel/example/fhir/Application.java
b/examples/fhir/src/main/java/org/apache/camel/example/fhir/Application.java
index c4ea683..b89a77b 100644
--- a/examples/fhir/src/main/java/org/apache/camel/example/fhir/Application.java
+++ b/examples/fhir/src/main/java/org/apache/camel/example/fhir/Application.java
@@ -61,11 +61,8 @@ public class Application {
patient.setId(patientId);
exchange.getIn().setBody(patient);
})
-// marshall to JSON for logging
-.marshal().fhirJson("{{fhirVersion}}")
-.log("Inserting Patient: ${body}")
// create Patient in our FHIR server
-
.to("fhir://create/resource?inBody=resourceAsString={{serverUrl}}={{fhirVersion}}")
+
.to("fhir://create/resource?inBody=resource={{serverUrl}}={{fhirVersion}}=true=true")
// log the outcome
.log("Patient created successfully: ${body.getCreated}");
}
[camel] branch master updated: CAMEL-15995: fix checkstyle
This is an automated email from the ASF dual-hosted git repository.
jpoth 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 767e963 CAMEL-15995: fix checkstyle
767e963 is described below
commit 767e963e2084899ed4043f22cc8ed5346342dfaf
Author: John Poth
AuthorDate: Thu Jan 7 16:19:36 2021 +0100
CAMEL-15995: fix checkstyle
---
.../org/apache/camel/component/sjms/TransactionOnCompletion.java| 6 ++
1 file changed, 6 insertions(+)
diff --git
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java
index c4b9489..1bb5f78 100644
---
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java
+++
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.sjms;
+import java.util.Objects;
+
import javax.jms.Message;
import javax.jms.Session;
@@ -61,4 +63,8 @@ class TransactionOnCompletion extends SynchronizationAdapter {
return session == that.session && message == that.message;
}
+@Override
+public int hashCode() {
+return Objects.hash(super.hashCode(), session, message);
+}
}
[camel] branch master updated: CAMEL-16004: cleanup
This is an automated email from the ASF dual-hosted git repository. jpoth 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 c4de4ed CAMEL-16004: cleanup c4de4ed is described below commit c4de4ed3b31558d6e038a9d64b3bdcb3640d4e47 Author: John Poth AuthorDate: Thu Jan 7 14:48:23 2021 +0100 CAMEL-16004: cleanup --- test-infra/camel-test-infra-fhir/pom.xml | 4 1 file changed, 4 deletions(-) diff --git a/test-infra/camel-test-infra-fhir/pom.xml b/test-infra/camel-test-infra-fhir/pom.xml index 825d566..20d1fff 100644 --- a/test-infra/camel-test-infra-fhir/pom.xml +++ b/test-infra/camel-test-infra-fhir/pom.xml @@ -47,10 +47,6 @@ testcontainers - -org.testcontainers -kafka -
[camel] branch master updated: CAMEL-16004: migrate camel-fhir to the new test infra
This is an automated email from the ASF dual-hosted git repository.
jpoth 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 c8bc29c CAMEL-16004: migrate camel-fhir to the new test infra
c8bc29c is described below
commit c8bc29cf425c5f2444b7dd5df408855c815a0275
Author: John Poth
AuthorDate: Wed Jan 6 10:54:11 2021 +0100
CAMEL-16004: migrate camel-fhir to the new test infra
---
components/camel-fhir/camel-fhir-component/pom.xml | 57 -
.../component/fhir/AbstractFhirTestSupport.java| 58 +
.../src/test/resources/test-options.properties | 20 -
test-infra/camel-test-infra-fhir/pom.xml | 64 ++
.../src/main/resources/META-INF/MANIFEST.MF| 0
.../test/infra/fhir/common/FhirProperties.java | 30 +++
.../fhir/services/FhirLocalContainerService.java | 99 ++
.../infra/fhir/services/FhirRemoteService.java | 53
.../test/infra/fhir/services/FhirService.java | 44 ++
.../infra/fhir/services/FhirServiceFactory.java| 43 ++
test-infra/pom.xml | 1 +
11 files changed, 411 insertions(+), 58 deletions(-)
diff --git a/components/camel-fhir/camel-fhir-component/pom.xml
b/components/camel-fhir/camel-fhir-component/pom.xml
index acae915..3a9b2ee 100644
--- a/components/camel-fhir/camel-fhir-component/pom.xml
+++ b/components/camel-fhir/camel-fhir-component/pom.xml
@@ -136,6 +136,23 @@
log4j-slf4j-impl
test
+
+
+
+org.apache.camel
+camel-test-infra-common
+${project.version}
+test-jar
+test
+
+
+
+org.apache.camel
+camel-test-infra-fhir
+${project.version}
+test-jar
+test
+
@@ -322,13 +339,51 @@
+
-it-fhir
+fhir-tests-docker-file
+
+
+/var/run/docker.sock
+
+
org.apache.maven.plugins
maven-failsafe-plugin
+
+${skipTests}
+
+
+
+
+integration-test
+verify
+
+
+
+
+
+
+
+
+
+
+fhir-tests-docker-env
+
+
+env.DOCKER_HOST
+
+
+
+
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+
+${skipTests}
+
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/AbstractFhirTestSupport.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/AbstractFhirTestSupport.java
index 7a08abb..a981acd 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/AbstractFhirTestSupport.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/AbstractFhirTestSupport.java
@@ -16,10 +16,7 @@
*/
package org.apache.camel.component.fhir;
-import java.io.IOException;
-import java.util.HashMap;
import java.util.Map;
-import java.util.Properties;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.context.FhirVersionEnum;
@@ -27,7 +24,8 @@ import ca.uhn.fhir.rest.client.api.IGenericClient;
import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
-import org.apache.camel.support.PropertyBindingSupport;
+import org.apache.camel.test.infra.fhir.services.FhirService;
+import org.apache.camel.test.infra.fhir.services.FhirServiceFactory;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.hl7.fhir.dstu3.model.Bundle;
import org.hl7.fhir.dstu3.model.HumanName;
@@ -35,25 +33,36 @@ import org.hl7.fhir.dstu3.model.Patient;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestInstance;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Abstract base class for Fhir Integration tests generated by Camel API
[camel] branch master updated (ac3460e -> 2c0eb03)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from ac3460e Regen for commit c52ea3d8630ba106d3d0c4361b808273137748cb add 2c0eb03 Fix camel-fhir IT tests No new revisions were added by this update. Summary of changes: .../src/test/java/org/apache/camel/component/fhir/FhirMetaIT.java | 4 ++-- .../camel-fhir-component/src/test/resources/test-options.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
[camel-website] branch master updated: Fix typos
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/master by this push: new 2354848 Fix typos 2354848 is described below commit 2354848273d40f3bd0833985b98e9f3c95e9884e Author: John Poth AuthorDate: Mon Jun 15 10:40:52 2020 +0200 Fix typos --- content/blog/2020/06/camel-k-release-1.0.0/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/blog/2020/06/camel-k-release-1.0.0/index.md b/content/blog/2020/06/camel-k-release-1.0.0/index.md index c1a49c3..d7602e2 100644 --- a/content/blog/2020/06/camel-k-release-1.0.0/index.md +++ b/content/blog/2020/06/camel-k-release-1.0.0/index.md @@ -23,7 +23,7 @@ run them on any Kubernetes cluster. This way of defining things is common to man but a lightweight *integration* platform) and it's technically difficult to provide IDE support, such as code completion and other utilities, to developers. -But now we've it. The integration tooling team has created some cool extensions for VS Code that make the development experience +But now we've done it. The integration tooling team has created some cool extensions for VS Code that make the development experience with Camel K even more exciting. You don't need to remember the Camel DSL syntax, the IDE will give you suggestions and error highlighting. @@ -194,7 +194,7 @@ Let's suppose you've a **[Prometheus](https://prometheus.io/)** instance in your kamel run Routes.java -t prometheus.enabled=true ``` -That's it. No need to setup services an labels to enable scraping. A default prometheus configuration file is also provided for the integration, with sensible defaults. Of course you also have the option to provide [your own configuration](https://camel.apache.org/camel-k/latest/traits/prometheus.html) for advanced use cases. +That's it. No need to setup services and labels to enable scraping. A default prometheus configuration file is also provided for the integration, with sensible defaults. Of course you also have the option to provide [your own configuration](https://camel.apache.org/camel-k/latest/traits/prometheus.html) for advanced use cases. Now, let's suppose you want to see what your routes are doing and trace the execution flow of an integration. What you need to do is to install an opentracing compatible application in the namespace, such as **[Jaeger](https://www.jaegertracing.io/)**, and run the integration as:
[camel] branch master updated: Website: Camel3 migration guide: fixup JndiRegistry section
This is an automated email from the ASF dual-hosted git repository. jpoth 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 9afc6ed Website: Camel3 migration guide: fixup JndiRegistry section 9afc6ed is described below commit 9afc6ed3297c707d7e3b2b4c56a0a2fdf0634dfd Author: John Poth AuthorDate: Mon May 4 13:38:57 2020 +0200 Website: Camel3 migration guide: fixup JndiRegistry section --- docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc index 5bc878e..7d764e0 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc @@ -564,9 +564,9 @@ should be rewritten as: == Upgrading Camel 3.1 to 3.2 -```=== JndiRegistry +=== JndiRegistry -The deprecated class `org.apache.camel.impl.JndiRegistry` was removed. `org.apache.camel.support.jndi.JndiBeanRepository` should be used instead. +The deprecated class `org.apache.camel.impl.JndiRegistry` has been removed. The class `org.apache.camel.support.jndi.JndiBeanRepository` located in `org.apache.camel:camel-support` should be used instead. === Rest Configuration
[camel] branch master updated: Website: Camel3 migration guide: update doc with missing information
This is an automated email from the ASF dual-hosted git repository. jpoth 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 6bcc3a1 Website: Camel3 migration guide: update doc with missing information 6bcc3a1 is described below commit 6bcc3a15f27821838a166b02bb998147e7e940e4 Author: John Poth AuthorDate: Thu Apr 30 16:56:33 2020 +0200 Website: Camel3 migration guide: update doc with missing information --- docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc | 4 ++-- docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 4 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc index 1e1bf23..23b4681 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc @@ -51,7 +51,7 @@ In Camel 2.x camel-core was one JAR file, it has now been split up into many JAR - camel-util - camel-util-json -Maven users of Apache Camel can keep using the dependency `camel-core` which has transitive dependencies on all of its modules, and therefore no migration is needed. +Maven users of Apache Camel can keep using the dependency `camel-core` which has transitive dependencies on all of its modules, except for `camel-main`, and therefore no migration is needed. However, users who want to trim the size of the classes on the classpath, can use fine grained Maven dependencies on only the modules needed. You may find how to do that in the examples. @@ -155,7 +155,7 @@ The implementation is still named `org.apache.camel.component.properties.Propert === Removed components -We have removed all deprecated components from Camel 2.x, including the old `camel-http`, `camel-hdfs`, `camel-mina`, `camel-mongodb`, `camel-netty`, `camel-netty-http`, `camel-quartz` and `camel-rx` components. +We have removed all deprecated components from Camel 2.x, including the old `camel-http`, `camel-hdfs`, `camel-mina`, `camel-mongodb`, `camel-netty`, `camel-netty-http`, `camel-quartz`, `camel-restlet` and `camel-rx` components. We removed `camel-jibx` component which wasn't working on JDK 8. diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc index 5977f27..5bc878e 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc @@ -564,6 +564,10 @@ should be rewritten as: == Upgrading Camel 3.1 to 3.2 +```=== JndiRegistry + +The deprecated class `org.apache.camel.impl.JndiRegistry` was removed. `org.apache.camel.support.jndi.JndiBeanRepository` should be used instead. + === Rest Configuration The rest configuration has been simplified and there is now a single RestConfiguration instance (https://issues.apache.org/jira/browse/CAMEL-13844[CAMEL-13844]) per Camel Context.
[camel] branch master updated: Website: Camel3 migration guide, fix typos, add cases
This is an automated email from the ASF dual-hosted git repository. jpoth 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 ec4a2b4 Website: Camel3 migration guide, fix typos, add cases ec4a2b4 is described below commit ec4a2b42d58c9d0d6e00837f51dd3dcd3eb8b243 Author: John Poth AuthorDate: Tue Apr 28 16:19:42 2020 +0200 Website: Camel3 migration guide, fix typos, add cases --- docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc index a1a903b..1e1bf23 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc @@ -470,11 +470,13 @@ The `activemq-camel` component has been moved from ActiveMQ into Camel and it is The method `includeRoutes` on `RouteBuilder` has been removed. This functionality was not fully in use and was deprecated in Camel 2.x. -The exception `PredicateValidationException` has been moved from package `org.apache.camel.processor.validation` to `org.apache.camel.support.processor.validation.PredicateValidationException`. +The exception `PredicateValidationException` has been moved from package `org.apache.camel.processor.validation` to `org.apache.camel.support.processor.PredicateValidationException`. The class `org.apache.camel.util.toolbox.AggregationStrategies` has been moved to `org.apache.camel.builder.AggregationStrategies`. -The class `org.apache.camel.processor.aggregate.AggregationStrategy` has been moved to `org.apache.camel.AggregationStrategy`. +The class `org.apache.camel.util.toolbox.AggregationStrategies` has been moved to `org.apache.camel.builder.AggregationStrategies`. + +The class `org.apache.camel.processor.RedeliveryPolicy` has been moved to `org.apache.camel.processor.errorhandler.RedeliveryPolicy`. The class `org.apache.camel.processor.loadbalancer.SimpleLoadBalancerSupport` has been removed, instead use `org.apache.camel.processor.loadbalancer.LoadBalancerSupport`.
[camel] branch master updated: Website: Camel3 migration guide, only mention Camel 2.x AWS components
This is an automated email from the ASF dual-hosted git repository. jpoth 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 d5f9c36 Website: Camel3 migration guide, only mention Camel 2.x AWS components d5f9c36 is described below commit d5f9c36785ff0c3b7d97a24d64082756afc304a7 Author: John Poth AuthorDate: Wed Apr 8 17:35:13 2020 +0200 Website: Camel3 migration guide, only mention Camel 2.x AWS components --- docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc index f5873a1..a1a903b 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc @@ -301,8 +301,6 @@ The component `camel-aws` has been split into multiple components: - camel-aws-cw - camel-aws-ddb (which contains both ddb and ddbstreams components) - camel-aws-ec2 -- camel-aws-ecs -- camel-aws-eks - camel-aws-iam - camel-aws-kinesis (which contains both kinesis and kinesis-firehose components) - camel-aws-kms
[camel] branch master updated: Website: Fix Camel3 migration Aggregation error
This is an automated email from the ASF dual-hosted git repository. jpoth 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 5e32e75 Website: Fix Camel3 migration Aggregation error 5e32e75 is described below commit 5e32e7583c70975fe38b0b341fad3156d605eb28 Author: John Poth AuthorDate: Mon Mar 23 10:25:29 2020 +0100 Website: Fix Camel3 migration Aggregation error --- docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc index 56cc7fb..d7ef130 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc @@ -619,7 +619,7 @@ The class `org.apache.camel.impl.ThrottlingInflightRoutePolicy` has been moved t === Aggregation -The class `XsltAggregationStrategy` has been moved from `org.apache.camel.builder.XsltAggregationStrategy` in the camel-core JAR to `org.apache.camel.component.xslt.XsltAggregationStrategy` and moved to the `camel-xslt` JAR. +The class `XsltAggregationStrategy` has been moved from `org.apache.camel.util.toolbox.XsltAggregationStrategy` in the camel-core JAR to `org.apache.camel.component.xslt.XsltAggregationStrategy` and moved to the `camel-xslt` JAR. When using the option `groupedExchange` on the aggregator EIP then the output of the aggregation is now longer also stored in the exchange property `Exchange.GROUPED_EXCHANGE`. This behaviour was already deprecated from Camel 2.13 onwards.
[camel] branch master updated (b886173 -> dbba117)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from b886173 Camel-AWS2-S3: Removed unused headers new dcc9e0b Fix kafka camel 3 migration guide new dbba117 Website: Camel3 migration fix typos and errors 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: docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
[camel] 02/02: Website: Camel3 migration fix typos and errors
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit dbba117a13e998129a960e2505abca9545b865c1 Author: John Poth AuthorDate: Mon Mar 9 17:41:19 2020 +0100 Website: Camel3 migration fix typos and errors --- docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc index 8cba7d0..56cc7fb 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc @@ -320,7 +320,7 @@ The default FHIR version has been changed to R4. Therefore if DSTU3 is desired i === Kafka -The `camel-kafka` component has removed the options `bridgeEndpoint` and `circularTopicDetection` as this is no longer needed as the component is acting as briding would work on Camel 2.x. In other words `camel-kafka` will send messages to the topic from the endpoint uri. To override this use the `KafkaConstants.OVERRIDE_TOPIC` header with the new topic. See more details in the `camel-kafka` component documentation. +The `camel-kafka` component has removed the options `bridgeEndpoint` and `circularTopicDetection` as this is no longer needed as the component is acting as bridging would work on Camel 2.x. In other words `camel-kafka` will send messages to the topic from the endpoint uri. To override this use the `KafkaConstants.OVERRIDE_TOPIC` header with the new topic. See more details in the `camel-kafka` component documentation. === Telegram @@ -589,7 +589,7 @@ The class `JsonSchemaHelper` has been moved from `org.apache.camel.util.JsonSche The class `MessageHelper` has been moved from `org.apache.camel.util.MessageHelper` in the camel-core JAR to `org.apache.camel.support.MessageHelper` and moved to the `camel-support` JAR. -The class `ObjectHelper` has been moved from `org.apache.camel.util.ObjectHelper` in the camel-core JAR and splitted into `org.apache.camel.support.ObjectHelper` and moved to the `camel-support` JAR and into `org.apache.camel.util.ObjectHelper` and moved to the `camel-util` JAR. This has been done to isolate the methods using `camel-api` JAR: those method are in the `camel-support` JAR, the other in the `camel-util` JAR. +The class `ObjectHelper` has been moved from `org.apache.camel.util.ObjectHelper` in the camel-core JAR and split into `org.apache.camel.support.ObjectHelper` and moved to the `camel-support` JAR and into `org.apache.camel.util.ObjectHelper` and moved to the `camel-util` JAR. This has been done to isolate the methods using `camel-api` JAR: those method are in the `camel-support` JAR, the other in the `camel-util` JAR. The class `PlatformHelper` has been moved from `org.apache.camel.util.PlatformHelper` in the camel-core JAR to `org.apache.camel.support.PlatformHelper` and moved to the `camel-support` JAR. @@ -613,7 +613,7 @@ The class `MemoryIdempotentRepository` has been moved from `org.apache.camel.pro === Route Policies -The class `org.apache.camel.impl.RoutePolicySupport` has been moved to `org.apache.camel.support.RoutePolicySupport`. The return type from `startConsumer` and `stopConsumer` has been changed from `boolean` to `void` as they always returned `true` before. +The class `org.apache.camel.support.RoutePolicySupport` has been moved to the `camel-support` JAR. The return type from `startConsumer` and `stopConsumer` has been changed from `boolean` to `void` as they always returned `true` before. The class `org.apache.camel.impl.ThrottlingInflightRoutePolicy` has been moved to `org.apache.camel.throttling.ThrottlingInflightRoutePolicy`
[camel] 01/02: Fix kafka camel 3 migration guide
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit dcc9e0b82d98de4dcbc9a9036be06f87697c99e2 Author: John Poth AuthorDate: Thu Feb 6 16:41:10 2020 +0100 Fix kafka camel 3 migration guide --- docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc index ea84705..8cba7d0 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc @@ -320,7 +320,7 @@ The default FHIR version has been changed to R4. Therefore if DSTU3 is desired i === Kafka -The `camel-kafka` component has removed the options `bridgeEndpoint` and `circularEndpointDetection` as this is no longer needed as the component is acting as briding would work on Camel 2.x. In other words `camel-kafka` will send messages to the topic from the endpoint uri. To override this use the `KafkaConstants.OVERRIDE_TOPIC` header with the new topic. See more details in the `camel-kafka` component documentation. +The `camel-kafka` component has removed the options `bridgeEndpoint` and `circularTopicDetection` as this is no longer needed as the component is acting as briding would work on Camel 2.x. In other words `camel-kafka` will send messages to the topic from the endpoint uri. To override this use the `KafkaConstants.OVERRIDE_TOPIC` header with the new topic. See more details in the `camel-kafka` component documentation. === Telegram
[camel] branch camel-2.x updated: camel3 - Fixed camel:run maven plugin after upgrading to newer Maven Plugin API
This is an automated email from the ASF dual-hosted git repository.
jpoth 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 a60fff7 camel3 - Fixed camel:run maven plugin after upgrading to
newer Maven Plugin API
a60fff7 is described below
commit a60fff79df17a71e1d4215dde15d263c77df7eaf
Author: Claus Ibsen
AuthorDate: Tue Jan 29 20:05:17 2019 +0100
camel3 - Fixed camel:run maven plugin after upgrading to newer Maven Plugin
API
(cherry picked from commit 6cd5192e74d35891a145a1d95fe26e3786e4d648)
---
.../main/java/org/apache/camel/maven/RunMojo.java | 85 ++
1 file changed, 21 insertions(+), 64 deletions(-)
diff --git
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
index 08bcf4f..35d23d5 100644
---
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
+++
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
@@ -37,7 +37,6 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
@@ -62,7 +61,6 @@ import org.apache.maven.project.artifact.MavenMetadataSource;
import org.codehaus.mojo.exec.AbstractExecMojo;
import org.codehaus.mojo.exec.ExecutableDependency;
import org.codehaus.mojo.exec.Property;
-import org.eclipse.aether.RepositorySystem;
/**
* Runs a CamelContext using any Spring or Blueprint XML configuration files
found in
@@ -143,90 +141,73 @@ public class RunMojo extends AbstractExecMojo {
@Parameter(property = "project.remoteArtifactRepositories")
private List remoteRepositories;
-/**
- * @component
- */
+@Component
private MavenProjectBuilder projectBuilder;
-/**
- * @parameter property="plugin.artifacts"
- * @readonly
- */
+@Parameter(property = "plugin.artifacts")
private List pluginDependencies;
/**
* Whether to enable the tracer or not
- *
- * @parameter property="camel.trace"
- *default-value="false"
- * @required
*/
+@Parameter(property = "camel.trace")
private boolean trace;
/**
* The main class to execute.
- *
- * @parameter property="camel.mainClass"
*/
+@Parameter(property = "camel.mainClass")
private String mainClass;
/**
* The basedPackages that spring java config want to gets.
- *
- * @parameter property="camel.basedPackages"
*/
+@Parameter(property = "camel.basedPackages")
private String basedPackages;
/**
* The configClasses that spring java config want to gets.
- *
- * @parameter property="camel.configClasses"
*/
+@Parameter(property = "camel.configClasses")
private String configClasses;
/**
* The classpath based application context uri that spring want to gets.
- *
- * @parameter property="camel.applicationContextUri"
*/
+@Parameter(property = "camel.applicationContextUri")
private String applicationContextUri;
/**
* The filesystem based application context uri that spring want to gets.
- *
- * @parameter property="camel.fileApplicationContextUri"
*/
+@Parameter(property = "camel.fileApplicationContextUri")
private String fileApplicationContextUri;
/**
* The configureAdmin persistent id, it will be used when loading the
* camel context from blueprint.
- *
- * @parameter property="camel.configAdminPid"
*/
+@Parameter(property = "camel.configAdminPid")
private String configAdminPid;
/**
* The configureAdmin persistent file name, it will be used when
* loading the camel context from blueprint.
- *
- * @parameter property="camel.configAdminFileName"
*/
+@Parameter(property = "camel.configAdminFileName")
private String configAdminFileName;
/**
* To watch the directory for file changes which triggers
* a live reload of the Camel routes on-the-fly.
- *
- * @parameter property="camel.fileWatcherDirectory"
*/
+@Parameter(property = "camel.fileWatcherDirecto
[camel] branch master updated: Camel 3 migration guide: camel-rx component was removed
This is an automated email from the ASF dual-hosted git repository. jpoth 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 28b34ab Camel 3 migration guide: camel-rx component was removed 28b34ab is described below commit 28b34abcdc962e0cc18ab8020475452aaf8bb543 Author: John Poth AuthorDate: Mon Jan 13 15:30:36 2020 +0100 Camel 3 migration guide: camel-rx component was removed --- docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc index 758df6b..ea84705 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc @@ -151,7 +151,7 @@ The implementation is still named `org.apache.camel.component.properties.Propert === Removed components -We have removed all deprecated components from Camel 2.x, including the old `camel-http`, `camel-hdfs`, `camel-mina`, `camel-mongodb`, `camel-netty`, `camel-netty-http`, `camel-quartz` and `camel-rxjava` components. +We have removed all deprecated components from Camel 2.x, including the old `camel-http`, `camel-hdfs`, `camel-mina`, `camel-mongodb`, `camel-netty`, `camel-netty-http`, `camel-quartz` and `camel-rx` components. We removed `camel-jibx` component which wasn't working on JDK 8.
[camel] branch master updated: CAMEL-14168 mention removal of camel-linkedin component in the camel3 migration guide
This is an automated email from the ASF dual-hosted git repository. jpoth 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 dc383a1 CAMEL-14168 mention removal of camel-linkedin component in the camel3 migration guide dc383a1 is described below commit dc383a1a1152c7bb1e3ab3a418b8295142f3eae9 Author: John Poth AuthorDate: Mon Jan 13 10:41:59 2020 +0100 CAMEL-14168 mention removal of camel-linkedin component in the camel3 migration guide --- docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc index 7dc117a..758df6b 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc @@ -157,6 +157,8 @@ We removed `camel-jibx` component which wasn't working on JDK 8. We removed `camel-boon` dataformat which wasn't working on JDK 9 and later. +We removed the `camel-linkedin` component as the Linkedin API 1.0 is no longer https://engineering.linkedin.com/blog/2018/12/developer-program-updates[supported]. Support for the new 2.0 API is tracked by https://issues.apache.org/jira/browse/CAMEL-13813[CAMEL-13813]. + The `camel-zookeeper` has its route policy functionality removed, instead use `ZooKeeperClusterService` or the `camel-zookeeper-master` component. The `camel-jetty` component no longer supports producer (eg to) which has been removed, use `camel-http` component instead.
[camel-quarkus] branch master updated (c8f9255 -> 5acebbb)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. from c8f9255 Add Camel-AWS-KMS extension add c744d19 Add FHIR DSTU2 enums add 5acebbb Set error parsing to strict for FHIR extension No new revisions were added by this update. Summary of changes: .../component/fhir/deployment/FhirProcessor.java | 198 - .../component/fhir/it/FhirDstu2RouteBuilder.java | 12 +- .../component/fhir/it/FhirDstu3RouteBuilder.java | 12 +- .../component/fhir/it/FhirR4RouteBuilder.java | 11 +- .../camel/quarkus/component/fhir/it/FhirTest.java | 18 +- 5 files changed, 237 insertions(+), 14 deletions(-)
[camel] branch master updated (375e127 -> 46cc6d3)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 375e127 CAMEL-14176: camel-xslt - Split up into camel-saxon-xslt (#3339) new 267f4e5 Fix ServicePool documentation new f0491a1 CAMEL-14104: Update to FHIR 4.1.0 new 225503e CAMEL-14104: camel-fhir set default FHIR version to R4 new 46cc6d3 CAMEL-14104: camel-fhir drop Karaf support The 4 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: components/camel-fhir/camel-fhir-component/pom.xml | 12 +++ .../src/main/docs/fhir-component.adoc | 6 ++-- .../camel/component/fhir/FhirConfiguration.java| 6 ++-- .../camel/component/fhir/FhirConfigurationIT.java | 2 +- .../fhir/FhirCustomClientConfigurationIT.java | 27 +++ .../camel/component/fhir/FhirOperationIT.java | 6 +--- .../src/test/resources/test-options.properties | 2 +- .../org/apache/camel/impl/engine/ServicePool.java | 3 +- .../endpoint/dsl/FhirEndpointBuilderFactory.java | 6 ++-- .../ROOT/pages/camel-3-migration-guide.adoc| 5 +++ parent/pom.xml | 2 +- .../karaf/features/src/main/resources/features.xml | 11 --- .../springboot/FhirComponentConfiguration.java | 38 +- .../apache/camel/itest/karaf/CamelFhirTest.java| 35 14 files changed, 44 insertions(+), 117 deletions(-) delete mode 100644 tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFhirTest.java
[camel] 03/04: CAMEL-14104: camel-fhir set default FHIR version to R4
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 225503e2de5ba3824f26f05a08b3aef0d74c2f8b
Author: John Poth
AuthorDate: Thu Nov 14 15:38:01 2019 +0100
CAMEL-14104: camel-fhir set default FHIR version to R4
---
.../src/main/docs/fhir-component.adoc | 6 ++--
.../camel/component/fhir/FhirConfiguration.java| 4 +--
.../springboot/FhirComponentConfiguration.java | 38 +-
3 files changed, 5 insertions(+), 43 deletions(-)
diff --git
a/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc
b/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc
index 8425aa6..5467775 100644
---
a/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc
+++
b/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc
@@ -51,7 +51,7 @@ Endpoint prefix can be one of:
// component options: START
-The FHIR component supports 4 options, which are listed below.
+The FHIR component supports 2 options, which are listed below.
@@ -60,8 +60,6 @@ The FHIR component supports 4 options, which are listed below.
| Name | Description | Default | Type
| *configuration* (common) | To use the shared configuration | |
FhirConfiguration
| *basicPropertyBinding* (advanced) | Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities | false | boolean
-| *lazyStartProducer* (producer) | Whether the producer should be started lazy
(on the first message). By starting lazy you can use this to allow CamelContext
and routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
-| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions occurred while the
consumer is trying to pickup incoming messages, or the likes, will now be
processed as a message and handled by the routing Error Handler. By default the
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with
exceptions, that will be logged at WARN or ERROR level and ignored. | false |
boolean
|===
// component options: END
@@ -93,7 +91,7 @@ with the following path and query parameters:
|===
| Name | Description | Default | Type
| *encoding* (common) | Encoding to use for all request | | String
-| *fhirVersion* (common) | The FHIR Version to use | DSTU3 | String
+| *fhirVersion* (common) | The FHIR Version to use | R4 | String
| *inBody* (common) | Sets the name of a parameter to be passed in the
exchange In Body | | String
| *log* (common) | Will log every requests and responses | false | boolean
| *prettyPrint* (common) | Pretty print all request | false | boolean
diff --git
a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
index f0dcd1a..ebf0c7b 100644
---
a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
+++
b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
@@ -46,8 +46,8 @@ public class FhirConfiguration {
@UriParam(description = "The FHIR server base URL")
private String serverUrl;
-@UriParam(description = "The FHIR Version to use", defaultValue = "DSTU3",
javaType = "java.lang.String")
-private FhirVersionEnum fhirVersion = FhirVersionEnum.DSTU3;
+@UriParam(description = "The FHIR Version to use", defaultValue = "R4",
javaType = "java.lang.String")
+private FhirVersionEnum fhirVersion = FhirVersionEnum.R4;
@UriParam(description = "Pretty print all request")
private boolean prettyPrint;
diff --git
a/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentConfiguration.java
b/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentConfiguration.java
index cba6662..fc9a6ef 100644
---
a/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentConfiguration.java
@@ -49,26 +49
[camel] 02/04: CAMEL-14104: Update to FHIR 4.1.0
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f0491a1aa922d75a6e7926636736c2a8ae5eaee0
Author: John Poth
AuthorDate: Wed Oct 23 17:04:30 2019 +0200
CAMEL-14104: Update to FHIR 4.1.0
---
components/camel-fhir/camel-fhir-component/pom.xml | 12 ++
.../camel/component/fhir/FhirConfiguration.java| 2 ++
.../camel/component/fhir/FhirConfigurationIT.java | 2 +-
.../fhir/FhirCustomClientConfigurationIT.java | 27 +-
.../camel/component/fhir/FhirOperationIT.java | 6 +
.../src/test/resources/test-options.properties | 2 +-
.../endpoint/dsl/FhirEndpointBuilderFactory.java | 6 +++--
parent/pom.xml | 2 +-
8 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/components/camel-fhir/camel-fhir-component/pom.xml
b/components/camel-fhir/camel-fhir-component/pom.xml
index 73f78c2..aa8285b 100644
--- a/components/camel-fhir/camel-fhir-component/pom.xml
+++ b/components/camel-fhir/camel-fhir-component/pom.xml
@@ -80,6 +80,18 @@
ca.uhn.hapi.fhir
+hapi-fhir-structures-r5
+${hapi-fhir-version}
+
+
+
+ca.uhn.hapi.fhir
+hapi-fhir-structures-r4
+${hapi-fhir-version}
+
+
+
+ca.uhn.hapi.fhir
hapi-fhir-structures-dstu3
${hapi-fhir-version}
diff --git
a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
index 33910e0..f0dcd1a 100644
---
a/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
+++
b/components/camel-fhir/camel-fhir-component/src/main/java/org/apache/camel/component/fhir/FhirConfiguration.java
@@ -346,6 +346,8 @@ public class FhirConfiguration {
&& ObjectHelper.equal(proxyPort,
otherFhirConfiguration.getProxyPort())
&& ObjectHelper.equal(proxyUser,
otherFhirConfiguration.getProxyUser())
&& ObjectHelper.equal(proxyPassword,
otherFhirConfiguration.getProxyPassword())
+&& ObjectHelper.equal(client,
otherFhirConfiguration.getClient())
+&& ObjectHelper.equal(clientFactory,
otherFhirConfiguration.getClientFactory())
&& ObjectHelper.equal(serverUrl,
otherFhirConfiguration.getServerUrl());
}
return false;
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
index e8ee1c6..d89aa1f 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
@@ -73,7 +73,7 @@ public class FhirConfigurationIT extends
AbstractFhirTestSupport {
assertEquals("http://localhost:8080/hapi-fhir-jpaserver-example/baseDstu3;,
client.getUrlBase());
assertEquals(EncodingEnum.JSON, client.getEncoding());
assertEquals(SummaryEnum.TEXT, client.getSummary());
-List interceptors = client.getInterceptors();
+List interceptors =
client.getInterceptorService().getAllRegisteredInterceptors();
assertEquals(5, interceptors.size());
}
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
index 8fef25a..20f3d26 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.fhir;
import java.util.List;
import java.util.Map;
import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.interceptor.api.IInterceptorService;
import ca.uhn.fhir.model.primitive.IdDt;
import ca.uhn.fhir.model.primitive.UriDt;
import ca.uhn.fhir.rest.api.EncodingEnum;
@@ -74,17 +75,6 @@ public class FhirCustomClientConfigurationIT extends
AbstractFhirTestSupport {
@BindToRegistry("customClientFactory")
private CustomClientFactory clientFactory = new CustomClientFactory();
-
-@Override
-protected Came
[camel] 01/04: Fix ServicePool documentation
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 267f4e5bff9a1db243fda8b67b1079ec673cbcc2 Author: John Poth AuthorDate: Mon Sep 30 16:57:48 2019 +0200 Fix ServicePool documentation --- .../src/main/java/org/apache/camel/impl/engine/ServicePool.java| 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/ServicePool.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/ServicePool.java index 8afe7ef..a75cdd6 100644 --- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/ServicePool.java +++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/ServicePool.java @@ -36,8 +36,7 @@ import org.slf4j.LoggerFactory; /** * A service pool is like a connection pool but can pool any kind of objects. * - * Notice the capacity is per key which means that each key can contain at most - * (the capacity) services. The pool will contain at most (the capacity) number of keys. + * The pool will contain at most (the capacity) number of services. * * By default the capacity is set to 100. */
[camel] 04/04: CAMEL-14104: camel-fhir drop Karaf support
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 46cc6d367f7a44bfd5f92d08af7b52bde8f7c876
Author: John Poth
AuthorDate: Thu Nov 14 15:51:59 2019 +0100
CAMEL-14104: camel-fhir drop Karaf support
---
.../ROOT/pages/camel-3-migration-guide.adoc| 5
.../karaf/features/src/main/resources/features.xml | 11 ---
.../apache/camel/itest/karaf/CamelFhirTest.java| 35 --
3 files changed, 5 insertions(+), 46 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc
b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc
index 23eaa91..257bd91 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc
@@ -267,6 +267,11 @@ The component `camel-aws` has been split into multiple
components:
So you'll have to add explicitly the dependencies for these components. From
the OSGi perspective, there is still a `camel-aws` Karaf feature, which
includes all the components features.
+=== FHIR
+
+The camel-fhir component has upgraded it's hapi-fhir dependency to 4.1.0;
Karaf support has been dropped until the hapi-fhir Karaf features are fixed and
released.
+The default FHIR version has been changed to R4. Therefore if DSTU3 is desired
it has to be explicitly set.
+
=== Kafka
The `camel-kafka` component has removed the options `bridgeEndpoint` and
`circularEndpointDetection` as this is no longer needed as the component is
acting as briding would work on Camel 2.x. In other words `camel-kafka` will
send messages to the topic from the endpoint uri. To override this use the
`KafkaConstants.OVERRIDE_TOPIC` header with the new topic. See more details in
the `camel-kafka` component documentation.
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 0ae46a0..722fd96 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -23,7 +23,6 @@
mvn:org.ops4j.pax.cdi/pax-cdi-features/${pax-cdi-version}/xml/features
mvn:org.apache.karaf.features/spring-legacy/${karaf4-version}/xml/features
mvn:org.hibernate.validator/hibernate-validator-osgi-karaf-features/${hibernate-validator-version}/xml/features
-
mvn:ca.uhn.hapi.fhir.karaf/hapi-fhir/${hapi-fhir-version}/xml/features
mvn:org.infinispan/infinispan-commons/${infinispan-version}/xml/features
mvn:org.infinispan/infinispan-core/${infinispan-version}/xml/features
mvn:org.infinispan/infinispan-jboss-marshalling/${infinispan-version}/xml/features
@@ -974,16 +973,6 @@
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastjson/${fastjson-bundle-version}
mvn:org.apache.camel/camel-fastjson/${project.version}
-
-camel-core
-hapi-fhir
-hapi-fhir-client
-hapi-fhir-dstu2
-hapi-fhir-dstu3
-mvn:com.google.guava/guava/${google-guava-version}
-mvn:org.apache.camel/camel-fhir-api/${project.version}
-mvn:org.apache.camel/camel-fhir/${project.version}
-
camel-core
wrap:mvn:io.methvin/directory-watcher/${directory-watcher-version}
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFhirTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFhirTest.java
deleted file mode 100644
index 46d236c..000
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFhirTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.itest.karaf;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.PaxExam;
-
-@RunWith(PaxExam.class)
-public class CamelFhirTest extends BaseKarafTest {
-
-public static final String COMPONENT = extractName(CamelFhirTest.class);
-
-@Test
-public void test() throws Exception {
-testDataFormat(COMPONENT, "fhirJson");
-test
[camel] branch master updated (19c515e -> ee7a5fe)
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 19c515e Upgrade Jgroups-Raft to version 0.5.0.Final
new 91350f8 CAMEL-14149 - Upgrade Infinispan version
new ee7a5fe CAMEL-14149 - Update camel-infinispan Karaf feature
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:
components/camel-infinispan/pom.xml| 155 +
.../component/infinispan/InfinispanManager.java| 11 +-
.../InfinispanLocalAggregationRepository.java | 5 +-
.../idempotent/InfinispanIdempotentRepository.java | 3 +-
.../infinispan/InfinispanClusterTestSupport.java | 9 +-
...nTestIT.java => InfinispanConfigurationIT.java} | 17 ++-
.../infinispan/InfinispanContinuousQueryIT.java| 11 +-
.../InfinispanRemoteQueryProducerIT.java | 67 -
.../infinispan/InfinispanTestSupport.java | 5 +-
.../policy/InfinispanEmbeddedRoutePolicyTest.java | 5 +-
.../InfinispanDefaultIdempotentRepositoryTest.java | 5 +-
.../InfinispanIdempotentRepositoryIT.java | 9 ++
.../InfinispanIdempotentRepositoryTest.java| 20 ++-
.../SpringInfinispanIdempotentRepositoryIT.java| 15 +-
.../SpringInfinispanIdempotentRepositoryIT.xml | 3 +-
.../dsl/InfinispanEndpointBuilderFactory.java | 3 -
parent/pom.xml | 2 +-
.../karaf/features/src/main/resources/features.xml | 31 ++---
18 files changed, 148 insertions(+), 228 deletions(-)
rename
components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/{InfinispanConfigurationTestIT.java
=> InfinispanConfigurationIT.java} (82%)
[camel] 01/02: CAMEL-14149 - Upgrade Infinispan version
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 91350f8e23f77bc580608e3361273766adb6c1f2
Author: John Poth
AuthorDate: Wed Nov 6 12:18:16 2019 +0100
CAMEL-14149 - Upgrade Infinispan version
---
components/camel-infinispan/pom.xml| 145 +
.../component/infinispan/InfinispanManager.java| 11 +-
.../InfinispanLocalAggregationRepository.java | 5 +-
.../idempotent/InfinispanIdempotentRepository.java | 3 +-
.../infinispan/InfinispanClusterTestSupport.java | 9 +-
...nTestIT.java => InfinispanConfigurationIT.java} | 17 ++-
.../infinispan/InfinispanContinuousQueryIT.java| 11 +-
.../InfinispanRemoteQueryProducerIT.java | 67 --
.../infinispan/InfinispanTestSupport.java | 5 +-
.../policy/InfinispanEmbeddedRoutePolicyTest.java | 5 +-
.../InfinispanDefaultIdempotentRepositoryTest.java | 5 +-
.../InfinispanIdempotentRepositoryIT.java | 9 ++
.../InfinispanIdempotentRepositoryTest.java| 20 ++-
.../SpringInfinispanIdempotentRepositoryIT.java| 15 ++-
.../SpringInfinispanIdempotentRepositoryIT.xml | 3 +-
.../dsl/InfinispanEndpointBuilderFactory.java | 3 -
parent/pom.xml | 2 +-
17 files changed, 141 insertions(+), 194 deletions(-)
diff --git a/components/camel-infinispan/pom.xml
b/components/camel-infinispan/pom.xml
index d1e33db..1e3ba57 100644
--- a/components/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/pom.xml
@@ -34,7 +34,8 @@
Camel Infinispan support
- 4.0.18.Final
+ 4.1.6.Final
+ 4.3.0.Final
@@ -94,7 +95,7 @@
org.infinispan
-infinispan-spring4-remote
+infinispan-spring5-remote
${infinispan-version}
test
@@ -105,37 +106,16 @@
test
-org.infinispan.server
-infinispan-server-testsuite
-${infinispan-version}
-tests
+org.infinispan.protostream
+sample-domain-definition
+${protostream-version}
+test
+
+
+org.infinispan.protostream
+sample-domain-implementation
+${protostream-version}
test
-
-
-org.jboss.remoting3
-remoting-jmx
-
-
-org.infinispan
-infinispan-core
-
-
-org.infinispan
-infinispan-client-hotrod
-
-
-org.infinispan
-infinispan-query-dsl
-
-
-org.infinispan
-infinispan-remote-query-client
-
-
-org.apache.karaf
-apache-karaf
-
-
org.apache.logging.log4j
@@ -199,24 +179,20 @@
-org.apache.maven.plugins
-maven-antrun-plugin
+com.googlecode.maven-download-plugin
+download-maven-plugin
+1.4.2
-install-binary-distribution
-generate-test-resources
+download-infinispan-server
+pre-integration-test
-run
+wget
-
-https://downloads.jboss.org/infinispan/${infinispan-version}/infinispan-server-${infinispan-version}.zip;
-
dest="${project.build.directory}/infinispan-server-${infinispan-version}.zip"/>
-
-
+
http://downloads.jboss.org/infinispan/${infinispan-version}/infinispan-server-${infinispan-version}.zip
+true
+
${server.dir.parent}
@@ -234,9 +210,8 @@
-
org.i
[camel] 02/02: CAMEL-14149 - Update camel-infinispan Karaf feature
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ee7a5fe0ab26f371b76d5a1e313fcf7d38f173b5
Author: John Poth
AuthorDate: Wed Nov 6 14:50:19 2019 +0100
CAMEL-14149 - Update camel-infinispan Karaf feature
---
components/camel-infinispan/pom.xml| 12 -
.../karaf/features/src/main/resources/features.xml | 31 ++
2 files changed, 8 insertions(+), 35 deletions(-)
diff --git a/components/camel-infinispan/pom.xml
b/components/camel-infinispan/pom.xml
index 1e3ba57..11c5a36 100644
--- a/components/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/pom.xml
@@ -34,7 +34,6 @@
Camel Infinispan support
- 4.1.6.Final
4.3.0.Final
@@ -47,17 +46,6 @@
org.infinispan
infinispan-core
${infinispan-version}
-
-
-org.jgroups
-jgroups
-
-
-
-
-org.jgroups
-jgroups
-${jgroups-infinispan-version}
org.infinispan
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 4db2148..e845c9f 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -24,6 +24,10 @@
mvn:org.apache.karaf.features/spring-legacy/${karaf4-version}/xml/features
mvn:org.hibernate.validator/hibernate-validator-osgi-karaf-features/${hibernate-validator-version}/xml/features
mvn:ca.uhn.hapi.fhir.karaf/hapi-fhir/${hapi-fhir-version}/xml/features
+
mvn:org.infinispan/infinispan-commons/${infinispan-version}/xml/features
+
mvn:org.infinispan/infinispan-core/${infinispan-version}/xml/features
+
mvn:org.infinispan/infinispan-jboss-marshalling/${infinispan-version}/xml/features
+
mvn:org.infinispan/infinispan-client-hotrod/${infinispan-version}/xml/features
mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}
@@ -1344,29 +1348,10 @@
camel-core
-transaction
-aries-blueprint
-mvn:org.infinispan/infinispan-core/${infinispan-version}
-mvn:org.infinispan/infinispan-commons/${infinispan-version}
-mvn:org.infinispan/infinispan-query-dsl/${infinispan-version}
-mvn:org.infinispan/infinispan-client-hotrod/${infinispan-version}
-mvn:org.jgroups/jgroups/${jgroups-version}
-mvn:com.github.ben-manes.caffeine/caffeine/${caffeine-version}
-mvn:io.reactivex.rxjava2/rxjava/${rxjava2-version}
-mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}
-mvn:io.netty/netty-buffer/${netty-version}
-mvn:io.netty/netty-codec/${netty-version}
-mvn:io.netty/netty-common/${netty-version}
-mvn:io.netty/netty-handler/${netty-version}
-mvn:io.netty/netty-transport/${netty-version}
-mvn:io.netty/netty-resolver/${netty-version}
-mvn:io.netty/netty-transport-native-epoll/${netty-version}
-mvn:io.netty/netty-transport-native-unix-common/${netty-version}
-mvn:com.google.code.gson/gson/${gson-version}
-mvn:org.jboss.logging/jboss-logging/${jboss-logging-version}
-wrap:mvn:org.jboss.marshalling/jboss-marshalling-osgi/${jboss-marshalling-version}
-wrap:mvn:org.jboss.marshalling/jboss-marshalling-river/${jboss-marshalling-version}
-mvn:commons-pool/commons-pool/${commons-pool-version}
+infinispan-commons
+infinispan-core
+infinispan-jboss-marshalling
+infinispan-client-hotrod-with-query
mvn:org.apache.camel/camel-infinispan/${project.version}
[camel] branch master updated: Fix camel-kudu feature
This is an automated email from the ASF dual-hosted git repository.
jpoth 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 65948a1 Fix camel-kudu feature
65948a1 is described below
commit 65948a1d277a9dcb3ec10a4498163a6f0798aa4b
Author: John Poth
AuthorDate: Wed Nov 6 12:37:37 2019 +0100
Fix camel-kudu feature
---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index c414efa..ada8e03 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1636,7 +1636,7 @@
mvn:io.fabric8/openshift-client/${kubernetes-client-version}/jar/bundle
mvn:org.apache.camel/camel-kubernetes/${project.version}
-
+
camel-core
wrap:mvn:org.apache.kudu/kudu-client/${kudu-version}
wrap:mvn:org.apache.yetus/audience-annotations/${yetus-audience-annotations-version}
[camel-quarkus] branch master updated (374b5bb -> c63168c)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. from 374b5bb Improve routes collector add c63168c Fix version in integration-test-pom.xml No new revisions were added by this update. Summary of changes: build/create-extension-templates/integration-test-pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch master updated (d0d537b -> d5fdf36)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from d0d537b Fixed indentation in parent/pom add d5fdf36 [CAMEL-14000] Fix Service leak when pool size is small No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/impl/engine/ServicePool.java| 7 +++ 1 file changed, 7 insertions(+)
[camel] branch master updated: CAMEL-14000 - remove Endpoint from Map when corresponding Pool is empty
This is an automated email from the ASF dual-hosted git repository.
jpoth 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 aa12e71 CAMEL-14000 - remove Endpoint from Map when corresponding
Pool is empty
new 240e821 Merge pull request #3186 from johnpoth/CAMEL-14000
aa12e71 is described below
commit aa12e71935b7ee1e3d6ac444d10a18b10c730abc
Author: John Poth
AuthorDate: Mon Sep 23 12:05:30 2019 +0200
CAMEL-14000 - remove Endpoint from Map when corresponding Pool is empty
---
.../java/org/apache/camel/impl/engine/ServicePool.java| 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/ServicePool.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/ServicePool.java
index 40f0502..cf38275 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/ServicePool.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/ServicePool.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
* A service pool is like a connection pool but can pool any kind of objects.
*
* Notice the capacity is per key which means that each key can contain
at most
- * (the capacity) services. The pool can contain an unbounded number of keys.
+ * (the capacity) services. The pool will contain at most (the capacity)
number of keys.
*
* By default the capacity is set to 100.
*/
@@ -56,7 +56,8 @@ public class ServicePool extends
ServiceSupport implements No
void release(S s);
int size();
void stop();
-void evict(S s);
+// returns true if the pool is empty
+boolean evict(S s);
}
static class Key {
@@ -85,7 +86,9 @@ public class ServicePool extends
ServiceSupport implements No
Endpoint e = getEndpoint.apply(s);
Pool p = pool.get(e);
if (p != null) {
-p.evict(s);
+if (p.evict(s)) {
+pool.remove(e);
+}
}
}
@@ -249,13 +252,14 @@ public class ServicePool extends
ServiceSupport implements No
}
@Override
-public void evict(S s) {
+public boolean evict(S s) {
synchronized (this) {
if (this.s == s) {
this.s = null;
}
}
doStop(s);
+return true;
}
void doStop(S s) {
@@ -309,9 +313,10 @@ public class ServicePool extends
ServiceSupport implements No
}
@Override
-public void evict(S s) {
+public boolean evict(S s) {
queue.remove(s);
ServicePool.stop(s);
+return queue.isEmpty();
}
}
[camel] branch master updated: Fix properties loading on JDK 11
This is an automated email from the ASF dual-hosted git repository.
jpoth 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 684378f Fix properties loading on JDK 11
684378f is described below
commit 684378fcfd5a4e57a6290761bc7a5faaf43c9805
Author: jpoth
AuthorDate: Mon Jun 17 15:02:58 2019 +0200
Fix properties loading on JDK 11
---
.../src/main/java/org/apache/camel/util/OrderedProperties.java | 7 +++
1 file changed, 7 insertions(+)
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/OrderedProperties.java
b/core/camel-util/src/main/java/org/apache/camel/util/OrderedProperties.java
index 861e147..5fd017a 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/OrderedProperties.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/OrderedProperties.java
@@ -46,6 +46,13 @@ public final class OrderedProperties extends Properties {
}
@Override
+public synchronized void putAll(Map t) {
+for (Map.Entry entry : t.entrySet()) {
+put(entry.getKey(), entry.getValue());
+}
+}
+
+@Override
public synchronized Object get(Object key) {
return map.get(key);
}
[camel] 01/02: [CAMEL-13257] Fix typo
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 859b4abb29d6ee9595c489d207361dfcee9106a3
Author: jpoth
AuthorDate: Wed Jun 12 18:55:22 2019 +0200
[CAMEL-13257] Fix typo
---
components/camel-cxf/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 528d41a..96dc26d 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -54,7 +54,7 @@
javax.xml.ws*;version="[0.0,3.0)",
org.apache.camel.*;${camel.osgi.import.camel.version},
org.springframework*;version="${spring-version-range}";resolution:=optional,
-org.apache.cxf.*;version="${cxf-version-range}"
+org.apache.cxf.*;version="${cxf-version-range}",
${camel.osgi.import.defaults},
${camel.osgi.import.additional},
org.osgi.service.blueprint;resolution:=optional,
[camel] branch master updated (6994565 -> f944a80)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 6994565 [CAMEL-13637]be able to enable access log for camel-undertow consumer endpoint new 859b4ab [CAMEL-13257] Fix typo new f944a80 Fix camel-cxf feature on JDK 11 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: components/camel-cxf/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[camel] 02/02: Fix camel-cxf feature on JDK 11
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit f944a80a9b5723cd8d09b81c0f55a0a30dcb3cd8 Author: jpoth AuthorDate: Wed Jun 12 19:00:50 2019 +0200 Fix camel-cxf feature on JDK 11 --- components/camel-cxf/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml index 96dc26d..f1a083b 100644 --- a/components/camel-cxf/pom.xml +++ b/components/camel-cxf/pom.xml @@ -34,6 +34,7 @@ Camel CXF support + !org.springframework.boot.*, !org.springframework.context.annotation.*;resolution:=optional,
[camel] branch master updated: Upgrade Karaf to version 4.2.6
This is an automated email from the ASF dual-hosted git repository.
jpoth 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 0f386c5 Upgrade Karaf to version 4.2.6
0f386c5 is described below
commit 0f386c561d01c297fba6d3f2f7f192d38f43d1b3
Author: jpoth
AuthorDate: Wed Jun 12 16:17:34 2019 +0200
Upgrade Karaf to version 4.2.6
---
parent/pom.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index feedf52..8c52f26 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,6 +41,7 @@
1.1.3
+[0,2)
5.15.9
2.9.0
@@ -435,7 +436,7 @@
1.1.3_2
2.2.0
2.2.0_1
-4.2.5
+4.2.6
7.22.0.Final
4.1.1
4.1.1
@@ -6054,6 +6055,7 @@
true
+
javax.activation;version="${javax-activation-version-range}"
[camel] branch master updated: CAMEL-13539 Fix influxdb feature
This is an automated email from the ASF dual-hosted git repository.
jpoth 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 18e0907 CAMEL-13539 Fix influxdb feature
18e0907 is described below
commit 18e090707f8953ac357940013f42b4c8a888c109
Author: jpoth
AuthorDate: Wed Jun 5 13:39:33 2019 +0200
CAMEL-13539 Fix influxdb feature
---
platforms/karaf/features/src/main/resources/features.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index f8926f0..5bf83d6 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1340,6 +1340,7 @@
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.influxdb-java/${influx-java-driver-bundle-version}
mvn:com.google.guava/guava/${influx-guava-version}
+mvn:com.google.code.findbugs/jsr305/${google-findbugs-jsr305-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okclient-bundle-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.retrofit/${squareup-retrofit2-bundle-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${squareup-okio-bundle-version}
[camel] 02/02: CAMEL-13539 Upgrade pubnub-gson to 4.23 for retrofit 2.5.0
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 13af109711138a744f7c43e6afd0ee809c9c54df
Author: jpoth
AuthorDate: Fri May 17 14:55:59 2019 +0200
CAMEL-13539 Upgrade pubnub-gson to 4.23 for retrofit 2.5.0
---
components/camel-pubnub/pom.xml | 2 +-
.../java/org/apache/camel/component/pubnub/PubNubOperationsTest.java| 2 +-
parent/pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/camel-pubnub/pom.xml b/components/camel-pubnub/pom.xml
index b87e049..599d735 100644
--- a/components/camel-pubnub/pom.xml
+++ b/components/camel-pubnub/pom.xml
@@ -78,7 +78,7 @@
com.github.tomakehurst
-wiremock
+wiremock-jre8
${wiremock-version}
test
diff --git
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java
index 02ab0e2..eb77303 100644
---
a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java
+++
b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/PubNubOperationsTest.java
@@ -58,7 +58,7 @@ public class PubNubOperationsTest extends PubNubTestBase {
stubFor(get(urlPathEqualTo("/v2/presence/sub_key/mySubscribeKey/channel/myChannel")).willReturn(aResponse()
.withBody("{\"status\" : 200, \"message\" : \"OK\", \"service\" :
\"Presence\", \"uuids\" : [{\"uuid\" : \"myUUID0\"}, {\"state\" : {\"abcd\" :
{\"age\" : 15}}, "
+ "\"uuid\" : \"myUUID1\"}, {\"uuid\" :
\"b9eb408c-bcec-4d34-b4c4-fabec057ad0d\"}, {\"state\" : {\"abcd\" : {\"age\" :
15}}, \"uuid\" : \"myUUID2\"},"
- + " {\"state\" : {\"abcd\" : {\"age\" : 24}}, \"uuid\" :
\"myUUID9\"}], \"occupancy\" : 5} Return Occupancy O")));
+ + " {\"state\" : {\"abcd\" : {\"age\" : 24}}, \"uuid\" :
\"myUUID9\"}], \"occupancy\" : 5}")));
Map headers = new HashMap<>();
headers.put(PubNubConstants.OPERATION, "HERENOW");
PNHereNowResult response =
template.requestBodyAndHeaders("direct:publish", null, headers,
PNHereNowResult.class);
diff --git a/parent/pom.xml b/parent/pom.xml
index 87db5a7..25437f4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -563,7 +563,7 @@
3.1.0
0.5.1
1.8
-4.21.0
+4.23.0
2.3.1
2.3.1_1
7.1.3
[camel] 01/02: CAMEL-13539 Upgrade consul-client to 1.3.3 for retrofit 2.5.0
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 85c0db2ad06aae3811d73923ef59c9186b415fae
Author: jpoth
AuthorDate: Fri May 17 10:43:22 2019 +0200
CAMEL-13539 Upgrade consul-client to 1.3.3 for retrofit 2.5.0
---
parent/pom.xml | 7 +++
platforms/karaf/features/src/main/resources/features.xml | 6 --
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 5d5408c..87db5a7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -156,8 +156,8 @@
2.6.2
1.6
1.0.4
-1.2.5
-1.2.5_1
+1.3.3
+1.3.3_1
2.7
3.3-corda
1.4.13
@@ -656,8 +656,7 @@
2.7.5
2.7.5_1
1.15.0_1
-
1.9.0_1
-
2.4.0_1
+
2.5.0_2
2.0.0
1.19
1.5.21
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index ad7f7f7..7255fed 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -707,12 +707,14 @@
wrap
camel-core
-mvn:com.google.guava/guava/22.0
+mvn:com.google.guava/failureaccess/1.0.1
+mvn:com.google.guava/guava/27.1-jre
+mvn:com.google.code.findbugs/jsr305/${google-findbugs-jsr305-version}
mvn:org.apache.commons/commons-lang3/${commons-lang3-version}
mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}
mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}
mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}
-wrap:mvn:com.fasterxml.jackson.datatype/jackson-datatype-guava/${jackson2-version}$overwrite=mergeImport-Package=com.google.*;version="[22.0,23.0)",*
+wrap:mvn:com.fasterxml.jackson.datatype/jackson-datatype-guava/${jackson2-version}$overwrite=mergeImport-Package=com.google.*;version="[27.1,28.0)",*
mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/${jackson2-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okclient-bundle-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${squareup-okio-bundle-version}
[camel] branch master updated (f535032 -> 13af109)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from f535032 Camel-Spark: Fixed Spring Boot Integration test new 85c0db2 CAMEL-13539 Upgrade consul-client to 1.3.3 for retrofit 2.5.0 new 13af109 CAMEL-13539 Upgrade pubnub-gson to 4.23 for retrofit 2.5.0 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: components/camel-pubnub/pom.xml | 2 +- .../org/apache/camel/component/pubnub/PubNubOperationsTest.java | 2 +- parent/pom.xml | 9 - platforms/karaf/features/src/main/resources/features.xml | 6 -- 4 files changed, 10 insertions(+), 9 deletions(-)
[camel] branch master updated: Fix camel-http4 tests
This is an automated email from the ASF dual-hosted git repository.
jpoth 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 d33d549 Fix camel-http4 tests
d33d549 is described below
commit d33d54947b75852ae0de90aa70aa9706522d94c8
Author: jpoth
AuthorDate: Fri Apr 19 20:02:53 2019 +0200
Fix camel-http4 tests
---
.../component/http4/HttpsSslContextParametersGetTest.java | 10 --
1 file changed, 10 deletions(-)
diff --git
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
index 7e1658b..d565581 100644
---
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
+++
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
@@ -19,8 +19,6 @@ package org.apache.camel.component.http4;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.http4.handler.BasicValidationHandler;
-import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.junit.After;
@@ -55,14 +53,6 @@ public class HttpsSslContextParametersGetTest extends
HttpsGetTest {
localServer.stop();
}
}
-
-@Override
-protected JndiRegistry createRegistry() throws Exception {
-JndiRegistry registry = super.createRegistry();
-registry.bind("sslContextParameters", new SSLContextParameters());
-
-return registry;
-}
@Test
public void httpsGet() throws Exception {
[camel] branch master updated: Fix SSLContextParametersTest
This is an automated email from the ASF dual-hosted git repository.
jpoth 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 1a36a8f Fix SSLContextParametersTest
1a36a8f is described below
commit 1a36a8f243492312c953c526707edcec5276335c
Author: jpoth
AuthorDate: Fri Apr 19 19:33:32 2019 +0200
Fix SSLContextParametersTest
---
.../apache/camel/support/jsse/SSLContextParametersTest.java | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java
index 94365dd..ac5d875 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java
@@ -175,7 +175,7 @@ public class SSLContextParametersTest extends
AbstractJsseParametersTest {
@Test
public void testServerParameters() throws Exception {
-SSLContext controlContext = SSLContext.getInstance("TLS");
+SSLContext controlContext = SSLContext.getInstance("TLSv1.2");
controlContext.init(null, null, null);
SSLEngine controlEngine = controlContext.createSSLEngine();
SSLSocket controlSocket = (SSLSocket)
controlContext.getSocketFactory().createSocket();
@@ -316,7 +316,7 @@ public class SSLContextParametersTest extends
AbstractJsseParametersTest {
@Test
public void testClientParameters() throws Exception {
-SSLContext controlContext = SSLContext.getInstance("TLS");
+SSLContext controlContext = SSLContext.getInstance("TLSv1.2");
controlContext.init(null, null, null);
SSLEngine controlEngine = controlContext.createSSLEngine();
SSLSocket controlSocket = (SSLSocket)
controlContext.getSocketFactory().createSocket();
@@ -440,7 +440,7 @@ public class SSLContextParametersTest extends
AbstractJsseParametersTest {
@Test
public void testCipherSuites() throws Exception {
-SSLContext controlContext = SSLContext.getInstance("TLS");
+SSLContext controlContext = SSLContext.getInstance("TLSv1.2");
controlContext.init(null, null, null);
SSLEngine controlEngine = controlContext.createSSLEngine();
SSLSocket controlSocket = (SSLSocket)
controlContext.getSocketFactory().createSocket();
@@ -508,7 +508,7 @@ public class SSLContextParametersTest extends
AbstractJsseParametersTest {
@Test
public void testCipherSuitesFilter() throws Exception {
-SSLContext controlContext = SSLContext.getInstance("TLS");
+SSLContext controlContext = SSLContext.getInstance("TLSv1.2");
controlContext.init(null, null, null);
SSLEngine controlEngine = controlContext.createSSLEngine();
SSLSocket controlSocket = (SSLSocket)
controlContext.getSocketFactory().createSocket();
@@ -658,7 +658,7 @@ public class SSLContextParametersTest extends
AbstractJsseParametersTest {
@Test
public void testSecureSocketProtocolsFilter() throws Exception {
-SSLContext controlContext = SSLContext.getInstance("TLS");
+SSLContext controlContext = SSLContext.getInstance("TLSv1.2");
controlContext.init(null, null, null);
SSLEngine controlEngine = controlContext.createSSLEngine();
SSLSocket controlSocket = (SSLSocket)
controlContext.getSocketFactory().createSocket();
@@ -759,7 +759,7 @@ public class SSLContextParametersTest extends
AbstractJsseParametersTest {
SSLContext context = scp.createSSLContext(null);
-assertEquals("TLS", context.getProtocol());
+assertEquals("TLSv1.2", context.getProtocol());
SSLEngine engine = context.createSSLEngine();
SSLSocket socket = (SSLSocket)
context.getSocketFactory().createSocket();
[camel] branch master updated: Fix camel-solr tests on JDK11, specify TLSv1.2 protocol versions explicitly, add test for TLS1.3 once we fully move to JDK11
This is an automated email from the ASF dual-hosted git repository.
jpoth 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 0719a94 Fix camel-solr tests on JDK11, specify TLSv1.2 protocol
versions explicitly, add test for TLS1.3 once we fully move to JDK11
0719a94 is described below
commit 0719a9471c1232aa07d73e0fa04ae31bd3876f40
Author: jpoth
AuthorDate: Fri Apr 19 18:37:55 2019 +0200
Fix camel-solr tests on JDK11, specify TLSv1.2 protocol versions
explicitly, add test for TLS1.3 once we fully move to JDK11
---
.../src/test/java/org/apache/camel/component/solr/SolrTestSupport.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTestSupport.java
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTestSupport.java
index 5f30921..ac9f6e7 100644
---
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTestSupport.java
+++
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrTestSupport.java
@@ -30,6 +30,9 @@ public abstract class SolrTestSupport extends
CamelTestSupport {
public static void initPort() throws Exception {
port = AvailablePortFinder.getNextAvailable(8999);
httpsPort = AvailablePortFinder.getNextAvailable(8999);
+//TODO : add test for TLSv1.3
+System.setProperty("jdk.tls.client.protocols", "TLSv1.2");
+System.setProperty("jdk.tls.server.protocols", "TLSv1.2");
}
protected static int getPort() {
[camel] branch master updated (433d04e -> a73f258)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 433d04e Regen new 1577fc2 Fix camel-ftp tests on JDK11, specify SSL and TLS protocol versions explicitly, default should be set to TLS1.3 once we fully move to JDK11 new 5d2d618 Fix camel-http4 tests on JDK11, specify SSL and TLS protocol versions explicitly, default should be set to TLS1.3 once we fully move to JDK11 new a73f258 Fix camel-jetty tests on JDK11, specify TLSv1.2 protocol versions explicitly, add test for TLS1.3 once we fully move to JDK11 The 36693 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-ftp/src/main/docs/ftps-component.adoc| 2 +- .../component/file/remote/FtpsConfiguration.java | 5 +++-- ...LWithClientAuthAndSSLContextParametersTest.java | 2 +- .../FileToFtpsExplicitSSLWithClientAuthTest.java | 2 +- ...lientAuthAndGlobalSSLContextParametersTest.java | 2 +- ...thoutClientAuthAndSSLContextParametersTest.java | 2 +- ...FileToFtpsExplicitSSLWithoutClientAuthTest.java | 2 +- ...SWithClientAuthAndSSLContextParametersTest.java | 2 +- .../FileToFtpsExplicitTLSWithClientAuthTest.java | 2 +- ...thoutClientAuthAndSSLContextParametersTest.java | 2 +- ...FileToFtpsExplicitTLSWithoutClientAuthTest.java | 2 +- ...LWithClientAuthAndSSLContextParametersTest.java | 2 +- .../FileToFtpsImplicitSSLWithClientAuthTest.java | 2 +- ...thoutClientAuthAndSSLContextParametersTest.java | 2 +- ...FileToFtpsImplicitSSLWithoutClientAuthTest.java | 2 +- ...SWithClientAuthAndSSLContextParametersTest.java | 2 +- .../FileToFtpsImplicitTLSWithClientAuthTest.java | 2 +- ...thoutClientAuthAndSSLContextParametersTest.java | 2 +- ...FileToFtpsImplicitTLSWithoutClientAuthTest.java | 2 +- ...psWithCustomKeyAndTrustStorePropertiesTest.java | 2 +- ...leToFtpsWithCustomTrustStorePropertiesTest.java | 2 +- .../FileToFtpsWithFtpClientConfigRefTest.java | 4 ++-- .../file/remote/FtpsServerTestSupport.java | 4 ++-- .../file/remote/UriConfigurationTest.java | 4 ++-- .../component/http4/HttpsAuthenticationTest.java | 4 +++- .../apache/camel/component/http4/HttpsGetTest.java | 6 +- .../component/http4/HttpsServerTestSupport.java| 3 ++- .../camel/component/jetty/BaseJettyTest.java | 2 ++ .../camel/component/jetty/HttpsAsyncRouteTest.java | 24 +- .../jetty/HttpsRouteSetupWithSystemPropsTest.java | 1 + .../camel/component/jetty/HttpsRouteTest.java | 24 +- .../apache/camel/component/jetty/jetty-https.xml | 5 + .../camel/support/jsse/SSLContextParameters.java | 5 +++-- .../springboot/KafkaComponentConfiguration.java| 4 +++- 34 files changed, 86 insertions(+), 49 deletions(-)
[camel] branch master updated (135259f -> ee81d5a)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 135259f Regen new e204c88 Fix Spring Boot itests on JDK11 new ee81d5a Enable camel-grape on JDK9+ The 36647 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: components/camel-grape/pom.xml | 28 -- .../src/test/resources/application-pom-sb2.xml | 10 2 files changed, 10 insertions(+), 28 deletions(-)
[camel] branch master updated: Fix camel-restdsl-swagger-plugin integration-tests on JDK-11 when forked
This is an automated email from the ASF dual-hosted git repository. jpoth 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 88da6e8 Fix camel-restdsl-swagger-plugin integration-tests on JDK-11 when forked 88da6e8 is described below commit 88da6e81703610224cf51db18520f39436a91439 Author: jpoth AuthorDate: Wed Apr 17 12:05:36 2019 +0200 Fix camel-restdsl-swagger-plugin integration-tests on JDK-11 when forked --- .../src/it/simple-xml-dto/pom.xml | 31 ++ .../src/it/simple-xml/pom.xml | 31 ++ 2 files changed, 62 insertions(+) diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml index caa91a4..2e0d4f6 100644 --- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml +++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml @@ -87,4 +87,35 @@ + + + jdk9+-build + +[9,) + + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + jakarta.xml.bind + jakarta.xml.bind-api + @jakarta-jaxb-version@ + + + org.glassfish.jaxb + jaxb-runtime + @glassfish-jaxb-runtime-version@ + + + + + + + + diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml index 7b1c657..4f2c915 100644 --- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml +++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml @@ -54,4 +54,35 @@ + + + jdk9+-build + +[9,) + + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + jakarta.xml.bind + jakarta.xml.bind-api + @jakarta-jaxb-version@ + + + org.glassfish.jaxb + jaxb-runtime + @glassfish-jaxb-runtime-version@ + + + + + + + +
[camel] branch master updated: Fix camel-soap osgi JDK11
This is an automated email from the ASF dual-hosted git repository. jpoth 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 c41bac1 Fix camel-soap osgi JDK11 c41bac1 is described below commit c41bac117768a8a093e5d94362403b2d94feeeb5 Author: jpoth AuthorDate: Tue Apr 16 18:19:53 2019 +0200 Fix camel-soap osgi JDK11 --- components/camel-soap/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml index 3e4ac83..083c514 100644 --- a/components/camel-soap/pom.xml +++ b/components/camel-soap/pom.xml @@ -34,7 +34,7 @@ -javax.xml.ws;version="[0.0,3)", +javax.xml.ws*;version="[0.0,3)", javax.xml.soap*;version="[1.3,2)"
[camel] branch master updated: Fix camel-soap and camel-spring-ws on JDK11
This is an automated email from the ASF dual-hosted git repository.
jpoth 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 5eab3fe Fix camel-soap and camel-spring-ws on JDK11
5eab3fe is described below
commit 5eab3febf3ca56369dfb2a5c9193b37ee94dfebd
Author: jpoth
AuthorDate: Tue Apr 16 14:34:50 2019 +0200
Fix camel-soap and camel-spring-ws on JDK11
---
components/camel-soap/pom.xml | 5 -
components/camel-spring-ws/pom.xml | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index 7e64889..3e4ac83 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -33,7 +33,10 @@
Camel SOAP support
-
javax.xml.ws;version="[0.0,3)"
+
+javax.xml.ws;version="[0.0,3)",
+javax.xml.soap*;version="[1.3,2)"
+
diff --git a/components/camel-spring-ws/pom.xml
b/components/camel-spring-ws/pom.xml
index 088cbea..5974c5b 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -38,7 +38,8 @@
org.springframework.beans.*;version="${spring-version-range}",
org.springframework.util.*;version="${spring-version-range}",
org.springframework.ws.*;version="[3,4)",
-org.springframework.xml.*;version="[3,4)"
+org.springframework.xml.*;version="[3,4)",
+javax.xml.soap*;version="[1.3,2)"
[camel] branch master updated: Fix karaf features on JDK-11
This is an automated email from the ASF dual-hosted git repository.
jpoth 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 b8672d5 Fix karaf features on JDK-11
b8672d5 is described below
commit b8672d55a27bb50674d3ac957a45a29f0a42f791
Author: jpoth
AuthorDate: Tue Apr 16 13:08:20 2019 +0200
Fix karaf features on JDK-11
---
components/camel-cxf/pom.xml | 1 +
parent/pom.xml | 5 +-
platforms/karaf/features/pom.xml | 6 +-
.../features/src/main/resources/config.properties | 571 -
.../karaf/features/src/main/resources/features.xml | 6 +-
5 files changed, 10 insertions(+), 579 deletions(-)
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 453e8ba..528d41a 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -49,6 +49,7 @@
javax.activation*;version="[0.0,2)",
javax.jws*;version="[0.0,3)",
javax.ws.rs*;version="[0.0,3)",
+javax.xml.soap*;version="[1.3,2)",
javax.xml.stream*;version="[0.0,2)",
javax.xml.ws*;version="[0.0,3.0)",
org.apache.camel.*;${camel.osgi.import.camel.version},
diff --git a/parent/pom.xml b/parent/pom.xml
index 7cb0485..c5f2954 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -343,11 +343,12 @@
3.0.0
3.0.1-b04
3.0.1-b10
+1.3.2
1_2
1.6.1
3.1.0
2.1.1
-2.2.11_1
+2.3.1_1
2.3.2
${jakarta-jaxb-version}
${jakarta-jaxb-version}
@@ -6025,7 +6026,7 @@
javax.annotation
javax.annotation-api
-1.3.2
+${javax-annotation-api-version}
javax.xml.ws
diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml
index 853e31d..c11d90e 100644
--- a/platforms/karaf/features/pom.xml
+++ b/platforms/karaf/features/pom.xml
@@ -127,16 +127,14 @@
mvn:org.apache.karaf.features/spring/${karaf4-version}/xml/features
org.apache.karaf.features:framework
-1.8
+9
framework
-
camel|camel-(?!(ignite|nats|pgevent|script-groovy|spring-redis|spring-security))*
-
+
camel|camel-(?!(ignite|nats|pgevent|script-groovy|spring-redis|spring-security|cdi))*
-
file://${project.build.directory}/classes/config.properties
diff --git a/platforms/karaf/features/src/main/resources/config.properties
b/platforms/karaf/features/src/main/resources/config.properties
deleted file mode 100644
index c55b32c..000
--- a/platforms/karaf/features/src/main/resources/config.properties
+++ /dev/null
@@ -1,571 +0,0 @@
-## ---
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---
-
-#
-# Framework config properties.
-#
-org.osgi.framework.system.packages= \
- org.osgi.dto;version="1.0",\
- org.osgi.resource;version="1.0",\
- org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",\
- org.osgi.framework;version="1.8",\
- org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto",\
- org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",\
-
org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",\
- org.osgi.framework.hooks.service;version="1.1";uses:="org.
[camel] branch master updated (d42fe3e -> d2e06d6)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from d42fe3e Upgrade Zipkin to version 2.12.9 new 5092fe3 Fix Spring Boot itests on JDK11 new d2e06d6 Fix cs The 36609 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: .../arquillian/ArquillianSyncBootJarLauncher.java | 50 +++--- .../container/ManagedSEDeployableContainer.java| 12 ++ .../itest/springboot/util/ArquillianPackager.java | 4 +- .../src/test/resources/application-pom-sb2.xml | 16 ++- 4 files changed, 73 insertions(+), 9 deletions(-)
[camel] branch master updated (acc95a4 -> d8a16b2)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from acc95a4 Remove single arg constructor from the template as there is no in DefaultEndpoint new aa8ec2b Fix camel-blueprint build on JDK11 new 85c2fa2 Upgrade aries SPI-FLY JDK11 support new 3523fb0 Fix camel-test-karaf on JDK 11 new d8a16b2 Generate JAXB episode file on JDK 11 The 36557 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: components/camel-blueprint/pom.xml | 18 +++--- components/camel-spring/pom.xml| 10 +- .../camel/test/karaf/AbstractFeatureTest.java | 41 -- parent/pom.xml | 2 +- 4 files changed, 61 insertions(+), 10 deletions(-)
[camel] branch master updated: Fix build on JDK11
This is an automated email from the ASF dual-hosted git repository. jpoth 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 f6735fa Fix build on JDK11 f6735fa is described below commit f6735fa963e31528ab251e814d523024ce16f078 Author: jpoth AuthorDate: Tue Apr 9 11:48:29 2019 +0200 Fix build on JDK11 --- parent/pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/parent/pom.xml b/parent/pom.xml index 19a4145..011f138 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -6014,6 +6014,11 @@ javax.xml.soap javax.xml.soap-api + + +org.jvnet.staxex +stax-ex +
