buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/35186 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/35184 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel] 05/13: Upgrade cxf codegen plugin
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch CAMEL-13678 in repository https://gitbox.apache.org/repos/asf/camel.git commit 78758475f0207c5b22002a352e266c95308cf959 Author: Claus Ibsen AuthorDate: Mon Jul 8 09:57:00 2019 +0200 Upgrade cxf codegen plugin --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index b93c357..b44633c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -165,8 +165,8 @@ 1.4.13_1 2.12.0 3.3.2 -[3.1,4.0) -3.3.1 +[3.3,4.0) +3.3.2 3.2.0 3.2.0 1.9.0
[camel] 08/13: CAMEL-13678: Move attachments out of camel-core into camel-attachments.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13678
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 44f3e23187c42db4706ebfb21a80ea9e470b959f
Author: Claus Ibsen
AuthorDate: Mon Jul 8 10:26:30 2019 +0200
CAMEL-13678: Move attachments out of camel-core into camel-attachments.
---
.../camel/component/spring/ws/SpringWebserviceConsumer.java| 2 +-
.../camel/component/spring/ws/SpringWebserviceMessage.java | 1 +
.../camel/component/spring/ws/SpringWebserviceProducer.java| 2 +-
.../spring/ws/filter/impl/BasicMessageFilterTest.java | 10 +++---
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java
index 394638e..23e680e 100644
---
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java
+++
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java
@@ -124,9 +124,9 @@ public class SpringWebserviceConsumer extends
DefaultConsumer implements Message
// create inbound message
WebServiceMessage request = messageContext.getRequest();
SpringWebserviceMessage inMessage = new
SpringWebserviceMessage(exchange.getContext(), request);
+exchange.setIn(inMessage);
extractSourceFromSoapHeader(inMessage.getHeaders(), request);
extractAttachmentsFromRequest(request, new
DefaultAttachmentMessage(inMessage));
-exchange.setIn(inMessage);
}
private void
populateExchangeWithPropertiesFromMessageContext(MessageContext messageContext,
diff --git
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceMessage.java
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceMessage.java
index 6101345..143e8d8 100644
---
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceMessage.java
+++
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceMessage.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.spring.ws;
import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultMessage;
import org.springframework.ws.WebServiceMessage;
diff --git
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
index d389d8e..eef3a0e 100644
---
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
+++
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
@@ -146,7 +146,7 @@ public class SpringWebserviceProducer extends
DefaultProducer {
private void populateMessageAttachmentsFromResponse(AttachmentMessage
inOrOut, Iterator attachments) {
while (attachments.hasNext()) {
Attachment attachment = attachments.next();
-inOrOut.getAttachments().put(attachment.getContentId(),
attachment.getDataHandler());
+inOrOut.addAttachment(attachment.getContentId(),
attachment.getDataHandler());
}
}
diff --git
a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java
b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java
index 2e89afe..2b81508 100644
---
a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java
+++
b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java
@@ -71,8 +71,12 @@ public class BasicMessageFilterTest extends
ExchangeTestSupport {
exchange.getIn().getHeaders().clear();
exchange.getOut().getHeaders().clear();
-exchange.getIn(AttachmentMessage.class).getAttachments().clear();
-exchange.getOut(AttachmentMessage.class).getAttachments().clear();
+if (exchange.getIn(AttachmentMessage.class).hasAttachments()) {
+exchange.getIn(AttachmentMessage.class).getAttachments().clear();
+}
+if (exchange.getOut(AttachmentMessage.class).hasAttachments()) {
+exchange.getOut(AttachmentMessage.class).getAttachments().clear();
+}
filter.filterProducer(exchange, message);
filter.filterConsumer(exchange, message);
@@ -153,7 +157,7 @@ public class BasicMessageFilterTest extends
ExchangeTestSupport {
[camel] 01/13: CAMEL-13678: Move attachments out of camel-core into camel-attachments.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13678
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3829daea8d627a93c54c4031624c1713e23708dc
Author: Claus Ibsen
AuthorDate: Sun Jul 7 20:08:07 2019 +0200
CAMEL-13678: Move attachments out of camel-core into camel-attachments.
---
components/camel-attachments/pom.xml | 86 +++
.../org/apache/camel/attachment}/Attachment.java | 7 +-
.../camel/attachment}/AttachmentConverter.java | 13 +-
.../apache/camel/attachment}/AttachmentMap.java| 4 +-
.../apache/camel/attachment/AttachmentMessage.java | 111
.../camel/attachment}/DefaultAttachment.java | 3 +-
.../camel/attachment/DefaultAttachmentMessage.java | 279 +
.../camel-attachments/src/test/data/message1.xml | 24 ++
.../camel-attachments/src/test/data/message2.xml | 24 ++
.../attachment/BeanMethodWithExchangeTest.java | 67 +
.../BeanWithAttachmentAnnotationTest.java | 47 ++--
.../attachment}/BodyAndHeaderConvertTest.java | 24 +-
.../MessageWithAttachmentRedeliveryIssueTest.java | 20 +-
.../src/test/resources/log4j2.properties | 28 +++
.../src/main/java/org/apache/camel/Message.java| 97 +--
.../processor/ClaimCheckAggregationStrategy.java | 33 ---
.../java/org/apache/camel/processor/Splitter.java | 6 +-
.../org/apache/camel/builder/ExpressionClause.java | 7 -
.../camel/builder/ExpressionClauseSupport.java | 7 -
.../apache/camel/builder/ExpressionClauseTest.java | 92 ---
.../component/bean/BeanMethodWithExchangeTest.java | 77 --
.../org/apache/camel/processor/PipelineTest.java | 41 ---
.../apache/camel/support/DefaultMessageTest.java | 40 ---
.../org/apache/camel/support/DefaultExchange.java | 4 -
.../org/apache/camel/support/DefaultMessage.java | 108
.../org/apache/camel/support/MessageSupport.java | 22 --
.../camel/support/builder/ExpressionBuilder.java | 72 --
.../maven/packaging/SpringBootStarterMojo.java | 1 +
28 files changed, 683 insertions(+), 661 deletions(-)
diff --git a/components/camel-attachments/pom.xml
b/components/camel-attachments/pom.xml
new file mode 100644
index 000..4f8151e
--- /dev/null
+++ b/components/camel-attachments/pom.xml
@@ -0,0 +1,86 @@
+
+
+http://www.w3.org/2001/XMLSchema-instance;
xmlns="http://maven.apache.org/POM/4.0.0;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+
+org.apache.camel
+components
+3.0.0-SNAPSHOT
+
+
+camel-attachments
+jar
+
+Camel :: Attachments
+Java Attachments support for Camel Message
+
+
+3.0.0
+core
+
+
+
+
+
+org.apache.camel
+camel-support
+${project.version}
+
+
+
+
+com.sun.activation
+javax.activation
+1.2.0
+
+
+
+
+
+org.apache.camel
+camel-test
+test
+
+
+
+junit
+junit
+test
+
+
+org.apache.logging.log4j
+log4j-api
+test
+
+
+org.apache.logging.log4j
+log4j-core
+test
+
+
+org.apache.logging.log4j
+log4j-slf4j-impl
+test
+
+
+
+
diff --git a/core/camel-api/src/main/java/org/apache/camel/Attachment.java
b/components/camel-attachments/src/main/java/org/apache/camel/attachment/Attachment.java
similarity index 95%
rename from core/camel-api/src/main/java/org/apache/camel/Attachment.java
rename to
components/camel-attachments/src/main/java/org/apache/camel/attachment/Attachment.java
index fb9ff3f..9ad220a 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Attachment.java
+++
b/components/camel-attachments/src/main/java/org/apache/camel/attachment/Attachment.java
@@ -14,17 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel;
+package org.apache.camel.attachment;
import java.util.Collection;
import java.util.List;
import javax.activation.DataHandler;
+import org.apache.camel.Message;
+
/**
* Represents an attachment as part of a {@link Message}.
*/
public interface Attachment {
+
+// TODO: Move this to camel-attachment
+
/**
* Return a DataHandler for the content within this attachment.
*
diff --git
a/core/camel-base/src/main/java/org/apache/camel/converter/AttachmentConverter.java
b/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentConverter.java
similarity index 84%
rename from
[camel] 13/13: CAMEL-13678: Move attachments out of camel-core into camel-attachments.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13678
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bd2ea04533bafac786eeff945b4e26c2658551af
Author: Claus Ibsen
AuthorDate: Mon Jul 8 18:35:31 2019 +0200
CAMEL-13678: Move attachments out of camel-core into camel-attachments.
---
parent/pom.xml | 5 -
1 file changed, 5 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index a895302..9c4a97e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -6174,11 +6174,6 @@
${jakarta-jaxb-version}
-com.sun.activation
-javax.activation
-${javax.activation-version}
-
-
org.apache.geronimo.specs
geronimo-ws-metadata_2.0_spec
${geronimo-ws-metadata-spec-version}
[camel] 10/13: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13678
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9f6b9de2ee62028ffc7e3e28c2aee0fa0116426d
Author: Claus Ibsen
AuthorDate: Mon Jul 8 11:50:41 2019 +0200
Regen
---
components/camel-mail/src/main/docs/mail-component.adoc | 2 +-
components/readme.adoc | 4 ++--
docs/components/modules/ROOT/pages/mail-component.adoc | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/components/camel-mail/src/main/docs/mail-component.adoc
b/components/camel-mail/src/main/docs/mail-component.adoc
index 664a379..68dccfc 100644
--- a/components/camel-mail/src/main/docs/mail-component.adoc
+++ b/components/camel-mail/src/main/docs/mail-component.adoc
@@ -246,7 +246,7 @@ The component supports 49 options, which are listed below.
| *camel.component.mail.configuration.ignore-uri-scheme* | Option to let Camel
ignore unsupported charset in the local JVM when sending mails. If the charset
is unsupported then charset=XXX (where XXX represents the unsupported charset)
is removed from the content-type and it relies on the platform default instead.
| false | Boolean
| *camel.component.mail.configuration.java-mail-properties* | Sets the java
mail options. Will clear any default properties and only use the properties
provided for this method. | | Properties
| *camel.component.mail.configuration.java-mail-sender* | To use a custom
{@link org.apache.camel.component.mail.JavaMailSender} for sending emails. | |
JavaMailSender
-| *camel.component.mail.configuration.map-mail-message* | Specifies whether
Camel should map the received mail message to Camel body/headers. If set to
true, the body of the mail message is mapped to the body of the Camel IN
message and the mail headers are mapped to IN headers. If this option is set to
false then the IN message contains a raw javax.mail.Message. You can retrieve
this raw message by calling exchange.getIn().getBody(javax.mail.Message.class).
| true | Boolean
+| *camel.component.mail.configuration.map-mail-message* | Specifies whether
Camel should map the received mail message to Camel body/headers/attachments.
If set to true, the body of the mail message is mapped to the body of the Camel
IN message, the mail headers are mapped to IN headers, and the attachments to
Camel IN attachment message. If this option is set to false then the IN message
contains a raw javax.mail.Message. You can retrieve this raw message by calling
exchange.getIn().get [...]
| *camel.component.mail.configuration.mime-decode-headers* | This option
enables transparent MIME decoding and unfolding for mail headers. | false |
Boolean
| *camel.component.mail.configuration.password* | The password for login | |
String
| *camel.component.mail.configuration.peek* | Will mark the javax.mail.Message
as peeked before processing the mail message. This applies to IMAPMessage
messages types only. By using peek the mail will not be eager marked as SEEN on
the mail server, which allows us to rollback the mail message if there is an
error processing in Camel. | true | Boolean
diff --git a/components/readme.adoc b/components/readme.adoc
index b21c547..323f7a3 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -202,10 +202,10 @@ Number of Components: 297 in 234 JAR artifacts (0
deprecated)
| link:camel-crypto-cms/src/main/docs/crypto-cms-component.adoc[Crypto CMS]
(camel-crypto-cms) +
`crypto-cms:cryptoOperation:name` | 2.20 | The crypto cms component is used
for encrypting data in CMS Enveloped Data format, decrypting CMS Enveloped
Data, signing data in CMS Signed Data format, and verifying CMS Signed Data.
-| link:@@@ARTIFACTID@@@/src/main/docs/cxf-component.adoc[CXF]
(@@@ARTIFACTID@@@) +
+| link:camel-cxf/src/main/docs/cxf-component.adoc[CXF] (camel-cxf) +
`cxf:beanId:address` | 1.0 | The cxf component is used for SOAP WebServices
using Apache CXF.
-| link:@@@ARTIFACTID@@@/src/main/docs/cxfrs-component.adoc[CXF-RS]
(@@@ARTIFACTID@@@) +
+| link:camel-cxf/src/main/docs/cxfrs-component.adoc[CXF-RS] (camel-cxf) +
`cxfrs:beanId:address` | 2.0 | The cxfrs component is used for JAX-RS REST
services using Apache CXF.
| link:camel-dataformat/src/main/docs/dataformat-component.adoc[Data Format]
(camel-dataformat) +
diff --git a/docs/components/modules/ROOT/pages/mail-component.adoc
b/docs/components/modules/ROOT/pages/mail-component.adoc
index 792df33..68dccfc 100644
--- a/docs/components/modules/ROOT/pages/mail-component.adoc
+++ b/docs/components/modules/ROOT/pages/mail-component.adoc
@@ -153,7 +153,7 @@ with the following path and query parameters:
| *fetchSize* (consumer) | Sets the maximum number of messages to consume
during a poll. This can be used to avoid overloading a mail server, if a
mailbox folder contains a lot of messages. Default value of -1 means no fetch
size and all
[camel] 11/13: CAMEL-13678: Move attachments out of camel-core into camel-attachments.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13678
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c557c4ffbdb44e7d7d6f3b3c10e6f380ce8ec9e9
Author: Claus Ibsen
AuthorDate: Mon Jul 8 15:49:43 2019 +0200
CAMEL-13678: Move attachments out of camel-core into camel-attachments.
---
components/camel-atmosphere-websocket/pom.xml| 1 +
components/camel-attachments/pom.xml | 6 --
components/camel-cxf/pom.xml | 3 ++-
components/camel-http-common/pom.xml | 2 +-
components/camel-jetty/pom.xml | 3 ++-
components/camel-mail/pom.xml| 3 +++
components/camel-servlet/pom.xml | 1 +
components/camel-spring-ws/pom.xml | 1 +
components/camel-undertow/pom.xml| 3 +++
parent/pom.xml | 3 ++-
platforms/karaf/features/src/main/resources/features.xml | 10 ++
11 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/components/camel-atmosphere-websocket/pom.xml
b/components/camel-atmosphere-websocket/pom.xml
index f22db11..3fa4468 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -36,6 +36,7 @@
!org.apache.camel.component.atmosphere.websocket.*,
+javax.activation.*;version="${javax-activation-version-range}",
javax.servlet.*;version="${servlet-version-range}",
org.atmosphere.*;version="${atmosphere-version-range}",
org.apache.catalina;resolution:=optional,
diff --git a/components/camel-attachments/pom.xml
b/components/camel-attachments/pom.xml
index 4f8151e..4a9be30 100644
--- a/components/camel-attachments/pom.xml
+++ b/components/camel-attachments/pom.xml
@@ -34,6 +34,9 @@
Java Attachments support for Camel Message
+
+javax.activation.*;version="${javax-activation-version-range}"
+
3.0.0
core
@@ -50,8 +53,7 @@
com.sun.activation
javax.activation
-1.2.0
-
+${javax-activation-version}
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index e636a86..fe5d008 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -47,7 +47,7 @@
!org.apache.camel.component.cxf.spring,
!org.apache.camel.component.cxf.util,
!org.apache.camel.blueprint,
-javax.activation*;version="[0.0,2)",
+javax.activation.*;version="${javax-activation-version-range}",
javax.jws*;version="[0.0,3)",
javax.ws.rs*;version="[0.0,3)",
javax.xml.soap*;version="[1.3,2)",
@@ -68,6 +68,7 @@
*
true
+
diff --git a/components/camel-http-common/pom.xml
b/components/camel-http-common/pom.xml
index 0e08ff4..430f1e8 100644
--- a/components/camel-http-common/pom.xml
+++ b/components/camel-http-common/pom.xml
@@ -35,13 +35,13 @@
+javax.activation.*;version="${javax-activation-version-range}",
javax.servlet.*;version="${servlet-version-range}"
-
org.apache.camel
camel-cloud
diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml
index e23dc21..f5c7c09 100644
--- a/components/camel-jetty/pom.xml
+++ b/components/camel-jetty/pom.xml
@@ -35,7 +35,8 @@
-org.eclipse.jetty.*;version="[9.3,10)",
+org.eclipse.jetty.*;version="[9.4,10)",
+javax.activation.*;version="${javax-activation-version-range}",
javax.servlet.*;version="${servlet-version-range}"
diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml
index 253350b..152c288 100644
--- a/components/camel-mail/pom.xml
+++ b/components/camel-mail/pom.xml
@@ -33,6 +33,9 @@
Camel Mail support
+
+javax.activation.*;version="${javax-activation-version-range}"
+
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index 53f12d7..2f030aa 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -35,6 +35,7 @@
+javax.activation.*;version="${javax-activation-version-range}",
javax.servlet.*;version="${servlet-version-range}"
diff --git a/components/camel-spring-ws/pom.xml
b/components/camel-spring-ws/pom.xml
index af8adb9..2fc2800 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -39,6 +39,7 @@
[camel] 12/13: CAMEL-13678: Move attachments out of camel-core into camel-attachments.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13678
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e0c7168a08c306f8c8c8731ce57f76e2a197533e
Author: Claus Ibsen
AuthorDate: Mon Jul 8 16:04:30 2019 +0200
CAMEL-13678: Move attachments out of camel-core into camel-attachments.
---
.../org/apache/camel/attachment/AttachmentMap.java | 141 -
.../camel/attachment/DefaultAttachmentMessage.java | 8 +-
parent/pom.xml | 5 +-
3 files changed, 7 insertions(+), 147 deletions(-)
diff --git
a/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentMap.java
b/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentMap.java
deleted file mode 100644
index 121b50a..000
---
a/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentMap.java
+++ /dev/null
@@ -1,141 +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.attachment;
-
-import java.util.AbstractMap;
-import java.util.AbstractSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import javax.activation.DataHandler;
-
-// TODO: Use this map?
-
-/**
- * The AttachmentMap class provides a transparent Map
- * interface for a Map
- */
-public class AttachmentMap extends AbstractMap {
-private Map map;
-
-public AttachmentMap(Map backingMap) {
-this.map = backingMap;
-}
-
-@Override
-public DataHandler put(String key, DataHandler value) {
-Attachment old = map.put(key, new DefaultAttachment(value));
-if (old == null) {
-return null;
-} else {
-return old.getDataHandler();
-}
-}
-
-@Override
-public Set> entrySet() {
-return new AttachmentEntrySet(map.entrySet());
-}
-
-public Map getOriginalMap() {
-return map;
-}
-
-private static class AttachmentEntrySet extends
AbstractSet> {
-private Set> set;
-
-AttachmentEntrySet(Set> set) {
-this.set = set;
-}
-
-@Override
-public int size() {
-return set.size();
-}
-
-@Override
-public Iterator> iterator() {
-return new AttachmentEntrySetIterator(set.iterator());
-}
-}
-
-private static class AttachmentEntrySetIterator implements
Iterator> {
-private Iterator> iter;
-
-AttachmentEntrySetIterator(Iterator>
origIterator) {
-iter = origIterator;
-}
-
-@Override
-public boolean hasNext() {
-return iter.hasNext();
-}
-
-@Override
-public Map.Entry next() {
-return new AttachmentEntry(iter.next());
-}
-
-public void remove() {
-iter.remove();
-}
-}
-
-private static class AttachmentEntry implements Map.Entry {
-private Map.Entry entry;
-
-AttachmentEntry(Map.Entry backingEntry) {
-this.entry = backingEntry;
-}
-
-@Override
-public String getKey() {
-return entry.getKey();
-}
-
-@Override
-public DataHandler getValue() {
-Attachment value = entry.getValue();
-if (value != null) {
-return value.getDataHandler();
-}
-return null;
-}
-
-@Override
-public DataHandler setValue(DataHandler value) {
-Attachment oldValue = entry.setValue(new DefaultAttachment(value));
-if (oldValue != null) {
-return oldValue.getDataHandler();
-}
-return null;
-}
-
-// two AttachmentEntry objects are equal if the backing entries are
equal
-public boolean equals(Object o) {
-if (o instanceof AttachmentEntry &&
entry.equals(((AttachmentEntry)o).entry)) {
-return true;
-}
-return false;
-}
-
-public int hashCode() {
-return entry.hashCode();
-}
-}
-}
diff --git
[camel] 07/13: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch CAMEL-13678 in repository https://gitbox.apache.org/repos/asf/camel.git commit f83fcd205daa335fbafa7b04dcb32aa44dd9e9d1 Author: Claus Ibsen AuthorDate: Mon Jul 8 10:07:04 2019 +0200 Regen --- .../camel-rest-swagger/src/main/docs/rest-swagger-component.adoc | 2 +- components/readme.adoc| 8 +--- docs/components/modules/ROOT/pages/rest-swagger-component.adoc| 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc b/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc index 96d2b8f..0001a2e 100644 --- a/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc +++ b/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc @@ -171,7 +171,7 @@ The component supports 11 options, which are listed below. | *camel.component.rest-swagger.host* | Scheme hostname and port to direct the HTTP requests to in the form of https://hostname:port. Can be configured at the endpoint, component or in the correspoding REST configuration in the Camel Context. If you give this component a name (e.g. petstore) that REST configuration is consulted first, rest-swagger next, and global configuration last. If set overrides any value found in the Swagger specification, RestConfiguration. Can be overridden in en [...] | *camel.component.rest-swagger.produces* | What payload type this component is producing. For example application/json according to the RFC7231. This equates to the value of Content-Type HTTP header. If set overrides any value present in the Swagger specification. Can be overridden in endpoint configuration. | | String | *camel.component.rest-swagger.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean -| *camel.component.rest-swagger.specification-uri* | Path to the Swagger specification file. The scheme, host base path are taken from this specification, but these can be overriden with properties on the component or endpoint level. If not given the component tries to load swagger.json resource. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. \https://api.example.com:8080). Can [...] +| *camel.component.rest-swagger.specification-uri* | Path to the Swagger specification file. The scheme, host base path are taken from this specification, but these can be overriden with properties on the component or endpoint level. If not given the component tries to load swagger.json resource. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. https://api.example.com:8080). Can [...] | *camel.component.rest-swagger.ssl-context-parameters* | Customize TLS parameters used by the component. If not set defaults to the TLS parameters set in the Camel context. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String | *camel.component.rest-swagger.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean |=== diff --git a/components/readme.adoc b/components/readme.adoc index 037831b..b21c547 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -202,10 +202,10 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated) | link:camel-crypto-cms/src/main/docs/crypto-cms-component.adoc[Crypto CMS] (camel-crypto-cms) + `crypto-cms:cryptoOperation:name` | 2.20 | The crypto cms component is used for encrypting data in CMS Enveloped Data format, decrypting CMS Enveloped Data, signing data in CMS Signed Data format, and verifying CMS Signed Data. -| link:camel-cxf/src/main/docs/cxf-component.adoc[CXF] (camel-cxf) + +| link:@@@ARTIFACTID@@@/src/main/docs/cxf-component.adoc[CXF] (@@@ARTIFACTID@@@) + `cxf:beanId:address` | 1.0 | The cxf component is used for SOAP WebServices using Apache CXF. -| link:camel-cxf/src/main/docs/cxfrs-component.adoc[CXF-RS] (camel-cxf) + +| link:@@@ARTIFACTID@@@/src/main/docs/cxfrs-component.adoc[CXF-RS] (@@@ARTIFACTID@@@) + `cxfrs:beanId:address` | 2.0 | The cxfrs component is used for JAX-RS REST services using Apache CXF. | link:camel-dataformat/src/main/docs/dataformat-component.adoc[Data Format] (camel-dataformat) + @@ -1053,12 +1053,14 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated) Miscellaneous Components // others: START -Number of Miscellaneous Components: 32 in 32 JAR artifacts (0 deprecated) +Number of Miscellaneous Components: 33 in 33 JAR artifacts (0 deprecated)
[camel] 06/13: CAMEL-13678: Move attachments out of camel-core into camel-attachments.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13678
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cd24c6f60e4bc3f09f40e942522cb318fadd5c26
Author: Claus Ibsen
AuthorDate: Mon Jul 8 09:57:22 2019 +0200
CAMEL-13678: Move attachments out of camel-core into camel-attachments.
---
apache-camel/pom.xml | 5 +
apache-camel/src/main/descriptors/common-bin.xml | 1 +
.../java/org/apache/camel/component/cxf/DefaultCxfBinding.java | 2 +-
parent/pom.xml | 10 +-
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 5 +
5 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 09bb095..c31cebe 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -174,6 +174,11 @@
org.apache.camel
+ camel-attachments
+ ${project.version}
+
+
+ org.apache.camel
camel-avro
${project.version}
diff --git a/apache-camel/src/main/descriptors/common-bin.xml
b/apache-camel/src/main/descriptors/common-bin.xml
index 3618211..632e829 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -55,6 +55,7 @@
org.apache.camel:camel-atmosphere-websocket
org.apache.camel:camel-atom
org.apache.camel:camel-atomix
+org.apache.camel:camel-attachments
org.apache.camel:camel-avro
org.apache.camel:camel-aws-cw
org.apache.camel:camel-aws-ddb
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
index 2c1e632..9430b55 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
@@ -413,7 +413,7 @@ public class DefaultCxfBinding implements CxfBinding,
HeaderFilterStrategyAware
// propagate attachments
Set attachments = null;
boolean isXop =
Boolean.valueOf(camelExchange.getProperty(Message.MTOM_ENABLED, String.class));
-if (camelExchange.getOut(AttachmentMessage.class).hasAttachments()) {
+if (camelExchange.hasOut() &&
camelExchange.getOut(AttachmentMessage.class).hasAttachments()) {
for (Map.Entry
entry :
camelExchange.getOut(AttachmentMessage.class).getAttachmentObjects().entrySet())
{
if (attachments == null) {
attachments = new HashSet<>();
diff --git a/parent/pom.xml b/parent/pom.xml
index b44633c..0316376 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -919,11 +919,6 @@
org.apache.camel
-camel-attachments
-${project.version}
-
-
-org.apache.camel
camel-atmos
${project.version}
@@ -944,6 +939,11 @@
org.apache.camel
+camel-attachments
+${project.version}
+
+
+org.apache.camel
camel-avro
${project.version}
diff --git
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index f83bc95..2cd631f 100644
---
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -393,6 +393,11 @@
org.apache.camel
+camel-attachments
+${project.version}
+
+
+org.apache.camel
camel-avro
${project.version}
[camel] 02/13: CAMEL-13678: Move attachments out of camel-core into camel-attachments.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13678
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 368daaeb855249e9cc349b788f0b196de96adf6c
Author: Claus Ibsen
AuthorDate: Sun Jul 7 20:25:10 2019 +0200
CAMEL-13678: Move attachments out of camel-core into camel-attachments.
---
MIGRATION.md | 11 ++
.../org/apache/camel/attachment/Attachment.java| 2 -
.../BeanWithAttachmentAnnotationTest.java | 125 -
.../org/apache/camel/component/bean/BeanInfo.java | 8 +-
.../apache/camel/component/bean/MethodInfo.java| 4 -
.../camel/component/mock/MockExpressionClause.java | 7 --
.../mock/MockExpressionClauseSupport.java | 7 --
.../java/org/apache/camel/AttachmentObjects.java | 33 --
.../main/java/org/apache/camel/Attachments.java| 33 --
9 files changed, 12 insertions(+), 218 deletions(-)
diff --git a/MIGRATION.md b/MIGRATION.md
index 24d68ef..ea8a343 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -35,6 +35,7 @@ You may find how to do that in the examples.
We have also modularized many of the core components and moved them out of
`camel-core` to individual components:
+- camel-attachments
- camel-bean
- camel-browse
- camel-controlbus
@@ -130,6 +131,16 @@ And the same for ``.
The `camel-script` component has been removed and there is no support for
javax.script, which is also deprecated in the JDK and to be removed from Java
11 onwards.
+### Attachments API on Message
+
+The attachments API (javax.activation) has been moved out of
`org.apache.camel.message` into an extension
`org.apache.camel.attachment.AttachmentMessage` from the `camel-attachments`
JAR.
+
+To use this API you can get it via the `getMessage` method on `Exchange`:
+
+AttachmentMessage am = exchange.getMessage(AttachmentMessage.class);
+am.addAttachment("myAtt", new DataHandler(...));
+
+
### Mock component
The `mock` component has been moved out of `camel-core` and as part of this
work, we had to remove a number of methods on its _assertion clause builder_
that were seldom in use.
diff --git
a/components/camel-attachments/src/main/java/org/apache/camel/attachment/Attachment.java
b/components/camel-attachments/src/main/java/org/apache/camel/attachment/Attachment.java
index 9ad220a..d88aecf 100644
---
a/components/camel-attachments/src/main/java/org/apache/camel/attachment/Attachment.java
+++
b/components/camel-attachments/src/main/java/org/apache/camel/attachment/Attachment.java
@@ -28,8 +28,6 @@ import org.apache.camel.Message;
*/
public interface Attachment {
-// TODO: Move this to camel-attachment
-
/**
* Return a DataHandler for the content within this attachment.
*
diff --git
a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanWithAttachmentAnnotationTest.java
b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanWithAttachmentAnnotationTest.java
deleted file mode 100644
index c3d2d30..000
---
a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanWithAttachmentAnnotationTest.java
+++ /dev/null
@@ -1,125 +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.attachment;
-
-import java.util.Map;
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
-import javax.naming.Context;
-
-import org.apache.camel.AttachmentObjects;
-import org.apache.camel.Attachments;
-import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.support.jndi.JndiContext;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-@Ignore("Need to make camel-bean support this")
-public class BeanWithAttachmentAnnotationTest extends CamelTestSupport {
-
-@Test
-public void testBeanWithOldAnnotationAndExchangeTest() throws Exception {
-MockEndpoint mock =
[camel] 09/13: CAMEL-13678: Move attachments out of camel-core into camel-attachments.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13678
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 58b384151f06785f8c5a21073807a6a41402d490
Author: Claus Ibsen
AuthorDate: Mon Jul 8 11:20:10 2019 +0200
CAMEL-13678: Move attachments out of camel-core into camel-attachments.
---
.../camel-mail/src/main/docs/mail-component.adoc | 2 +-
.../camel/component/mail/MailConfiguration.java| 5 +-
.../apache/camel/component/mail/MailConsumer.java | 16 ++
.../apache/camel/component/mail/MailMessage.java | 3 ++
.../component/mail/SplitAttachmentsExpression.java | 62 +-
.../component/mail/MailSplitAttachmentsTest.java | 33 +---
.../mail/SpringMailSplitAttachmentsTest.java | 31 ---
.../mail/SpringMailSplitAttachmentsTest.xml| 4 +-
.../endpoint/dsl/MailEndpointBuilderFactory.java | 24 +
.../springboot/MailComponentConfiguration.java | 12 +++--
10 files changed, 60 insertions(+), 132 deletions(-)
diff --git a/components/camel-mail/src/main/docs/mail-component.adoc
b/components/camel-mail/src/main/docs/mail-component.adoc
index 792df33..664a379 100644
--- a/components/camel-mail/src/main/docs/mail-component.adoc
+++ b/components/camel-mail/src/main/docs/mail-component.adoc
@@ -153,7 +153,7 @@ with the following path and query parameters:
| *fetchSize* (consumer) | Sets the maximum number of messages to consume
during a poll. This can be used to avoid overloading a mail server, if a
mailbox folder contains a lot of messages. Default value of -1 means no fetch
size and all messages will be consumed. Setting the value to 0 is a special
corner case, where Camel will not consume any messages at all. | -1 | int
| *folderName* (consumer) | The folder to poll. | INBOX | String
| *mailUidGenerator* (consumer) | A pluggable MailUidGenerator that allows to
use custom logic to generate UUID of the mail message. | | MailUidGenerator
-| *mapMailMessage* (consumer) | Specifies whether Camel should map the
received mail message to Camel body/headers. If set to true, the body of the
mail message is mapped to the body of the Camel IN message and the mail headers
are mapped to IN headers. If this option is set to false then the IN message
contains a raw javax.mail.Message. You can retrieve this raw message by calling
exchange.getIn().getBody(javax.mail.Message.class). | true | boolean
+| *mapMailMessage* (consumer) | Specifies whether Camel should map the
received mail message to Camel body/headers/attachments. If set to true, the
body of the mail message is mapped to the body of the Camel IN message, the
mail headers are mapped to IN headers, and the attachments to Camel IN
attachment message. If this option is set to false then the IN message contains
a raw javax.mail.Message. You can retrieve this raw message by calling
exchange.getIn().getBody(javax.mail.Message.cl [...]
| *pollStrategy* (consumer) | A pluggable
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your
custom implementation to control error handling usually occurred during the
poll operation before an Exchange have been created and being routed in Camel.
| | PollingConsumerPoll Strategy
| *postProcessAction* (consumer) | Refers to an MailBoxPostProcessAction for
doing post processing tasks on the mailbox once the normal processing ended. |
| MailBoxPostProcess Action
| *bcc* (producer) | Sets the BCC email address. Separate multiple email
addresses with comma. | | String
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
index b365abf..d1abdd8 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
@@ -449,8 +449,9 @@ public class MailConfiguration implements Cloneable {
}
/**
- * Specifies whether Camel should map the received mail message to Camel
body/headers.
- * If set to true, the body of the mail message is mapped to the body of
the Camel IN message and the mail headers are mapped to IN headers.
+ * Specifies whether Camel should map the received mail message to Camel
body/headers/attachments.
+ * If set to true, the body of the mail message is mapped to the body of
the Camel IN message, the mail headers are mapped to IN headers,
+ * and the attachments to Camel IN attachment message.
* If this option is set to false then the IN message contains a raw
javax.mail.Message.
* You can retrieve this raw message by calling
exchange.getIn().getBody(javax.mail.Message.class).
*/
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
[camel] 03/13: CAMEL-13678: Move attachments out of camel-core into camel-attachments.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13678
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 381624851961237bc981a7704c52c63af43b63d4
Author: Claus Ibsen
AuthorDate: Mon Jul 8 09:12:19 2019 +0200
CAMEL-13678: Move attachments out of camel-core into camel-attachments.
---
bom/camel-bom/pom.xml | 5 ++
.../camel/component/chunk/ChunkEndpoint.java | 1 -
components/camel-cxf/pom.xml | 4 +
.../camel/component/cxf/DefaultCxfBinding.java | 60 +++---
.../component/cxf/jaxrs/SimpleCxfRsBinding.java| 7 +-
.../camel/component/cxf/DefaultCxfBindingTest.java | 13 ++--
.../CxfRsConsumerSimpleBindingTest.java| 9 ++-
.../cxf/mtom/CxfJavaMtomProducerPayloadTest.java | 3 +-
.../cxf/mtom/CxfMtomConsumerPayloadModeTest.java | 13 ++--
.../component/cxf/mtom/CxfMtomConsumerTest.java| 3 +-
.../CxfMtomDisabledConsumerPayloadModeTest.java| 9 ++-
.../CxfMtomDisabledProducerPayloadModeTest.java| 9 ++-
.../cxf/mtom/CxfMtomPOJOProducerTest.java | 3 +-
.../cxf/mtom/CxfMtomProducerPayloadModeTest.java | 9 ++-
.../component/freemarker/FreemarkerEndpoint.java | 1 -
.../apache/camel/component/gora/GoraProducer.java | 3 +-
components/camel-http-common/pom.xml | 11 ++-
.../camel/http/common/DefaultHttpBinding.java | 4 +-
.../component/jetty9/AttachmentHttpBinding.java| 16 ++--
.../jetty/HttpBridgeMultipartRouteTest.java| 3 +-
.../component/jetty/MultiPartFormOkHttpTest.java | 8 +-
.../camel/component/jetty/MultiPartFormTest.java | 3 +-
.../jetty/MultiPartFormWithCustomFilterTest.java | 6 +-
.../org/apache/camel/component/jms/JmsMessage.java | 5 --
.../apache/camel/component/jolt/JoltEndpoint.java | 1 -
.../apache/camel/component/ldap/LdapProducer.java | 1 -
components/camel-mail/pom.xml | 4 +
.../apache/camel/component/mail/MailBinding.java | 13 ++--
.../apache/camel/component/mail/MailConsumer.java | 1 -
.../apache/camel/component/mail/MailMessage.java | 23 --
.../component/mail/SplitAttachmentsExpression.java | 12 +--
.../mime/multipart/MimeMultipartDataFormat.java| 49 ++--
.../mail/MailAttachmentDuplicateNamesTest.java | 7 +-
.../mail/MailAttachmentRedeliveryTest.java | 9 ++-
.../camel/component/mail/MailAttachmentTest.java | 11 +--
.../mail/MailAttachmentsUmlautIssueTest.java | 7 +-
.../mail/MailBindingAttachmentFileTest.java| 3 +-
.../mail/MailContentTypeResolverTest.java | 7 +-
.../component/mail/MailHtmlAttachmentTest.java | 7 +-
.../apache/camel/component/mail/MailRouteTest.java | 3 +-
.../component/mail/MailSplitAttachmentsTest.java | 11 +--
.../camel/component/mail/MailSubjectTest.java | 3 +-
.../component/mail/MimeMessageConsumeTest.java | 7 +-
.../mail/MimeMultipartAlternativeTest.java | 5 +-
...MultipartAlternativeWithLongerFilenameTest.java | 5 +-
.../mail/NestedMimeMessageConsumeTest.java | 7 +-
.../mail/SpringMailSplitAttachmentsTest.java | 11 +--
.../multipart/MimeMultipartDataFormatTest.java | 37 +
.../component/servlet/AttachmentHttpBinding.java | 8 +-
.../apache/camel/component/sql/SqlProducer.java| 3 -
.../component/sql/SqlProducerOutputAttachment.java | 91 --
.../apache/camel/component/ssh/SshProducer.java| 3 +-
.../undertow/DefaultUndertowHttpBinding.java | 9 ++-
.../component/undertow/MultiPartFormTest.java | 5 +-
parent/pom.xml | 5 ++
55 files changed, 260 insertions(+), 316 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 22c93e9..494b298 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -173,6 +173,11 @@
org.apache.camel
+camel-attachments
+${project.version}
+
+
+org.apache.camel
camel-avro
${project.version}
diff --git
a/components/camel-chunk/src/main/java/org/apache/camel/component/chunk/ChunkEndpoint.java
b/components/camel-chunk/src/main/java/org/apache/camel/component/chunk/ChunkEndpoint.java
index 52d618d..9773a80 100644
---
a/components/camel-chunk/src/main/java/org/apache/camel/component/chunk/ChunkEndpoint.java
+++
b/components/camel-chunk/src/main/java/org/apache/camel/component/chunk/ChunkEndpoint.java
@@ -114,7 +114,6 @@ public class ChunkEndpoint extends ResourceEndpoint {
Message out = exchange.getOut();
out.setBody(newChunk.toString());
out.setHeaders(exchange.getIn().getHeaders());
-out.setAttachments(exchange.getIn().getAttachments());
} else {
exchange.getIn().removeHeader(ChunkConstants.CHUNK_RESOURCE_URI);
ChunkEndpoint
[camel] branch CAMEL-13678 created (now bd2ea04)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-13678 in repository https://gitbox.apache.org/repos/asf/camel.git. at bd2ea04 CAMEL-13678: Move attachments out of camel-core into camel-attachments. This branch includes the following new commits: new 3829dae CAMEL-13678: Move attachments out of camel-core into camel-attachments. new 368daae CAMEL-13678: Move attachments out of camel-core into camel-attachments. new 3816248 CAMEL-13678: Move attachments out of camel-core into camel-attachments. new eca4a48 CAMEL-13678: Move attachments out of camel-core into camel-attachments. new 7875847 Upgrade cxf codegen plugin new cd24c6f CAMEL-13678: Move attachments out of camel-core into camel-attachments. new f83fcd2 Regen new 44f3e23 CAMEL-13678: Move attachments out of camel-core into camel-attachments. new 58b3841 CAMEL-13678: Move attachments out of camel-core into camel-attachments. new 9f6b9de Regen new c557c4f CAMEL-13678: Move attachments out of camel-core into camel-attachments. new e0c7168 CAMEL-13678: Move attachments out of camel-core into camel-attachments. new bd2ea04 CAMEL-13678: Move attachments out of camel-core into camel-attachments. The 13 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] 04/13: CAMEL-13678: Move attachments out of camel-core into camel-attachments.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13678
in repository https://gitbox.apache.org/repos/asf/camel.git
commit eca4a48267cbb230b50e74afc1c1bfe399f98fe8
Author: Claus Ibsen
AuthorDate: Mon Jul 8 09:53:56 2019 +0200
CAMEL-13678: Move attachments out of camel-core into camel-attachments.
---
.../camel/component/mustache/MustacheEndpoint.java | 1 -
.../apache/camel/component/mvel/MvelEndpoint.java | 1 -
.../apache/camel/component/pdf/PdfProducer.java| 1 -
.../internal/processor/AnalyticsApiProcessor.java | 3 +--
.../internal/processor/BulkApiProcessor.java | 3 +--
.../apache/camel/component/sjms/SjmsMessage.java | 5 -
.../integration/SpringIntegrationMessage.java | 1 -
components/camel-spring-ws/pom.xml | 4
.../spring/ws/SpringWebserviceConsumer.java| 6 --
.../spring/ws/SpringWebserviceProducer.java| 9
.../spring/ws/filter/impl/BasicMessageFilter.java | 24 --
.../spring/ws/SoapAttachmentResponseProcessor.java | 5 +++--
.../spring/ws/SoapResponseAttachmentTest.java | 9
.../ws/filter/impl/BasicMessageFilterTest.java | 9
.../spring/ws/testfilters/GlobalMessageFilter.java | 4 ++--
.../spring/ws/testfilters/LocalMessageFilter.java | 3 ++-
.../stringtemplate/StringTemplateEndpoint.java | 1 -
.../apache/camel/component/tika/TikaProducer.java | 1 -
.../camel/component/velocity/VelocityEndpoint.java | 1 -
.../velocity/VelocityMethodInvokationTest.java | 5 -
.../camel/component/velocity/VelocityTest.java | 5 -
21 files changed, 45 insertions(+), 56 deletions(-)
diff --git
a/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheEndpoint.java
b/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheEndpoint.java
index 961a7b0..1733bf0 100644
---
a/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheEndpoint.java
+++
b/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheEndpoint.java
@@ -101,7 +101,6 @@ public class MustacheEndpoint extends ResourceEndpoint {
Message out = exchange.getOut();
out.setBody(writer.toString());
out.setHeaders(exchange.getIn().getHeaders());
-out.setAttachments(exchange.getIn().getAttachments());
} else {
exchange.getIn().removeHeader(MustacheConstants.MUSTACHE_RESOURCE_URI);
MustacheEndpoint newEndpoint =
getCamelContext().getEndpoint(MUSTACHE_ENDPOINT_URI_PREFIX + newResourceUri,
MustacheEndpoint.class);
diff --git
a/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelEndpoint.java
b/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelEndpoint.java
index 08e31c6..ef5d813 100644
---
a/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelEndpoint.java
+++
b/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelEndpoint.java
@@ -120,7 +120,6 @@ public class MvelEndpoint extends ResourceEndpoint {
Message out = exchange.getOut();
out.setBody(result.toString());
out.setHeaders(exchange.getIn().getHeaders());
-out.setAttachments(exchange.getIn().getAttachments());
}
public MvelEndpoint findOrCreateEndpoint(String uri, String
newResourceUri) {
diff --git
a/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfProducer.java
b/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfProducer.java
index d390231..9029729 100644
---
a/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfProducer.java
+++
b/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfProducer.java
@@ -70,7 +70,6 @@ public class PdfProducer extends DefaultProducer {
}
// propagate headers
exchange.getOut().setHeaders(exchange.getIn().getHeaders());
-exchange.getOut().setAttachments(exchange.getIn().getAttachments());
// and set result
exchange.getOut().setBody(result);
}
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AnalyticsApiProcessor.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AnalyticsApiProcessor.java
index 944e923..a06b2a7 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AnalyticsApiProcessor.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/AnalyticsApiProcessor.java
@@ -210,12 +210,11 @@ public class AnalyticsApiProcessor extends
[camel-quarkus] branch master updated: chore: ignore ObjectStore folder
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/master by this push: new 86e02a7 chore: ignore ObjectStore folder 86e02a7 is described below commit 86e02a7463dac95a7e9a860bdd4e05727f244a80 Author: lburgazzoli AuthorDate: Mon Jul 8 18:04:38 2019 +0200 chore: ignore ObjectStore folder --- integration-tests/jdbc/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/integration-tests/jdbc/.gitignore b/integration-tests/jdbc/.gitignore new file mode 100644 index 000..837c2eb --- /dev/null +++ b/integration-tests/jdbc/.gitignore @@ -0,0 +1 @@ +ObjectStore \ No newline at end of file
[camel] branch master updated: "CAMEL-13454:camel-testcontainers-spring - Should build if no docker"
This is an automated email from the ASF dual-hosted git repository.
ramu12 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 ee24e97 "CAMEL-13454:camel-testcontainers-spring - Should build if no
docker"
ee24e97 is described below
commit ee24e9758ce974893ddb08cff1f18bf0490eb151
Author: Kodanda Ramu Kakarla
AuthorDate: Mon Jul 8 22:34:53 2019 +0530
"CAMEL-13454:camel-testcontainers-spring - Should build if no docker"
---
components/camel-testcontainers-spring/pom.xml | 18 ++
1 file changed, 18 insertions(+)
diff --git a/components/camel-testcontainers-spring/pom.xml
b/components/camel-testcontainers-spring/pom.xml
index 2f6c01c..d9b7072 100644
--- a/components/camel-testcontainers-spring/pom.xml
+++ b/components/camel-testcontainers-spring/pom.xml
@@ -74,6 +74,22 @@
+
+testcontainers-spring-skip-tests
+
+true
+
+
+
+
+maven-surefire-plugin
+
+true
+
+
+
+
+
testcontainers-spring-integration-tests-docker-file
@@ -88,6 +104,7 @@
org.apache.maven.plugins
maven-failsafe-plugin
+${skipTests}
true
@@ -119,6 +136,7 @@
org.apache.maven.plugins
maven-failsafe-plugin
+${skipTests}
true
[camel] branch master updated: "CAMEL-13454:camel-testcontainers - Should build if no docker"
This is an automated email from the ASF dual-hosted git repository.
ramu12 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 0b9cf2f "CAMEL-13454:camel-testcontainers - Should build if no docker"
0b9cf2f is described below
commit 0b9cf2f1d9557e63d10950dff3578bcdfd989171
Author: Kodanda Ramu Kakarla
AuthorDate: Mon Jul 8 22:24:06 2019 +0530
"CAMEL-13454:camel-testcontainers - Should build if no docker"
---
components/camel-testcontainers/pom.xml | 18 ++
1 file changed, 18 insertions(+)
diff --git a/components/camel-testcontainers/pom.xml
b/components/camel-testcontainers/pom.xml
index 19e6356..c882cf5 100644
--- a/components/camel-testcontainers/pom.xml
+++ b/components/camel-testcontainers/pom.xml
@@ -76,6 +76,22 @@
+
+testcontainers-skip-tests
+
+true
+
+
+
+
+maven-surefire-plugin
+
+true
+
+
+
+
+
testcontainers-integration-tests-docker-file
@@ -90,6 +106,7 @@
org.apache.maven.plugins
maven-failsafe-plugin
+${skipTests}
true
@@ -121,6 +138,7 @@
org.apache.maven.plugins
maven-failsafe-plugin
+${skipTests}
true
[camel-k-runtime] 02/02: groovy: add missing methods from route builder / builder support
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 0ea2447627fef8531ec94a7a6559260db81fdbb7
Author: lburgazzoli
AuthorDate: Mon Jul 8 15:40:30 2019 +0200
groovy: add missing methods from route builder / builder support
---
.../k/groovy/dsl/IntegrationConfiguration.groovy | 41 +-
.../camel/k/groovy/dsl/IntegrationTest.groovy | 39
.../resources/routes-with-error-handler.groovy | 23
3 files changed, 88 insertions(+), 15 deletions(-)
diff --git
a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/IntegrationConfiguration.groovy
b/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/IntegrationConfiguration.groovy
index b47f509..9544874 100644
---
a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/IntegrationConfiguration.groovy
+++
b/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/IntegrationConfiguration.groovy
@@ -16,23 +16,22 @@
*/
package org.apache.camel.k.groovy.dsl
-import org.apache.camel.CamelContext
import org.apache.camel.Exchange
import org.apache.camel.Predicate
import org.apache.camel.Processor
import org.apache.camel.builder.RouteBuilder
import org.apache.camel.k.jvm.dsl.Components
-import org.apache.camel.model.ProcessorDefinition
+import org.apache.camel.model.*
import org.apache.camel.spi.Registry
-class IntegrationConfiguration {
-final CamelContext context
+class IntegrationConfiguration extends org.apache.camel.builder.BuilderSupport
{
final Registry registry
final Components components
final RouteBuilder builder
IntegrationConfiguration(RouteBuilder builder) {
-this.context = builder.getContext()
+super(builder.context)
+
this.registry = this.context.registry
this.components = new Components(this.context)
this.builder = builder
@@ -50,10 +49,6 @@ class IntegrationConfiguration {
callable.call()
}
-ProcessorDefinition from(String endpoint) {
-return builder.from(endpoint)
-}
-
def processor(@DelegatesTo(Exchange) Closure callable) {
return new Processor() {
@Override
@@ -73,4 +68,32 @@ class IntegrationConfiguration {
}
}
}
+
+ProcessorDefinition from(String endpoint) {
+return builder.from(endpoint)
+}
+
+OnExceptionDefinition onException(Class exception) {
+return builder.onException(exception)
+}
+
+OnCompletionDefinition onCompletion() {
+return builder.onCompletion()
+}
+
+InterceptDefinition intercept() {
+return builder.intercept()
+}
+
+InterceptFromDefinition interceptFrom() {
+return builder.interceptFrom()
+}
+
+InterceptFromDefinition interceptFrom(String uri) {
+return builder.interceptFrom(uri)
+}
+
+InterceptSendToEndpointDefinition interceptSendToEndpoint(String uri) {
+return builder.interceptSendToEndpoint(uri)
+}
}
diff --git
a/camel-k-runtime-groovy/src/test/groovy/org/apache/camel/k/groovy/dsl/IntegrationTest.groovy
b/camel-k-runtime-groovy/src/test/groovy/org/apache/camel/k/groovy/dsl/IntegrationTest.groovy
index d92ec11..e85a4ae 100644
---
a/camel-k-runtime-groovy/src/test/groovy/org/apache/camel/k/groovy/dsl/IntegrationTest.groovy
+++
b/camel-k-runtime-groovy/src/test/groovy/org/apache/camel/k/groovy/dsl/IntegrationTest.groovy
@@ -22,6 +22,9 @@ import org.apache.camel.component.seda.SedaComponent
import org.apache.camel.k.Runtime
import org.apache.camel.k.jvm.ApplicationRuntime
import org.apache.camel.k.listener.RoutesConfigurer
+import org.apache.camel.processor.FatalFallbackErrorHandler
+import org.apache.camel.processor.SendProcessor
+import org.apache.camel.processor.channel.DefaultChannel
import spock.lang.Specification
import java.util.concurrent.atomic.AtomicInteger
@@ -86,13 +89,37 @@ class IntegrationTest extends Specification {
runtime.stop()
})
-runtime.run()
+runtime.run()
+then:
+sedaSize == 1234
+sedaConsumers == 12
+mySedaSize == 4321
+mySedaConsumers == 21
+format != null
+}
+
+def "load integration with error handler"() {
+given:
+def onExceptions = []
+when:
+def runtime = new ApplicationRuntime()
+
runtime.addListener(RoutesConfigurer.forRoutes('classpath:routes-with-error-handler.groovy'))
+runtime.addListener(Runtime.Phase.Started, {
+it.camelContext.routes?.size() == 1
+
it.camelContext.routes[0].routeContext.getOnException('my-on-exception') != null
+
+onExceptions <<
[camel-k-runtime] branch master updated (7b09b61 -> 0ea2447)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git.
from 7b09b61 kotlin: add missing methods from route builder / builder
support
new ad8bb2e groovy: initial support for idea auto completion
new 0ea2447 groovy: add missing methods from route builder / builder
support
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:
.../k/groovy/dsl/ComponentsConfiguration.groovy| 4 +-
.../camel/k/groovy/dsl/ContextConfiguration.groovy | 4 +-
.../k/groovy/dsl/IntegrationConfiguration.groovy | 49 --
.../camel/k/groovy/dsl/RestConfiguration.groovy| 8 ++--
.../src/main/resources/integration.gdsl| 9 ++--
.../camel/k/groovy/dsl/IntegrationTest.groovy | 39 ++---
...tes.groovy => routes-with-error-handler.groovy} | 5 +++
7 files changed, 87 insertions(+), 31 deletions(-)
copy
camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttp.java
=> camel-k-runtime-groovy/src/main/resources/integration.gdsl (84%)
copy camel-k-runtime-groovy/src/test/resources/{routes.groovy =>
routes-with-error-handler.groovy} (87%)
[camel-k-runtime] 01/02: groovy: initial support for idea auto completion
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit ad8bb2e09e3ff52c2549628e4ca01ffc748b06e4
Author: lburgazzoli
AuthorDate: Wed Jul 3 18:26:04 2019 +0200
groovy: initial support for idea auto completion
---
.../k/groovy/dsl/ComponentsConfiguration.groovy| 4 ++--
.../camel/k/groovy/dsl/ContextConfiguration.groovy | 4 ++--
.../k/groovy/dsl/IntegrationConfiguration.groovy | 12 +-
.../camel/k/groovy/dsl/RestConfiguration.groovy| 8 ---
.../integration.gdsl} | 26 --
5 files changed, 19 insertions(+), 35 deletions(-)
diff --git
a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentsConfiguration.groovy
b/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentsConfiguration.groovy
index 7f147be..6287100 100644
---
a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentsConfiguration.groovy
+++
b/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ComponentsConfiguration.groovy
@@ -26,7 +26,7 @@ class ComponentsConfiguration {
this.context = context
}
-def component(String name, Closure callable) {
+def component(String name, @DelegatesTo(ComponentConfiguration) Closure
callable) {
def component = context.getComponent(name, true, false)
callable.resolveStrategy = Closure.DELEGATE_FIRST
@@ -34,7 +34,7 @@ class ComponentsConfiguration {
callable.call()
}
-def component(String name, Class type, Closure
callable) {
+def component(String name, Class type,
@DelegatesTo(ComponentConfiguration) Closure callable) {
def component = context.getComponent(name, true, false)
// if the component is not found, let's create a new one. This is
diff --git
a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ContextConfiguration.groovy
b/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ContextConfiguration.groovy
index c5f332b..3b1c373 100644
---
a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ContextConfiguration.groovy
+++
b/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/ContextConfiguration.groovy
@@ -25,13 +25,13 @@ class ContextConfiguration {
this.context = context
}
-def registry(Closure callable) {
+def registry(@DelegatesTo(RegistryConfiguration) Closure callable) {
callable.resolveStrategy = Closure.DELEGATE_FIRST
callable.delegate = new RegistryConfiguration(this.context.registry)
callable.call()
}
-def components(Closure callable) {
+def components(@DelegatesTo(ComponentsConfiguration) Closure callable) {
callable.resolveStrategy = Closure.DELEGATE_FIRST
callable.delegate = new ComponentsConfiguration(context)
callable.call()
diff --git
a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/IntegrationConfiguration.groovy
b/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/IntegrationConfiguration.groovy
index 6af42ab..b47f509 100644
---
a/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/IntegrationConfiguration.groovy
+++
b/camel-k-runtime-groovy/src/main/groovy/org/apache/camel/k/groovy/dsl/IntegrationConfiguration.groovy
@@ -22,7 +22,7 @@ import org.apache.camel.Predicate
import org.apache.camel.Processor
import org.apache.camel.builder.RouteBuilder
import org.apache.camel.k.jvm.dsl.Components
-import org.apache.camel.model.RouteDefinition
+import org.apache.camel.model.ProcessorDefinition
import org.apache.camel.spi.Registry
class IntegrationConfiguration {
@@ -38,23 +38,23 @@ class IntegrationConfiguration {
this.builder = builder
}
-def context(Closure callable) {
+def context(@DelegatesTo(ContextConfiguration) Closure callable) {
callable.resolveStrategy = Closure.DELEGATE_FIRST
callable.delegate = new ContextConfiguration(context)
callable.call()
}
-def rest(Closure callable) {
+def rest(@DelegatesTo(RestConfiguration) Closure callable) {
callable.resolveStrategy = Closure.DELEGATE_FIRST
callable.delegate = new RestConfiguration(builder)
callable.call()
}
-RouteDefinition from(String endpoint) {
+ProcessorDefinition from(String endpoint) {
return builder.from(endpoint)
}
-def processor(Closure callable) {
+def processor(@DelegatesTo(Exchange) Closure callable) {
return new Processor() {
@Override
void process(Exchange exchange) throws Exception {
@@ -64,7 +64,7 @@ class IntegrationConfiguration {
}
}
-def predicate(Closure callable) {
+def predicate(@DelegatesTo(Exchange)
[camel-k-runtime] branch master updated (9722202 -> 7b09b61)
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git. from 9722202 Merge pull request #90 from lburgazzoli/deps-update add b66afd4 kotlin: add initial support for kotlin auto completion in idea add 7b09b61 kotlin: add missing methods from route builder / builder support No new revisions were added by this update. Summary of changes: .../apache/camel/k/kotlin/KotlinRoutesLoader.kt| 29 +-- .../kotlin/KotlinScriptCompilationConfiguration.kt | 0 .../camel/k/kotlin/dsl/IntegrationConfiguration.kt | 42 ++ ...k.kotlin.dsl.IntegrationConfiguration.classname | 0 .../apache/camel/k/kotlin/dsl/IntegrationTest.kt | 22 .../test/resources/routes-with-error-handler.kts | 10 ++ .../src/test/resources/routes-with-rest.kts| 1 + 7 files changed, 86 insertions(+), 18 deletions(-) create mode 100644 camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/KotlinScriptCompilationConfiguration.kt create mode 100644 camel-k-runtime-kotlin/src/main/resources/META-INF/kotlin/script/templates/org.apache.camel.k.kotlin.dsl.IntegrationConfiguration.classname create mode 100644 camel-k-runtime-kotlin/src/test/resources/routes-with-error-handler.kts
[camel] branch master updated: Removed unused import in Camel-Slack
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 42f702f Removed unused import in Camel-Slack 42f702f is described below commit 42f702f96700b44f4aa727fbb7627ab62916d5b9 Author: Andrea Cosentino AuthorDate: Mon Jul 8 16:51:57 2019 +0200 Removed unused import in Camel-Slack --- .../test/java/org/apache/camel/component/slack/SlackConsumerTest.java| 1 - 1 file changed, 1 deletion(-) diff --git a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java index db29797..43d16e1 100644 --- a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java +++ b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java @@ -20,7 +20,6 @@ import java.io.IOException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.component.slack.helper.SlackMessage; import org.apache.camel.test.junit4.CamelTestSupport; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus;
[camel] 01/02: Fixed Camel-Slack Producer Test
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 96cfb0d11b91814decf04acd10f2c8fabb2edc5d
Author: Andrea Cosentino
AuthorDate: Mon Jul 8 16:41:42 2019 +0200
Fixed Camel-Slack Producer Test
---
components/camel-slack/pom.xml | 5 +
.../camel/component/slack/SlackProducerTest.java| 21 ++---
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/components/camel-slack/pom.xml b/components/camel-slack/pom.xml
index 5b58295..f763419 100644
--- a/components/camel-slack/pom.xml
+++ b/components/camel-slack/pom.xml
@@ -60,6 +60,11 @@
camel-test
test
+
+org.apache.camel
+camel-undertow
+test
+
org.apache.logging.log4j
diff --git
a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
index 1fc50ad..74e193b 100644
---
a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
+++
b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
@@ -20,6 +20,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.direct.DirectEndpoint;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -31,9 +32,8 @@ public class SlackProducerTest extends CamelTestSupport {
@EndpointInject("direct:test")
DirectEndpoint test;
-
-@EndpointInject("direct:error")
-DirectEndpoint error;
+
+protected static final int UNDERTOW_PORT =
AvailablePortFinder.getNextAvailable();
@Test
public void testSlackMessage() throws Exception {
@@ -44,30 +44,21 @@ public class SlackProducerTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
}
-@Test
-public void testSlackError() throws Exception {
-errors.expectedMessageCount(1);
-
-template.sendBody(error, "Error from Camel!");
-
-assertMockEndpointsSatisfied();
-}
-
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
public void configure() {
SlackComponent slack = new SlackComponent();
-slack.setWebhookUrl(System.getProperty("SLACK_HOOK",
"https://hooks.slack.com/services/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;));
+slack.setWebhookUrl("http://localhost:; + UNDERTOW_PORT +
"/slack/webhook");
context.addComponent("slack", slack);
onException(Exception.class).handled(true).to(errors);
final String slacUser = System.getProperty("SLACK_USER",
"CamelTest");
+from("undertow:http://localhost:; + UNDERTOW_PORT +
"/slack/webhook").setBody(constant("{\"ok\": true}"));
+
from(test).to(String.format("slack:#general?iconEmoji=:camel:=%s",
slacUser));
-
-
from(error).to(String.format("slack:#badchannel?iconEmoji=:camel:=%s",
slack));
}
};
}
[camel] 02/02: Fixed CS for Camel-Slack
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 77876da48b8dba65b986b1df1974e61ed9c93375
Author: Andrea Cosentino
AuthorDate: Mon Jul 8 16:42:44 2019 +0200
Fixed CS for Camel-Slack
---
.../java/org/apache/camel/component/slack/SlackProducerTest.java| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
index 74e193b..d0c5b25 100644
---
a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
+++
b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackProducerTest.java
@@ -26,14 +26,14 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class SlackProducerTest extends CamelTestSupport {
-
+
+protected static final int UNDERTOW_PORT =
AvailablePortFinder.getNextAvailable();
+
@EndpointInject("mock:errors")
MockEndpoint errors;
@EndpointInject("direct:test")
DirectEndpoint test;
-
-protected static final int UNDERTOW_PORT =
AvailablePortFinder.getNextAvailable();
@Test
public void testSlackMessage() throws Exception {
[camel] branch master updated (9a9dd2a -> 77876da)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 9a9dd2a CAMEL-13588: additional escapes for URLs new 96cfb0d Fixed Camel-Slack Producer Test new 77876da Fixed CS for Camel-Slack 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-slack/pom.xml | 5 + .../camel/component/slack/SlackProducerTest.java | 23 +++--- 2 files changed, 12 insertions(+), 16 deletions(-)
[camel-quarkus] branch master updated: Fix #10 Produce test-jars of the integration tests
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/master by this push: new f5ad4ed Fix #10 Produce test-jars of the integration tests f5ad4ed is described below commit f5ad4ed24628fff4bad7f6ffad8f63b058782816 Author: Peter Palaga AuthorDate: Thu Jul 4 12:20:03 2019 +0200 Fix #10 Produce test-jars of the integration tests --- build-parent/pom.xml | 5 +++ integration-tests/aws-s3/pom.xml | 3 -- integration-tests/aws-sns/pom.xml | 3 -- integration-tests/aws-sqs/pom.xml | 3 -- integration-tests/core/pom.xml | 6 --- integration-tests/jdbc/pom.xml | 3 -- integration-tests/pom.xml | 51 ++ integration-tests/salesforce/pom.xml | 3 -- integration-tests/servlet/pom.xml | 2 - .../test-project-sanity-checks.groovy | 23 ++ 10 files changed, 79 insertions(+), 23 deletions(-) diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 2ec45b8..6929ac8 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -176,6 +176,11 @@ maven-resources-plugin 3.1.0 + +org.codehaus.gmaven +groovy-maven-plugin +2.1 + diff --git a/integration-tests/aws-s3/pom.xml b/integration-tests/aws-s3/pom.xml index a6caa97..46bff62 100644 --- a/integration-tests/aws-s3/pom.xml +++ b/integration-tests/aws-s3/pom.xml @@ -71,17 +71,14 @@ io.quarkus quarkus-junit5 -test org.glassfish javax.json -test io.rest-assured rest-assured -test diff --git a/integration-tests/aws-sns/pom.xml b/integration-tests/aws-sns/pom.xml index 8aa080b..714bd01 100644 --- a/integration-tests/aws-sns/pom.xml +++ b/integration-tests/aws-sns/pom.xml @@ -71,17 +71,14 @@ io.quarkus quarkus-junit5 -test org.glassfish javax.json -test io.rest-assured rest-assured -test diff --git a/integration-tests/aws-sqs/pom.xml b/integration-tests/aws-sqs/pom.xml index dc38052..2cc8c44 100644 --- a/integration-tests/aws-sqs/pom.xml +++ b/integration-tests/aws-sqs/pom.xml @@ -71,17 +71,14 @@ io.quarkus quarkus-junit5 -test org.glassfish javax.json -test io.rest-assured rest-assured -test diff --git a/integration-tests/core/pom.xml b/integration-tests/core/pom.xml index 6486bb9..6ad1314 100644 --- a/integration-tests/core/pom.xml +++ b/integration-tests/core/pom.xml @@ -69,33 +69,27 @@ org.infinispan infinispan-core test-jar -test org.infinispan infinispan-server-hotrod test-jar -test org.infinispan infinispan-server-hotrod -test io.quarkus quarkus-junit5 -test org.glassfish javax.json -test io.rest-assured rest-assured -test diff --git a/integration-tests/jdbc/pom.xml b/integration-tests/jdbc/pom.xml index 648cfea..32a6435 100644 --- a/integration-tests/jdbc/pom.xml +++ b/integration-tests/jdbc/pom.xml @@ -52,17 +52,14 @@ io.quarkus quarkus-junit5 -test io.quarkus quarkus-test-h2 -test io.rest-assured rest-assured -test diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index af4e750..cac9b21 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -59,4 +59,55 @@ + + + +org.apache.maven.plugins +maven-jar-plugin + + + +test-jar + + + + + + + + + +test-project-sanity-checks + +
[camel-quarkus] branch master updated: Manage camel-servlet and camel-aws-sns in the BOM
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new 33b56fc Manage camel-servlet and camel-aws-sns in the BOM
new 99f0b97 Merge pull request #40 from
ppalaga/190708-manage-servlet-and-sns
33b56fc is described below
commit 33b56fcc81085f422b518f3e79dfffc96ba49e1e
Author: Peter Palaga
AuthorDate: Mon Jul 8 12:53:35 2019 +0200
Manage camel-servlet and camel-aws-sns in the BOM
This becomes required when Camel stuff is removed from Quarkus BOM
---
bom/pom.xml | 16
1 file changed, 16 insertions(+)
diff --git a/bom/pom.xml b/bom/pom.xml
index a53824c..418fbbb 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -75,6 +75,17 @@
org.apache.camel
+camel-aws-sns
+${camel.version}
+
+
+com.sun.xml.messaging.saaj
+saaj-impl
+
+
+
+
+org.apache.camel
camel-aws-sqs
${camel.version}
@@ -137,6 +148,11 @@
+
+org.apache.camel
+camel-servlet
+${camel.version}
+
[camel-website] 01/01: Merge pull request #55 from apache/sha512
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 3b32378a428248aa06218ea762cfb74cd518f08b Merge: 1b00a6a 03a1c77 Author: Andrea Cosentino AuthorDate: Mon Jul 8 13:48:20 2019 +0200 Merge pull request #55 from apache/sha512 Fixed Table for Sha512 content/download/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel-website] branch sha512 deleted (was 03a1c77)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch sha512 in repository https://gitbox.apache.org/repos/asf/camel-website.git. was 03a1c77 Fixed Table for Sha512 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-website] branch master updated (1b00a6a -> 3b32378)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git. from 1b00a6a Merge pull request #54 from apache/sha512-fix add 03a1c77 Fixed Table for Sha512 new 3b32378 Merge pull request #55 from apache/sha512 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: content/download/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel-website] 01/01: Fixed Table for Sha512
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sha512
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 03a1c77fd2775ea14be1383bbaadfc4d24617fdb
Author: Andrea Cosentino
AuthorDate: Mon Jul 8 13:47:18 2019 +0200
Fixed Table for Sha512
---
content/download/_index.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/download/_index.md b/content/download/_index.md
index 6225ff5..50ca2f5 100644
--- a/content/download/_index.md
+++ b/content/download/_index.md
@@ -35,7 +35,7 @@ See [Download Archives](/releases/)
{{< bootstrap-table "table table-hover text-left" >}}
| Description | Download Link | PGP Signature file of download | SHA512
Checksum file of download |
-|-|---||---||
+|-|---||---|
| Source (zip - 2.23.x branch) |
[apache-camel-2.23.3-src.zip](http://www.apache.org/dyn/closer.lua?filename=camel/apache-camel/2.23.3/apache-camel-2.23.3-src.zip=download)
|
[apache-camel-2.23.3-src.zip.asc](https://www.apache.org/dist/camel/apache-camel/2.23.3/apache-camel-2.23.3-src.zip.asc)
|
[apache-camel-2.23.3-src.zip.sha512](https://www.apache.org/dist/camel/apache-camel/2.23.3/apache-camel-2.23.3-src.zip.sha512)
|
| Source (zip - 2.22.x branch) |
[apache-camel-2.22.5-src.zip](http://www.apache.org/dyn/closer.lua?filename=camel/apache-camel/2.22.5/apache-camel-2.22.5-src.zip=download)
|
[apache-camel-2.22.5-src.zip.asc](https://www.apache.org/dist/camel/apache-camel/2.22.5/apache-camel-2.22.5-src.zip.asc)
|
[apache-camel-2.22.5-src.zip.sha512](https://www.apache.org/dist/camel/apache-camel/2.22.5/apache-camel-2.22.5-src.zip.sha512)
|
| Source (zip - 2.21.x branch) |
[apache-camel-2.21.5-src.zip](http://www.apache.org/dyn/closer.lua?filename=camel/apache-camel/2.21.5/apache-camel-2.21.5-src.zip=download)
|
[apache-camel-2.21.5-src.zip.asc](https://www.apache.org/dist/camel/apache-camel/2.21.5/apache-camel-2.21.5-src.zip.asc)
|
[apache-camel-2.21.5-src.zip.sha512](https://www.apache.org/dist/camel/apache-camel/2.21.5/apache-camel-2.21.5-src.zip.sha512)
|
[camel-website] branch sha512 created (now 03a1c77)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch sha512 in repository https://gitbox.apache.org/repos/asf/camel-website.git. at 03a1c77 Fixed Table for Sha512 This branch includes the following new commits: new 03a1c77 Fixed Table for Sha512 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-website] branch asf-site updated: Website updated to 051a9f8
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/asf-site by this push: new d958314 Website updated to 051a9f8 d958314 is described below commit d9583140225bfee4bba7d81a5ebeb848bab12c28 Author: jenkins AuthorDate: Mon Jul 8 11:45:59 2019 + Website updated to 051a9f8 --- download/index.html| 2 +- sitemap-camel-k.xml| 42 +-- sitemap-components.xml | 776 - sitemap-manual.xml | 604 +++--- 4 files changed, 712 insertions(+), 712 deletions(-) diff --git a/download/index.html b/download/index.html index a684819..398385a 100644 --- a/download/index.html +++ b/download/index.html @@ -3,7 +3,7 @@
[camel-website] 01/01: Merge pull request #54 from apache/sha512-fix
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 1b00a6a8e53f05dd261035043817c7fbff1a5fc5 Merge: e9100b8 651a156 Author: Andrea Cosentino AuthorDate: Mon Jul 8 13:42:32 2019 +0200 Merge pull request #54 from apache/sha512-fix Only SHA512 files should be used in releases tables content/download/_index.md | 24 1 file changed, 12 insertions(+), 12 deletions(-)
[camel-website] branch master updated (e9100b8 -> 1b00a6a)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git. from e9100b8 Moved 2.22.x last release to 2.22.5 add 651a156 Only SHA512 files should be used in releases tables new 1b00a6a Merge pull request #54 from apache/sha512-fix The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: content/download/_index.md | 24 1 file changed, 12 insertions(+), 12 deletions(-)
[camel-website] branch sha512-fix deleted (was 651a156)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch sha512-fix in repository https://gitbox.apache.org/repos/asf/camel-website.git. was 651a156 Only SHA512 files should be used in releases tables 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-website] branch sha512-fix created (now 651a156)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch sha512-fix in repository https://gitbox.apache.org/repos/asf/camel-website.git. at 651a156 Only SHA512 files should be used in releases tables This branch includes the following new commits: new 651a156 Only SHA512 files should be used in releases tables 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-website] 01/01: Only SHA512 files should be used in releases tables
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sha512-fix
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 651a1560f7fad13cfdc6b9633199f89fb6f865e1
Author: Andrea Cosentino
AuthorDate: Mon Jul 8 12:24:40 2019 +0200
Only SHA512 files should be used in releases tables
---
content/download/_index.md | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/content/download/_index.md b/content/download/_index.md
index 0374ff6..6225ff5 100644
--- a/content/download/_index.md
+++ b/content/download/_index.md
@@ -21,24 +21,24 @@ See [Download Archives](/releases/)
### Binary Distribution
{{< bootstrap-table "table table-hover text-left" >}}
-| Description | Download Link | PGP Signature file of download | MD5 Checksum
file of download | SHA1 Checksum file of download |
-|-|---||---||
-| Windows Distribution (2.23.x branch) |
[apache-camel-2.23.3.zip](http://www.apache.org/dyn/closer.lua?filename=camel/apache-camel/2.23.3/apache-camel-2.23.3.zip=download)
|
[apache-camel-2.23.3.zip.asc](https://www.apache.org/dist/camel/apache-camel/2.23.3/apache-camel-2.23.3.zip.asc)
|
[apache-camel-2.23.3.zip.md5](https://www.apache.org/dist/camel/apache-camel/2.23.3/apache-camel-2.23.3.zip.md5)
|
[apache-camel-2.23.3.zip.sha1](https://www.apache.org/dist/camel/apache-camel/2.
[...]
-| Unix/Linux/Cygwin Distribution (2.23.x branch) |
[apache-camel-2.23.3.tar.gz](http://www.apache.org/dyn/closer.lua?filename=camel/apache-camel/2.23.3/apache-camel-2.23.3.tar.gz=download)
|
[apache-camel-2.23.3.tar.gz.asc](https://www.apache.org/dist/camel/apache-camel/2.23.3/apache-camel-2.23.3.tar.gz.asc)
|
[apache-camel-2.23.3.tar.gz.md5](https://www.apache.org/dist/camel/apache-camel/2.23.3/apache-camel-2.23.3.tar.gz.md5)
| [apache-camel-2.23.3.zip.sha1](https://www.apache.or [...]
-| Windows Distribution (2.22.x branch) |
[apache-camel-2.22.5.zip](http://www.apache.org/dyn/closer.lua?filename=camel/apache-camel/2.22.5/apache-camel-2.22.5.zip=download)
|
[apache-camel-2.22.5.zip.asc](https://www.apache.org/dist/camel/apache-camel/2.22.5/apache-camel-2.22.5.zip.asc)
|
[apache-camel-2.22.5.zip.md5](https://www.apache.org/dist/camel/apache-camel/2.22.5/apache-camel-2.22.5.zip.md5)
|
[apache-camel-2.22.5.zip.sha1](https://www.apache.org/dist/camel/apache-camel/2.
[...]
-| Unix/Linux/Cygwin Distribution (2.22.x branch) |
[apache-camel-2.22.5.tar.gz](http://www.apache.org/dyn/closer.lua?filename=camel/apache-camel/2.22.5/apache-camel-2.22.5.tar.gz=download)
|
[apache-camel-2.22.5.tar.gz.asc](https://www.apache.org/dist/camel/apache-camel/2.22.5/apache-camel-2.22.5.tar.gz.asc)
|
[apache-camel-2.22.5.tar.gz.md5](https://www.apache.org/dist/camel/apache-camel/2.22.5/apache-camel-2.22.5.tar.gz.md5)
| [apache-camel-2.22.5.zip.sha1](https://www.apache.or [...]
-| Windows Distribution (2.21.x branch) |
[apache-camel-2.21.5.zip](http://www.apache.org/dyn/closer.lua?filename=camel/apache-camel/2.21.5/apache-camel-2.21.5.zip=download)
|
[apache-camel-2.21.5.zip.asc](https://www.apache.org/dist/camel/apache-camel/2.21.5/apache-camel-2.21.5.zip.asc)
|
[apache-camel-2.21.5.zip.md5](https://www.apache.org/dist/camel/apache-camel/2.21.5/apache-camel-2.21.5.zip.md5)
|
[apache-camel-2.21.5.zip.sha1](https://www.apache.org/dist/camel/apache-camel/2.
[...]
-| Unix/Linux/Cygwin Distribution (2.21.x branch) |
[apache-camel-2.21.5.tar.gz](http://www.apache.org/dyn/closer.lua?filename=camel/apache-camel/2.21.5/apache-camel-2.21.5.tar.gz=download)
|
[apache-camel-2.21.5.tar.gz.asc](https://www.apache.org/dist/camel/apache-camel/2.21.5/apache-camel-2.21.5.tar.gz.asc)
|
[apache-camel-2.21.5.tar.gz.md5](https://www.apache.org/dist/camel/apache-camel/2.21.5/apache-camel-2.21.5.tar.gz.md5)
| [apache-camel-2.21.5.zip.sha1](https://www.apache.or [...]
+| Description | Download Link | PGP Signature file of download | SHA512
Checksum file of download |
+|-|---|||
+| Windows Distribution (2.23.x branch) |
[apache-camel-2.23.3.zip](http://www.apache.org/dyn/closer.lua?filename=camel/apache-camel/2.23.3/apache-camel-2.23.3.zip=download)
|
[apache-camel-2.23.3.zip.asc](https://www.apache.org/dist/camel/apache-camel/2.23.3/apache-camel-2.23.3.zip.asc)
|
[apache-camel-2.23.3.zip.sha512](https://www.apache.org/dist/camel/apache-camel/2.23.3/apache-camel-2.23.3.zip.sha512)
|
+| Unix/Linux/Cygwin Distribution (2.23.x branch) |
[apache-camel-2.23.3.tar.gz](http://www.apache.org/dyn/closer.lua?filename=camel/apache-camel/2.23.3/apache-camel-2.23.3.tar.gz=download)
|
[apache-camel-2.23.3.tar.gz.asc](https://www.apache.org/dist/camel/apache-camel/2.23.3/apache-camel-2.23.3.tar.gz.asc)
|
[camel-k] 04/07: fix #692: fix lint
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit aec9f6f9bbe576533caf0c43dc88e69677c1134f
Author: nferraro
AuthorDate: Thu Jun 27 16:31:27 2019 +0200
fix #692: fix lint
---
pkg/apis/camel/v1alpha1/integration_types.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg/apis/camel/v1alpha1/integration_types.go
b/pkg/apis/camel/v1alpha1/integration_types.go
index d2d9ee0..f94320d 100644
--- a/pkg/apis/camel/v1alpha1/integration_types.go
+++ b/pkg/apis/camel/v1alpha1/integration_types.go
@@ -49,7 +49,7 @@ type IntegrationStatus struct {
CamelVersion string `json:"camelVersion,omitempty"`
RuntimeVersion string `json:"runtimeVersion,omitempty"`
Configuration[]ConfigurationSpec `json:"configuration,omitempty"`
- Version string
`json:"version,omitempty"`
+ Version string `json:"version,omitempty"`
}
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
[camel-k] 01/07: fix #692: add version information to all resources
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 1a5ca8c06cffb8a564d5ced9ebc77e974a5640f5
Author: nferraro
AuthorDate: Thu Jun 27 12:03:38 2019 +0200
fix #692: add version information to all resources
---
e2e/test_support.go| 180 +
e2e/upgrade_test.go| 93 +++
go.mod | 4 +-
go.sum | 12 +-
pkg/apis/camel/v1alpha1/integration_types.go | 1 +
pkg/apis/camel/v1alpha1/integrationkit_types.go| 1 +
.../camel/v1alpha1/integrationplatform_types.go| 4 +-
pkg/controller/integration/build_kit.go| 6 +-
pkg/controller/integration/initialize.go | 2 +
pkg/controller/integration/monitor.go | 2 +
pkg/controller/integration/util.go | 3 +
pkg/controller/integrationkit/initialize.go| 2 +
pkg/controller/integrationplatform/initialize.go | 1 +
.../integrationplatform_controller.go | 1 +
.../monitor.go | 31 ++--
testing| Bin 0 -> 49965398 bytes
16 files changed, 318 insertions(+), 25 deletions(-)
diff --git a/e2e/test_support.go b/e2e/test_support.go
index 6d27b6e..4f5ada9 100644
--- a/e2e/test_support.go
+++ b/e2e/test_support.go
@@ -23,6 +23,8 @@ package e2e
import (
"context"
+ "errors"
+ "fmt"
"time"
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
@@ -35,6 +37,7 @@ import (
projectv1 "github.com/openshift/api/project/v1"
"github.com/spf13/cobra"
"io/ioutil"
+ appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -121,6 +124,16 @@ func integrationPodPhase(ns string, name string) func()
v1.PodPhase {
}
}
+func integrationPodImage(ns string, name string) func() string {
+ return func() string {
+ pod := integrationPod(ns, name)()
+ if pod == nil || len(pod.Spec.Containers) == 0 {
+ return ""
+ }
+ return pod.Spec.Containers[0].Image
+ }
+}
+
func integrationPod(ns string, name string) func() *v1.Pod {
return func() *v1.Pod {
lst := v1.PodList{
@@ -145,6 +158,86 @@ func integrationPod(ns string, name string) func() *v1.Pod
{
}
}
+func integration(ns string, name string) func() *v1alpha1.Integration {
+ return func() *v1alpha1.Integration {
+ it := v1alpha1.NewIntegration(ns, name)
+ key := k8sclient.ObjectKey{
+ Namespace: ns,
+ Name: name,
+ }
+ if err := testClient.Get(testContext, key, ); err != nil &&
!k8serrors.IsNotFound(err) {
+ panic(err)
+ } else if err != nil && k8serrors.IsNotFound(err) {
+ return nil
+ }
+ return
+ }
+}
+
+func integrationVersion(ns string, name string) func() string {
+ return func() string {
+ it := integration(ns, name)()
+ if it == nil {
+ return ""
+ }
+ return it.Status.Version
+ }
+}
+
+func setIntegrationVersion(ns string, name string, version string) error {
+ it := integration(ns, name)()
+ if it == nil {
+ return fmt.Errorf("no integration named %s found", name)
+ }
+ it.Status.Version = version
+ return testClient.Status().Update(testContext, it)
+}
+
+func setIntegrationPhase(ns string, name string, phase
v1alpha1.IntegrationPhase) error {
+ it := integration(ns, name)()
+ if it == nil {
+ return fmt.Errorf("no integration named %s found", name)
+ }
+ it.Status.Phase = phase
+ return testClient.Status().Update(testContext, it)
+}
+
+func kits(ns string) func() []v1alpha1.IntegrationKit {
+ return func() []v1alpha1.IntegrationKit {
+ lst := v1alpha1.NewIntegrationKitList()
+ opts := k8sclient.ListOptions{
+ Namespace: ns,
+ }
+ if err := testClient.List(testContext, , ); err != nil
{
+ panic(err)
+ }
+ return lst.Items
+ }
+}
+
+func kitsWithVersion(ns string, version string) func() int {
+ return func() int {
+ count := 0
+ for _, k := range kits(ns)() {
+ if k.Status.Version == version {
+ count++
+ }
+ }
+
[camel-k] 02/07: fix #692: add version to describe command
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit bca754de49c4efc8714bdf65d1945b992a60c68b
Author: nferraro
AuthorDate: Thu Jun 27 15:32:05 2019 +0200
fix #692: add version to describe command
---
pkg/cmd/describe_integration.go | 8 +---
pkg/cmd/describe_kit.go | 1 +
pkg/cmd/describe_platform.go| 1 +
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/pkg/cmd/describe_integration.go b/pkg/cmd/describe_integration.go
index 15bc77c..5d70cfd 100644
--- a/pkg/cmd/describe_integration.go
+++ b/pkg/cmd/describe_integration.go
@@ -36,9 +36,10 @@ func newDescribeIntegrationCmd(rootCmdOptions
*RootCmdOptions) *cobra.Command {
}
cmd := cobra.Command{
- Use: "integration",
- Short: "Describe an Integration",
- Long: `Describe an Integration.`,
+ Use: "integration",
+ Aliases: []string{"it"},
+ Short: "Describe an Integration",
+ Long:`Describe an Integration.`,
RunE: func(_ *cobra.Command, args []string) error {
if err := impl.validate(args); err != nil {
return err
@@ -96,6 +97,7 @@ func (command *describeIntegrationCommand)
describeIntegration(i v1alpha1.Integr
w.Write(0, "Camel Version:\t%s\n", i.Status.CamelVersion)
w.Write(0, "Kit:\t%s\n", i.Status.Kit)
w.Write(0, "Image:\t%s\n", i.Status.Image)
+ w.Write(0, "Version:\t%s\n", i.Status.Version)
if len(i.Spec.Configuration) > 0 {
w.Write(0, "Configuration:\n")
diff --git a/pkg/cmd/describe_kit.go b/pkg/cmd/describe_kit.go
index bc55a8b..d2afd7f 100644
--- a/pkg/cmd/describe_kit.go
+++ b/pkg/cmd/describe_kit.go
@@ -94,6 +94,7 @@ func (command *describeKitCommand) describeIntegrationKit(kit
v1alpha1.Integrati
w.Write(0, "Phase:\t%s\n", kit.Status.Phase)
w.Write(0, "Camel Version:\t%s\n", kit.Status.CamelVersion)
w.Write(0, "Image:\t%s\n", kit.Status.Image)
+ w.Write(0, "Version:\t%s\n", kit.Status.Version)
if len(kit.Status.Artifacts) > 0 {
w.Write(0, "Artifacts:\t\n")
diff --git a/pkg/cmd/describe_platform.go b/pkg/cmd/describe_platform.go
index b1e8f8c..a1b42c4 100644
--- a/pkg/cmd/describe_platform.go
+++ b/pkg/cmd/describe_platform.go
@@ -89,6 +89,7 @@ func (command *describePlatformCommand)
describeIntegrationPlatform(platform v1a
w := indentedwriter.NewWriter(out)
describeObjectMeta(w, platform.ObjectMeta)
w.Write(0, "Phase:\t%s\n", platform.Status.Phase)
+ w.Write(0, "Version:\t%s\n", platform.Status.Version)
w.Write(0, "Base Image:\t%s\n", platform.Spec.Build.BaseImage)
w.Write(0, "Camel Version:\t%s\n",
platform.Spec.Build.CamelVersion)
w.Write(0, "Local Repository:\t%s\n",
platform.Spec.Build.LocalRepository)
[camel-k] 05/07: fix #692: fix test
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 621b3ea3800b5deb013e367e0b6193d9450935f3
Author: nferraro
AuthorDate: Thu Jun 27 17:30:56 2019 +0200
fix #692: fix test
---
e2e/upgrade_test.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/e2e/upgrade_test.go b/e2e/upgrade_test.go
index 771a8ff..930a138 100644
--- a/e2e/upgrade_test.go
+++ b/e2e/upgrade_test.go
@@ -90,7 +90,7 @@ func TestIntegrationUpgrade(t *testing.T) {
Eventually(integrationVersion(ns,
"js")).Should(Equal(defaults.Version))
Eventually(kitsWithVersion(ns,
"an.older.one")).Should(Equal(1)) // old one is not recycled
Eventually(kitsWithVersion(ns,
defaults.Version)).Should(Equal(1))
- Eventually(integrationPodImage(ns,
"js")).ShouldNot(Equal(initialImage)) // rolling deployment triggered
+ Eventually(integrationPodImage(ns, "js"),
5*time.Minute).ShouldNot(Equal(initialImage)) // rolling deployment triggered
Eventually(integrationPodPhase(ns, "js"),
5*time.Minute).Should(Equal(v1.PodRunning))
})
}
[camel-k] 03/07: fix #692: add rebuild command and other options
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit aee4b4690d1e05d345ddd7832c6b2062a5a6524b
Author: nferraro
AuthorDate: Thu Jun 27 16:23:51 2019 +0200
fix #692: add rebuild command and other options
---
e2e/test_support.go | 40 +++-
e2e/upgrade_test.go | 9 +++--
pkg/cmd/rebuild.go | 106
pkg/cmd/reset.go| 26 +
pkg/cmd/root.go | 1 +
5 files changed, 162 insertions(+), 20 deletions(-)
diff --git a/e2e/test_support.go b/e2e/test_support.go
index 4f5ada9..8112dd1 100644
--- a/e2e/test_support.go
+++ b/e2e/test_support.go
@@ -193,15 +193,6 @@ func setIntegrationVersion(ns string, name string, version
string) error {
return testClient.Status().Update(testContext, it)
}
-func setIntegrationPhase(ns string, name string, phase
v1alpha1.IntegrationPhase) error {
- it := integration(ns, name)()
- if it == nil {
- return fmt.Errorf("no integration named %s found", name)
- }
- it.Status.Phase = phase
- return testClient.Status().Update(testContext, it)
-}
-
func kits(ns string) func() []v1alpha1.IntegrationKit {
return func() []v1alpha1.IntegrationKit {
lst := v1alpha1.NewIntegrationKitList()
@@ -250,6 +241,16 @@ func operatorImage(ns string) func() string {
}
}
+func operatorPodPhase(ns string) func() v1.PodPhase {
+ return func() v1.PodPhase {
+ pod := operatorPod(ns)()
+ if pod == nil {
+ return ""
+ }
+ return pod.Status.Phase
+ }
+}
+
func configmap(ns string, name string) func() *v1.ConfigMap {
return func() *v1.ConfigMap {
cm := v1.ConfigMap{
@@ -408,6 +409,24 @@ func scaleOperator(ns string, replicas int32) error {
Namespace testing functions
*/
+func numPods(ns string) func() int {
+ return func() int {
+ lst := v1.PodList{
+ TypeMeta: metav1.TypeMeta{
+ Kind: "Pod",
+ APIVersion: v1.SchemeGroupVersion.String(),
+ },
+ }
+ opts := k8sclient.ListOptions{
+ Namespace: ns,
+ }
+ if err := testClient.List(testContext, , ); err != nil
{
+ panic(err)
+ }
+ return len(lst.Items)
+ }
+}
+
func withNewTestNamespace(doRun func(string)) {
ns := newTestNamespace()
defer deleteTestNamespace(ns)
@@ -438,6 +457,9 @@ func deleteTestNamespace(ns metav1.Object) {
log.Error(err, "cannot delete test namespace", "name",
ns.GetName())
}
}
+
+ // Wait for all pods to be deleted
+ gomega.Eventually(numPods(ns.GetName()), 30 *
time.Second).Should(gomega.Equal(0))
}
func newTestNamespace() metav1.Object {
diff --git a/e2e/upgrade_test.go b/e2e/upgrade_test.go
index 1469e98..771a8ff 100644
--- a/e2e/upgrade_test.go
+++ b/e2e/upgrade_test.go
@@ -25,7 +25,6 @@ import (
"testing"
"time"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/util/defaults"
. "github.com/onsi/gomega"
v1 "k8s.io/api/core/v1"
@@ -79,9 +78,13 @@ func TestIntegrationUpgrade(t *testing.T) {
// Scale the operator up
Expect(scaleOperator(ns, 1)).Should(BeNil())
Eventually(operatorPod(ns)).ShouldNot(BeNil())
+ Eventually(operatorPodPhase(ns)).Should(Equal(v1.PodRunning))
- // Clear the integration phase
- Expect(setIntegrationPhase(ns, "js",
v1alpha1.IntegrationPhaseNone)).Should(BeNil())
+ // No auto-update expected
+ Consistently(integrationVersion(ns, "js"),
3*time.Second).Should(Equal("an.older.one"))
+
+ // Clear the integration status
+ Expect(kamel("rebuild", "js", "-n",
ns).Execute()).Should(BeNil())
// Check the integration version change
Eventually(integrationVersion(ns,
"js")).Should(Equal(defaults.Version))
diff --git a/pkg/cmd/rebuild.go b/pkg/cmd/rebuild.go
new file mode 100644
index 000..f062492
--- /dev/null
+++ b/pkg/cmd/rebuild.go
@@ -0,0 +1,106 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+
[camel-k] 06/07: fix #692: fix namespace deletion condition
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 72e6e6c9ceec1eac27947c818c48b4ea1553aa81
Author: nferraro
AuthorDate: Fri Jun 28 11:58:45 2019 +0200
fix #692: fix namespace deletion condition
---
e2e/test_support.go | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/e2e/test_support.go b/e2e/test_support.go
index 8112dd1..93c2742 100644
--- a/e2e/test_support.go
+++ b/e2e/test_support.go
@@ -420,8 +420,11 @@ func numPods(ns string) func() int {
opts := k8sclient.ListOptions{
Namespace: ns,
}
- if err := testClient.List(testContext, , ); err != nil
{
- panic(err)
+ if err := testClient.List(testContext, , ); err != nil
&& k8serrors.IsUnauthorized(err) {
+ return 0
+ } else if err != nil {
+ log.Error(err, "Error while listing the pods")
+ return 0
}
return len(lst.Items)
}
[camel-k] 07/07: fix lint
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 8d6fdda17b55269ba858c43294d7c05990fadea1
Author: nferraro
AuthorDate: Mon Jul 8 11:43:24 2019 +0200
fix lint
---
pkg/cmd/rebuild.go| 2 +-
pkg/controller/integrationplatform/monitor.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkg/cmd/rebuild.go b/pkg/cmd/rebuild.go
index f062492..25a55e8 100644
--- a/pkg/cmd/rebuild.go
+++ b/pkg/cmd/rebuild.go
@@ -94,7 +94,7 @@ func (o *rebuildCmdOptions) getIntegrations(c client.Client,
names []string) ([]
return ints, nil
}
-func (o *rebuildCmdOptions) rebuildIntegrations(c client.Client, integrations
[]v1alpha1.Integration) error {
+func (o *rebuildCmdOptions) rebuildIntegrations(c k8sclient.StatusClient,
integrations []v1alpha1.Integration) error {
for _, i := range integrations {
it := i
it.Status = v1alpha1.IntegrationStatus{}
diff --git a/pkg/controller/integrationplatform/monitor.go
b/pkg/controller/integrationplatform/monitor.go
index f8509e1..d1e5390 100644
--- a/pkg/controller/integrationplatform/monitor.go
+++ b/pkg/controller/integrationplatform/monitor.go
@@ -19,9 +19,9 @@ package integrationplatform
import (
"context"
- "github.com/apache/camel-k/pkg/util/defaults"
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/pkg/util/defaults"
)
// NewMonitorAction returns an action that monitors the integration platform
after it's fully initialized
[camel-k] branch master updated (efa72a4 -> 8d6fdda)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from efa72a4 fix: Nil pointer on build failure recovery
new 1a5ca8c fix #692: add version information to all resources
new bca754d fix #692: add version to describe command
new aee4b46 fix #692: add rebuild command and other options
new aec9f6f fix #692: fix lint
new 621b3ea fix #692: fix test
new 72e6e6c fix #692: fix namespace deletion condition
new 8d6fdda fix lint
The 7 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/test_support.go| 205 +
e2e/upgrade_test.go| 96 ++
go.mod | 4 +-
go.sum | 12 +-
pkg/apis/camel/v1alpha1/integration_types.go | 1 +
pkg/apis/camel/v1alpha1/integrationkit_types.go| 1 +
.../camel/v1alpha1/integrationplatform_types.go| 4 +-
pkg/cmd/describe_integration.go| 8 +-
pkg/cmd/describe_kit.go| 1 +
pkg/cmd/describe_platform.go | 1 +
pkg/cmd/rebuild.go | 106 +++
pkg/cmd/reset.go | 26 ++-
pkg/cmd/root.go| 1 +
pkg/controller/integration/build_kit.go| 6 +-
pkg/controller/integration/initialize.go | 2 +
pkg/controller/integration/monitor.go | 2 +
pkg/controller/integration/util.go | 3 +
pkg/controller/integrationkit/initialize.go| 2 +
pkg/controller/integrationplatform/initialize.go | 1 +
.../integrationplatform_controller.go | 1 +
.../monitor.go | 29 ++-
testing| Bin 0 -> 49965398 bytes
22 files changed, 478 insertions(+), 34 deletions(-)
create mode 100644 e2e/upgrade_test.go
create mode 100644 pkg/cmd/rebuild.go
copy pkg/controller/{integrationkit => integrationplatform}/monitor.go (57%)
create mode 100755 testing
[camel-website] branch asf-site updated: Website updated to ff38c0f
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 051a9f8 Website updated to ff38c0f 051a9f8 is described below commit 051a9f880bccf2cb97f0d6b690a67710306ab8a8 Author: jenkins AuthorDate: Mon Jul 8 10:03:17 2019 + Website updated to ff38c0f --- download/index.html| 2 +- sitemap-camel-k.xml| 42 +-- sitemap-components.xml | 776 - sitemap-manual.xml | 604 +++--- 4 files changed, 712 insertions(+), 712 deletions(-) diff --git a/download/index.html b/download/index.html index 96201d1..a684819 100644 --- a/download/index.html +++ b/download/index.html @@ -3,7 +3,7 @@
[camel-website] branch master updated: Moved 2.22.x last release to 2.22.5
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/master by this push: new e9100b8 Moved 2.22.x last release to 2.22.5 e9100b8 is described below commit e9100b8c52fcf18ce30e9db38cb687ddd99674ff Author: Andrea Cosentino AuthorDate: Mon Jul 8 11:58:49 2019 +0200 Moved 2.22.x last release to 2.22.5 --- content/download/_index.md | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/content/download/_index.md b/content/download/_index.md index 0830853..0374ff6 100644 --- a/content/download/_index.md +++ b/content/download/_index.md @@ -6,9 +6,9 @@ title: "Download" Grab these releases while they are hot! -* The latest release for Camel 2.24.x is [Camel 2.24.1 Release](/releases/release-2.24.1/). +* The latest release for Camel 2.24.x is [Camel 2.24.1 Release](/releases/release-2.24.1). * The latest release for Camel 2.23.x is [Camel 2.23.3 Release](/releases/release-2.23.3). -* The latest release for Camel 2.22.x is [Camel 2.22.3 Release](/releases/release-2.22.3). +* The latest release for Camel 2.22.x is [Camel 2.22.5 Release](/releases/release-2.22.5). * The latest release for Camel 2.21.x is [Camel 2.21.5 Release](/releases/release-2.21.5). * Camel versions 2.20.x and older are no longer actively developed. @@ -25,8 +25,8 @@ See [Download Archives](/releases/) |-|---||---|| | Windows Distribution (2.23.x branch) | [apache-camel-2.23.3.zip](http://www.apache.org/dyn/closer.lua?filename=camel/apache-camel/2.23.3/apache-camel-2.23.3.zip=download) | [apache-camel-2.23.3.zip.asc](https://www.apache.org/dist/camel/apache-camel/2.23.3/apache-camel-2.23.3.zip.asc) | [apache-camel-2.23.3.zip.md5](https://www.apache.org/dist/camel/apache-camel/2.23.3/apache-camel-2.23.3.zip.md5) | [apache-camel-2.23.3.zip.sha1](https://www.apache.org/dist/camel/apache-camel/2. [...] | Unix/Linux/Cygwin Distribution (2.23.x branch) | [apache-camel-2.23.3.tar.gz](http://www.apache.org/dyn/closer.lua?filename=camel/apache-camel/2.23.3/apache-camel-2.23.3.tar.gz=download) | [apache-camel-2.23.3.tar.gz.asc](https://www.apache.org/dist/camel/apache-camel/2.23.3/apache-camel-2.23.3.tar.gz.asc) | [apache-camel-2.23.3.tar.gz.md5](https://www.apache.org/dist/camel/apache-camel/2.23.3/apache-camel-2.23.3.tar.gz.md5) | [apache-camel-2.23.3.zip.sha1](https://www.apache.or [...] -| Windows Distribution (2.22.x branch) | [apache-camel-2.22.3.zip](http://www.apache.org/dyn/closer.lua?filename=camel/apache-camel/2.22.3/apache-camel-2.22.3.zip=download) | [apache-camel-2.22.3.zip.asc](https://www.apache.org/dist/camel/apache-camel/2.22.3/apache-camel-2.22.3.zip.asc) | [apache-camel-2.22.3.zip.md5](https://www.apache.org/dist/camel/apache-camel/2.22.3/apache-camel-2.22.3.zip.md5) | [apache-camel-2.22.3.zip.sha1](https://www.apache.org/dist/camel/apache-camel/2. [...] -| Unix/Linux/Cygwin Distribution (2.22.x branch) | [apache-camel-2.22.3.tar.gz](http://www.apache.org/dyn/closer.lua?filename=camel/apache-camel/2.22.3/apache-camel-2.22.3.tar.gz=download) | [apache-camel-2.22.3.tar.gz.asc](https://www.apache.org/dist/camel/apache-camel/2.22.3/apache-camel-2.22.3.tar.gz.asc) | [apache-camel-2.22.3.tar.gz.md5](https://www.apache.org/dist/camel/apache-camel/2.22.3/apache-camel-2.22.3.tar.gz.md5) | [apache-camel-2.22.3.zip.sha1](https://www.apache.or [...] +| Windows Distribution (2.22.x branch) | [apache-camel-2.22.5.zip](http://www.apache.org/dyn/closer.lua?filename=camel/apache-camel/2.22.5/apache-camel-2.22.5.zip=download) | [apache-camel-2.22.5.zip.asc](https://www.apache.org/dist/camel/apache-camel/2.22.5/apache-camel-2.22.5.zip.asc) | [apache-camel-2.22.5.zip.md5](https://www.apache.org/dist/camel/apache-camel/2.22.5/apache-camel-2.22.5.zip.md5) | [apache-camel-2.22.5.zip.sha1](https://www.apache.org/dist/camel/apache-camel/2. [...] +| Unix/Linux/Cygwin Distribution (2.22.x branch) | [apache-camel-2.22.5.tar.gz](http://www.apache.org/dyn/closer.lua?filename=camel/apache-camel/2.22.5/apache-camel-2.22.5.tar.gz=download) | [apache-camel-2.22.5.tar.gz.asc](https://www.apache.org/dist/camel/apache-camel/2.22.5/apache-camel-2.22.5.tar.gz.asc) | [apache-camel-2.22.5.tar.gz.md5](https://www.apache.org/dist/camel/apache-camel/2.22.5/apache-camel-2.22.5.tar.gz.md5) | [apache-camel-2.22.5.zip.sha1](https://www.apache.or [...] | Windows Distribution (2.21.x branch) | [apache-camel-2.21.5.zip](http://www.apache.org/dyn/closer.lua?filename=camel/apache-camel/2.21.5/apache-camel-2.21.5.zip=download) | [apache-camel-2.21.5.zip.asc](https://www.apache.org/dist/camel/apache-camel/2.21.5/apache-camel-2.21.5.zip.asc) |
[camel-website] branch master updated (319ee6a -> fb71b4b)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git. from 319ee6a Added API breaking to 2.22.0 release add 9a13bc9 Added release 2.22.1 add 2059567 Added 2.22.2 release add 0a0f2bc Added release 2.22.3 add e675bee Added release 2.22.4 add 7d0fb83 Added release 2.22.5 new fb71b4b Merge pull request #53 from apache/2.22.x-train The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: content/releases/release-2.22.1.md | 12 content/releases/release-2.22.2.md | 12 content/releases/release-2.22.3.md | 12 content/releases/release-2.22.4.md | 12 content/releases/release-2.22.5.md | 12 5 files changed, 60 insertions(+) create mode 100644 content/releases/release-2.22.1.md create mode 100644 content/releases/release-2.22.2.md create mode 100644 content/releases/release-2.22.3.md create mode 100644 content/releases/release-2.22.4.md create mode 100644 content/releases/release-2.22.5.md
[camel-website] branch 2.22.x-train deleted (was 7d0fb83)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch 2.22.x-train in repository https://gitbox.apache.org/repos/asf/camel-website.git. was 7d0fb83 Added release 2.22.5 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-website] 01/01: Merge pull request #53 from apache/2.22.x-train
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit fb71b4b037c9d57a60db42e6b3c629810f0afe50 Merge: 319ee6a 7d0fb83 Author: Andrea Cosentino AuthorDate: Mon Jul 8 11:55:55 2019 +0200 Merge pull request #53 from apache/2.22.x-train 2.22.x train content/releases/release-2.22.1.md | 12 content/releases/release-2.22.2.md | 12 content/releases/release-2.22.3.md | 12 content/releases/release-2.22.4.md | 12 content/releases/release-2.22.5.md | 12 5 files changed, 60 insertions(+)
[camel] branch master updated: Upgrade Joda-time to version 2.10.3
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 47eba02 Upgrade Joda-time to version 2.10.3 47eba02 is described below commit 47eba02dd1abf55932b51fcc0566051cebda2d18 Author: Andrea Cosentino AuthorDate: Mon Jul 8 11:50:36 2019 +0200 Upgrade Joda-time to version 2.10.3 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 43afa1d..8d6f22c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -393,7 +393,7 @@ 20030619 1.21 1.6.2 -2.10.1 +2.10.3 1.0.0-beta3 1.6.2 0.1.1
[camel-website] 05/05: Added release 2.22.5
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch 2.22.x-train in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 7d0fb839c76e25b3b7411faa681cc28fcc35d7c7 Author: Andrea Cosentino AuthorDate: Mon Jul 8 11:40:47 2019 +0200 Added release 2.22.5 --- content/releases/release-2.22.5.md | 12 1 file changed, 12 insertions(+) diff --git a/content/releases/release-2.22.5.md b/content/releases/release-2.22.5.md new file mode 100644 index 000..c606349 --- /dev/null +++ b/content/releases/release-2.22.5.md @@ -0,0 +1,12 @@ +--- +date: 2019-06-08 +draft: false +type: release-note +version: 2.22.5 +preview: "Minor update of the 2.22.x branch" +apiBreaking: "" +knownIssues: "" +jiraVersionId: 12345404 +--- + +This release is a minor update of the 2.22.x branch.
[camel-website] branch 2.22.x-train created (now 7d0fb83)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch 2.22.x-train in repository https://gitbox.apache.org/repos/asf/camel-website.git. at 7d0fb83 Added release 2.22.5 This branch includes the following new commits: new 9a13bc9 Added release 2.22.1 new 2059567 Added 2.22.2 release new 0a0f2bc Added release 2.22.3 new e675bee Added release 2.22.4 new 7d0fb83 Added release 2.22.5 The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel-website] 03/05: Added release 2.22.3
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch 2.22.x-train in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 0a0f2bc4369458d94fbdd0cac666c826c9b329e1 Author: Andrea Cosentino AuthorDate: Mon Jul 8 11:38:48 2019 +0200 Added release 2.22.3 --- content/releases/release-2.22.3.md | 12 1 file changed, 12 insertions(+) diff --git a/content/releases/release-2.22.3.md b/content/releases/release-2.22.3.md new file mode 100644 index 000..6892c76 --- /dev/null +++ b/content/releases/release-2.22.3.md @@ -0,0 +1,12 @@ +--- +date: 2019-01-19 +draft: false +type: release-note +version: 2.22.3 +preview: "Minor update of the 2.22.x branch" +apiBreaking: "" +knownIssues: "" +jiraVersionId: 12344398 +--- + +This release is a minor update of the 2.22.x branch.
[camel-website] 02/05: Added 2.22.2 release
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch 2.22.x-train
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 20595671b17764efd2887daac0815d66b30abd48
Author: Andrea Cosentino
AuthorDate: Mon Jul 8 11:37:30 2019 +0200
Added 2.22.2 release
---
content/releases/release-2.22.1.md| 2 +-
content/releases/{release-2.22.1.md => release-2.22.2.md} | 8
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/content/releases/release-2.22.1.md
b/content/releases/release-2.22.1.md
index 57c5b40..81706bb 100644
--- a/content/releases/release-2.22.1.md
+++ b/content/releases/release-2.22.1.md
@@ -9,4 +9,4 @@ knownIssues: ""
jiraVersionId: 12343346
---
-This release is a minor update of the 2.23.x branch.
+This release is a minor update of the 2.22.x branch.
diff --git a/content/releases/release-2.22.1.md
b/content/releases/release-2.22.2.md
similarity index 51%
copy from content/releases/release-2.22.1.md
copy to content/releases/release-2.22.2.md
index 57c5b40..7a6b584 100644
--- a/content/releases/release-2.22.1.md
+++ b/content/releases/release-2.22.2.md
@@ -1,12 +1,12 @@
---
-date: 2018-09-02
+date: 2018-11-01
draft: false
type: release-note
-version: 2.22.1
+version: 2.22.2
preview: "Minor update of the 2.22.x branch"
apiBreaking: ""
knownIssues: ""
-jiraVersionId: 12343346
+jiraVersionId: 12343751
---
-This release is a minor update of the 2.23.x branch.
+This release is a minor update of the 2.22.x branch.
[camel-website] 01/05: Added release 2.22.1
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch 2.22.x-train in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 9a13bc9dae79e25be4931ffc4662a3d2a8702ecf Author: Andrea Cosentino AuthorDate: Mon Jul 8 11:35:42 2019 +0200 Added release 2.22.1 --- content/releases/release-2.22.1.md | 12 1 file changed, 12 insertions(+) diff --git a/content/releases/release-2.22.1.md b/content/releases/release-2.22.1.md new file mode 100644 index 000..57c5b40 --- /dev/null +++ b/content/releases/release-2.22.1.md @@ -0,0 +1,12 @@ +--- +date: 2018-09-02 +draft: false +type: release-note +version: 2.22.1 +preview: "Minor update of the 2.22.x branch" +apiBreaking: "" +knownIssues: "" +jiraVersionId: 12343346 +--- + +This release is a minor update of the 2.23.x branch.
[camel-website] 04/05: Added release 2.22.4
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch 2.22.x-train in repository https://gitbox.apache.org/repos/asf/camel-website.git commit e675beed335191989c9bd10165e5e28154ca199a Author: Andrea Cosentino AuthorDate: Mon Jul 8 11:39:51 2019 +0200 Added release 2.22.4 --- content/releases/release-2.22.4.md | 12 1 file changed, 12 insertions(+) diff --git a/content/releases/release-2.22.4.md b/content/releases/release-2.22.4.md new file mode 100644 index 000..d420587 --- /dev/null +++ b/content/releases/release-2.22.4.md @@ -0,0 +1,12 @@ +--- +date: 2019-04-07 +draft: false +type: release-note +version: 2.22.4 +preview: "Minor update of the 2.22.x branch" +apiBreaking: "" +knownIssues: "" +jiraVersionId: 12344887 +--- + +This release is a minor update of the 2.22.x branch.
[camel-website] branch asf-site updated: Website updated to 9acf581
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/asf-site by this push: new ba5769a Website updated to 9acf581 ba5769a is described below commit ba5769a041b3bdccad26149825351bb738f7f63e Author: jenkins AuthorDate: Mon Jul 8 09:23:25 2019 + Website updated to 9acf581 --- releases/release-2.22.0/index.html | 2 +- sitemap-camel-k.xml| 42 +- sitemap-components.xml | 776 ++--- sitemap-manual.xml | 604 ++--- 4 files changed, 712 insertions(+), 712 deletions(-) diff --git a/releases/release-2.22.0/index.html b/releases/release-2.22.0/index.html index 250fd9b..2cc7345 100644 --- a/releases/release-2.22.0/index.html +++ b/releases/release-2.22.0/index.html @@ -3,7 +3,7 @@
[camel-website] branch master updated: Added API breaking to 2.22.0 release
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/master by this push: new 319ee6a Added API breaking to 2.22.0 release 319ee6a is described below commit 319ee6a41765639ad92393601a6c9b4f1eb33d9b Author: Andrea Cosentino AuthorDate: Mon Jul 8 11:18:31 2019 +0200 Added API breaking to 2.22.0 release --- content/releases/release-2.22.0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/releases/release-2.22.0.md b/content/releases/release-2.22.0.md index d186cf3..9cf647a 100644 --- a/content/releases/release-2.22.0.md +++ b/content/releases/release-2.22.0.md @@ -4,7 +4,7 @@ draft: false type: release-note version: 2.22.0 preview: "Major release for 2.22.x" -apiBreaking: "" +apiBreaking: "The RestProducerFactory has an API change where the RestConfiguration is provided as parameter as well." knownIssues: "" jiraVersionId: 12342707 ---
[camel-website] branch asf-site updated: Website updated to f435867
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 9acf581 Website updated to f435867 9acf581 is described below commit 9acf581e8be043a69d7f3d520c502e6b95ac0110 Author: jenkins AuthorDate: Mon Jul 8 09:13:18 2019 + Website updated to f435867 --- index.xml | 4 +- releases/index.html| 2 +- releases/index.xml | 4 +- releases/release-2.22.0/index.html | 16 + sitemap-camel-k.xml| 42 +- sitemap-components.xml | 776 ++--- sitemap-manual.xml | 604 ++--- 7 files changed, 734 insertions(+), 714 deletions(-) diff --git a/index.xml b/index.xml index 3563864..43bdc6d 100644 --- a/index.xml +++ b/index.xml @@ -1,7 +1,9 @@ http://www.w3.org/2005/Atom;>Apache Camelhttps://camel.apache.org/Recent content on Apache CamelHugo -- gohugo.ioen-usThu, 20 Jun 2019 00:00:00 +https://camel.apache.org/index.xml; rel="self" type="application/rss+xml"/>https: [...] The artifacts are published and ready for you to download either from the Apache mirrors or from the Central Maven repository. For more details please take a look at the release notes. Many thanks to all who made this release possible.Apache Camel Security Advisory - CVE-2019-0194https://camel.apache.org/security/CVE-2019-0194.htmlTue, 30 Apr 2019 18:29:00 +https://camel.apache.org/security/CVE-2019-0194.htmlThe JIRA ticket: https://issues.apache.org/jira/browse/CAMEL-13042 refers to the various commits that resovoled the issue, and have more details.Apache Camel Security Advisory - CVE-2018-8041https://camel.apache.org/secur [...] +Upgraded to Spring Boot 2.1. Additional component level options can now be configured via spring-boot auto-configuration and these options is included in spring-boot component metadata json file descriptor for tooling assistance. Added section with all the spring boot auto configuration options for all the components, data-formats and languages to the documentation.Apache Camel Security Advisory - CVE-2018-8041https://camel.apache.org/secur [...] +This release supports only Spring Boot 2. Spring Boot v1 is no longer supported. +Camel has upgraded from Spring Boot v1 to v2 and therefore v1 is no longer supported. Upgraded to Spring Framework 5. Camel should work with Spring 4.3.x as well, but going forward Spring 5.x will be the minimum Spring version in future releases.Apache Camel Security Advisory - CVE-2017-12633https://camel.apache.org/security/CVE-2017-12633.htmlWed, 15 Nov 2017 10:29:00 +https://camel.apache.org/security/C [...] The JIRA ticket: https://issues.apache.org/jira/browse/CAMEL-9309 refers to the various commits that resovoled the issue.Apache Camel Security Advisory - CVE-2015-5344https://camel.apache.org/security/CVE-2015-5344.htmlWed, 03 Feb 2016 13:59:00 +https://camel.apache.org/security/CVE-2015-5344.htmlThe JIRA ticket: https://issues.apache.org/jira/browse/CAMEL-9297 refers to the various co [...] A related xstream de-serialization vulnerability was recently reported for Apache ActiveMQ: http://activemq.apache.org/security-advisories.data/CVE-2015-5254-announcement.txt?version=1amp;modificationDate=1449589734000amp;api=v2Apache Camel Security Advisory - CVE-2015-0264https://camel.apache.org/security/CVE-2015-0264.htmlWed, 03 Jun 2015 16:59:04 +https://camel.apache.org/security/CVE-2015-02 [...] lt;routegt; lt;from uri=quot;servlet:///helloquot;/gt; lt;to uri=quot;xslt:file:/tmp/transform.xslquot; /gt; lt;to uri=quot;file:/tmp/outputquot; /gt; lt;/routegt; If an attacker is able to submit a message to this route, they can provide a message that is an XML document containing external entities. These entities will be resolved, and their contents included in the output of the transformation performed by [...] diff --git a/releases/index.html b/releases/index.html index 66e0de3..4a9be49 100644 --- a/releases/index.html +++ b/releases/index.html @@ -3,4 +3,4 @@
[camel-website] branch 2.22.0 deleted (was 3e7c61f)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch 2.22.0 in repository https://gitbox.apache.org/repos/asf/camel-website.git. was 3e7c61f Added release 2.22.0 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-website] branch master updated (d09a292 -> 133383d)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git. from d09a292 Merge pull request #51 from apache/release-2.23.x-train add 3e7c61f Added release 2.22.0 new 133383d Merge pull request #52 from apache/2.22.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: content/releases/release-2.22.0.md | 37 + 1 file changed, 37 insertions(+) create mode 100644 content/releases/release-2.22.0.md
[camel-website] 01/01: Merge pull request #52 from apache/2.22.0
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 133383df545207cb3867d83c4b142cd1cae0e7cd Merge: d09a292 3e7c61f Author: Andrea Cosentino AuthorDate: Mon Jul 8 11:09:20 2019 +0200 Merge pull request #52 from apache/2.22.0 Added release 2.22.0 content/releases/release-2.22.0.md | 37 + 1 file changed, 37 insertions(+)
[camel-website] branch 2.22.0 updated (ccc65a1 -> 3e7c61f)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch 2.22.0 in repository https://gitbox.apache.org/repos/asf/camel-website.git. discard ccc65a1 Added release 2.22.0 new 3e7c61f Added release 2.22.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ccc65a1) \ N -- N -- N refs/heads/2.22.0 (3e7c61f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: content/releases/release-2.22.0.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
[camel-website] 01/01: Added release 2.22.0
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch 2.22.0 in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 3e7c61fb00be6e41444d9c2e0b93314e149394c8 Author: Andrea Cosentino AuthorDate: Mon Jul 8 11:06:10 2019 +0200 Added release 2.22.0 --- content/releases/release-2.22.0.md | 37 + 1 file changed, 37 insertions(+) diff --git a/content/releases/release-2.22.0.md b/content/releases/release-2.22.0.md new file mode 100644 index 000..d186cf3 --- /dev/null +++ b/content/releases/release-2.22.0.md @@ -0,0 +1,37 @@ +--- +date: 2018-06-29 +draft: false +type: release-note +version: 2.22.0 +preview: "Major release for 2.22.x" +apiBreaking: "" +knownIssues: "" +jiraVersionId: 12342707 +--- + +Welcome to the 2.22.0 release which resolved 216 issues including new features, improvements and bug fixes. + +This release supports only Spring Boot 2. Spring Boot v1 is no longer supported. + +* Camel has upgraded from Spring Boot v1 to v2 and therefore v1 is no longer supported. +* Upgraded to Spring Framework 5. Camel should work with Spring 4.3.x as well, but going forward Spring 5.x will be the minimum Spring version in future releases. +* Upgraded to Karaf 4.2. You may run Camel on Karaf 4.1 but we only officially support Karaf 4.2 in this release. +* Optimised using toD DSL to reuse endpoints and producers for components where its possible. For example HTTP based components will now reuse producer (http clients) with dynamic uris sending to the same host. See more details in the toD documentation. +* The File2 consumer with read-lock idempotent/idempotent-changed can now be configured to delay the release tasks to expand the window when a file is regarded as in-process, which is usable in active/active cluster settings with a shared idempotent repository to ensure other nodes dont too quickly see a processed file as a file they can process (only needed if you have readLockRemoveOnCommit=true). +* Allow to plugin a custom request/reply correlation id manager implementation on Netty4 producer in request/reply mode. +The Twitter component now uses extended mode by default to support tweets > 140 characters +* Rest DSL producer now supports being configured in rest configuration via endpointProperties. +* The Kafka component now supports HeaderFilterStrategy to plugin custom implementations for controlling header mappings between Camel and Kafka messages. +* Rest DSL now supports client request validation to validate that Content-Type/Accept headers is possible for the rest service. +* Camel has now a Service Registry SPI which allow to register routes to a service registry such as consul, etcd, zookeeper using a Camel implementation or Spring Cloud +* The SEDA component now has a default queue size of 1000 instead of unlimited. +And these important fixes: + +* Fixed a CXF continuation timeout issue with camel-cxf consumer could cause the consumer to return a response with data instead of triggering a timeout to the calling SOAP client. +* Fixed camel-cxf consumer doesn't release UoW when using robust oneway operation +* Fixed using AdviceWith and using weave methods on onException etc. not working. +* Fixed Splitter in parallel processing and streaming mode may block, while iterating message body when the iterator throws exception in first invoked next() method call. +* Fixed Kafka consumer to not auto commit if autoCommitEnable=false. +* Fixed file consumer was using markerFile as read-lock by default, which should have been none. +* Fixed using manual commit with Kafka to provide the current record offset and not the previous (and -1 for first) +* Fixed Content Based Router in Java DSL may not resolve property placeholders in when predicates
[camel-website] 01/01: Added release 2.22.0
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch 2.22.0 in repository https://gitbox.apache.org/repos/asf/camel-website.git commit ccc65a1dc1cb91e27d9ca711ce5d1cbac65a3373 Author: Andrea Cosentino AuthorDate: Mon Jul 8 11:06:10 2019 +0200 Added release 2.22.0 --- content/releases/release-2.22.0.md | 38 ++ 1 file changed, 38 insertions(+) diff --git a/content/releases/release-2.22.0.md b/content/releases/release-2.22.0.md new file mode 100644 index 000..1c0a1dd --- /dev/null +++ b/content/releases/release-2.22.0.md @@ -0,0 +1,38 @@ +--- +date: 2018-06-29 +draft: false +type: release-note +version: 2.22.0 +preview: "Major release for 2.22.x" +apiBreaking: "The HttpBinding interface has new methods for setting fileNameExtWhiteList option. The copy, copyFrom methods on org.apache.camel.Message now also copy over reference to the +exchange" +knownIssues: "" +jiraVersionId: 12342707 +--- + +Welcome to the 2.22.0 release which resolved 216 issues including new features, improvements and bug fixes. + +This release supports only Spring Boot 2. Spring Boot v1 is no longer supported. + +* Camel has upgraded from Spring Boot v1 to v2 and therefore v1 is no longer supported. +* Upgraded to Spring Framework 5. Camel should work with Spring 4.3.x as well, but going forward Spring 5.x will be the minimum Spring version in future releases. +* Upgraded to Karaf 4.2. You may run Camel on Karaf 4.1 but we only officially support Karaf 4.2 in this release. +* Optimised using toD DSL to reuse endpoints and producers for components where its possible. For example HTTP based components will now reuse producer (http clients) with dynamic uris sending to the same host. See more details in the toD documentation. +* The File2 consumer with read-lock idempotent/idempotent-changed can now be configured to delay the release tasks to expand the window when a file is regarded as in-process, which is usable in active/active cluster settings with a shared idempotent repository to ensure other nodes dont too quickly see a processed file as a file they can process (only needed if you have readLockRemoveOnCommit=true). +* Allow to plugin a custom request/reply correlation id manager implementation on Netty4 producer in request/reply mode. +The Twitter component now uses extended mode by default to support tweets > 140 characters +* Rest DSL producer now supports being configured in rest configuration via endpointProperties. +* The Kafka component now supports HeaderFilterStrategy to plugin custom implementations for controlling header mappings between Camel and Kafka messages. +* Rest DSL now supports client request validation to validate that Content-Type/Accept headers is possible for the rest service. +* Camel has now a Service Registry SPI which allow to register routes to a service registry such as consul, etcd, zookeeper using a Camel implementation or Spring Cloud +* The SEDA component now has a default queue size of 1000 instead of unlimited. +And these important fixes: + +* Fixed a CXF continuation timeout issue with camel-cxf consumer could cause the consumer to return a response with data instead of triggering a timeout to the calling SOAP client. +* Fixed camel-cxf consumer doesn't release UoW when using robust oneway operation +* Fixed using AdviceWith and using weave methods on onException etc. not working. +* Fixed Splitter in parallel processing and streaming mode may block, while iterating message body when the iterator throws exception in first invoked next() method call. +* Fixed Kafka consumer to not auto commit if autoCommitEnable=false. +* Fixed file consumer was using markerFile as read-lock by default, which should have been none. +* Fixed using manual commit with Kafka to provide the current record offset and not the previous (and -1 for first) +* Fixed Content Based Router in Java DSL may not resolve property placeholders in when predicates
[camel-website] branch 2.22.0 created (now ccc65a1)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch 2.22.0 in repository https://gitbox.apache.org/repos/asf/camel-website.git. at ccc65a1 Added release 2.22.0 This branch includes the following new commits: new ccc65a1 Added release 2.22.0 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-website] branch asf-site updated: Website updated to de1eb36
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/asf-site by this push: new f435867 Website updated to de1eb36 f435867 is described below commit f435867cdd466933fcc94c04985587fd8e7e658e Author: jenkins AuthorDate: Mon Jul 8 09:05:28 2019 + Website updated to de1eb36 --- index.xml | 2 +- releases/index.html| 2 +- releases/index.xml | 2 +- releases/release-2.23.1/index.html | 16 + releases/release-2.23.2/index.html | 16 + sitemap-camel-k.xml| 42 +- sitemap-components.xml | 776 ++--- sitemap-manual.xml | 604 ++--- 8 files changed, 746 insertions(+), 714 deletions(-) diff --git a/index.xml b/index.xml index 5574079..3563864 100644 --- a/index.xml +++ b/index.xml @@ -1,6 +1,6 @@ http://www.w3.org/2005/Atom;>Apache Camelhttps://camel.apache.org/Recent content on Apache CamelHugo -- gohugo.ioen-usThu, 20 Jun 2019 00:00:00 +https://camel.apache.org/index.xml; rel="self" type="application/rss+xml"/>https: [...] The artifacts are published and ready for you to download either from the Apache mirrors or from the Central Maven repository. For more details please take a look at the release notes. -Many thanks to all who made this release possible.Apache Camel Security Advisory - CVE-2019-0194https://camel.apache.org/security/CVE-2019-0194.htmlTue, 30 Apr 2019 18:29:00 +https://camel.apache.org/security/CVE-2019-0194.htmlThe JIRA ticket: https://issues.apache.org/jira/browse/CAMEL-13042 refers to the various commits that resovoled the issue, and have more details.Apache Camel Security Advisory - CVE-2019-0194https://camel.apache.org/security/CVE-2019-0194.htmlTue, 30 Apr 2019 18:29:00 +https://camel.apache.org/security/CVE-2019-0194.htmlThe JIRA ticket: https://issues.apache.org/jira/browse/CAMEL-13042 refers to the various commits that resovoled the issue, and have more details.Apache Camel Security Advisory - CVE-2018-8041https://camel.apache.org/secur [...] The JIRA ticket: https://issues.apache.org/jira/browse/CAMEL-9309 refers to the various commits that resovoled the issue.Apache Camel Security Advisory - CVE-2015-5344https://camel.apache.org/security/CVE-2015-5344.htmlWed, 03 Feb 2016 13:59:00 +https://camel.apache.org/security/CVE-2015-5344.htmlThe JIRA ticket: https://issues.apache.org/jira/browse/CAMEL-9297 refers to the various co [...] A related xstream de-serialization vulnerability was recently reported for Apache ActiveMQ: http://activemq.apache.org/security-advisories.data/CVE-2015-5254-announcement.txt?version=1amp;modificationDate=1449589734000amp;api=v2Apache Camel Security Advisory - CVE-2015-0264https://camel.apache.org/security/CVE-2015-0264.htmlWed, 03 Jun 2015 16:59:04 +https://camel.apache.org/security/CVE-2015-02 [...] diff --git a/releases/index.html b/releases/index.html index 88b7f05..66e0de3 100644 --- a/releases/index.html +++ b/releases/index.html @@ -3,4 +3,4 @@
[camel-website] branch release-2.23.x-train deleted (was 73a5034)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch release-2.23.x-train in repository https://gitbox.apache.org/repos/asf/camel-website.git. was 73a5034 Added release 2.23.2 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-website] branch master updated (2743d30 -> d09a292)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-website.git.
from 2743d30 errors reduced 84 to 80
add de92e55 Added 2.23.1 release
add 73a5034 Added release 2.23.2
new d09a292 Merge pull request #51 from apache/release-2.23.x-train
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
content/releases/{release-2.23.3.md => release-2.23.1.md} | 6 +++---
content/releases/{release-2.23.3.md => release-2.23.2.md} | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
copy content/releases/{release-2.23.3.md => release-2.23.1.md} (75%)
copy content/releases/{release-2.23.3.md => release-2.23.2.md} (75%)
[camel-website] 01/01: Merge pull request #51 from apache/release-2.23.x-train
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git commit d09a2926e5ac1e8afcfc47bb0436f0017b20a31d Merge: 2743d30 73a5034 Author: Andrea Cosentino AuthorDate: Mon Jul 8 11:01:55 2019 +0200 Merge pull request #51 from apache/release-2.23.x-train Release 2.23.x train content/releases/release-2.23.1.md | 12 content/releases/release-2.23.2.md | 12 2 files changed, 24 insertions(+)
[camel-website] 02/02: Added release 2.23.2
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch release-2.23.x-train in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 73a5034a10ad7766ade451682e699365cab54308 Author: Andrea Cosentino AuthorDate: Mon Jul 8 10:55:27 2019 +0200 Added release 2.23.2 --- content/releases/release-2.23.2.md | 12 1 file changed, 12 insertions(+) diff --git a/content/releases/release-2.23.2.md b/content/releases/release-2.23.2.md new file mode 100644 index 000..a5b0f7b --- /dev/null +++ b/content/releases/release-2.23.2.md @@ -0,0 +1,12 @@ +--- +date: 2019-04-06 +draft: false +type: release-note +version: 2.23.2 +preview: "Minor update of the 2.23.x branch" +apiBreaking: "" +knownIssues: "" +jiraVersionId: 12344839 +--- + +This release is a minor update of the 2.23.x branch.
[camel-website] 01/02: Added 2.23.1 release
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch release-2.23.x-train in repository https://gitbox.apache.org/repos/asf/camel-website.git commit de92e55e08b7532a14981663f042e2c3c6adccdf Author: Andrea Cosentino AuthorDate: Mon Jul 8 10:54:20 2019 +0200 Added 2.23.1 release --- content/releases/release-2.23.1.md | 12 1 file changed, 12 insertions(+) diff --git a/content/releases/release-2.23.1.md b/content/releases/release-2.23.1.md new file mode 100644 index 000..fa690aa --- /dev/null +++ b/content/releases/release-2.23.1.md @@ -0,0 +1,12 @@ +--- +date: 2019-01-12 +draft: false +type: release-note +version: 2.23.1 +preview: "Minor update of the 2.23.x branch" +apiBreaking: "" +knownIssues: "" +jiraVersionId: 12344567 +--- + +This release is a minor update of the 2.23.x branch.
[camel-website] branch release-2.23.x-train created (now 73a5034)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch release-2.23.x-train in repository https://gitbox.apache.org/repos/asf/camel-website.git. at 73a5034 Added release 2.23.2 This branch includes the following new commits: new de92e55 Added 2.23.1 release new 73a5034 Added release 2.23.2 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.
[camel] branch master updated: Upgrade Testcontainers to version 1.11.4
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 3648637 Upgrade Testcontainers to version 1.11.4 3648637 is described below commit 36486379ab24220c492bbf2b45b257e1883db78d Author: Andrea Cosentino AuthorDate: Mon Jul 8 10:40:45 2019 +0200 Upgrade Testcontainers to version 1.11.4 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 840ed85..43afa1d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -675,7 +675,7 @@ 1.2.1_1 1.2.1 1.0.0 -1.11.3 +1.11.4 6.14.2 2.1.1 1.21
[camel-website] 01/04: fix for external link errors, and dropdown navbar-link menu items were set to unclickable
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 7887eeaa07f86494ce2555320cc4b0c6735b75cd
Author: nayananga@acerubuntu18.04
AuthorDate: Sun Jul 7 10:51:29 2019 +0530
fix for external link errors, and dropdown navbar-link menu items were set
to unclickable
---
antora-ui-camel/src/partials/header-content.hbs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/antora-ui-camel/src/partials/header-content.hbs
b/antora-ui-camel/src/partials/header-content.hbs
index 60fd97d..2f32bf8 100644
--- a/antora-ui-camel/src/partials/header-content.hbs
+++ b/antora-ui-camel/src/partials/header-content.hbs
@@ -14,14 +14,14 @@
{{#each @items}}
{{#if children}}
-{{name}}
+{{name}}
{{else}}
- {{name}}
+ {{name}}
{{/if}}
{{#if children}}
{{#each children}}
-{{name}}
+{{name}}
{{/each}}
{{/if}}
[camel-website] 02/04: reduce errors 545 to 201
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit c7ce9f17a18c79eeb2617062c123140359c5b8bd
Author: nayananga@acerubuntu18.04
AuthorDate: Sun Jul 7 11:26:49 2019 +0530
reduce errors 545 to 201
---
antora-ui-camel/src/partials/header-content.hbs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/antora-ui-camel/src/partials/header-content.hbs
b/antora-ui-camel/src/partials/header-content.hbs
index 2f32bf8..5451546 100644
--- a/antora-ui-camel/src/partials/header-content.hbs
+++ b/antora-ui-camel/src/partials/header-content.hbs
@@ -16,12 +16,12 @@
{{name}}
{{else}}
- {{name}}
+ {{name}}
{{/if}}
{{#if children}}
{{#each children}}
-{{name}}
+{{name}}
{{/each}}
{{/if}}
[camel-website] 04/04: errors reduced 84 to 80
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 2743d3013e08f52fde1b447a8663e89fabe7f355
Author: nayananga@acerubuntu18.04
AuthorDate: Mon Jul 8 07:46:46 2019 +0530
errors reduced 84 to 80
---
content/community/mailing-list.md | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/content/community/mailing-list.md
b/content/community/mailing-list.md
index b6a9f09..b0e8a96 100644
--- a/content/community/mailing-list.md
+++ b/content/community/mailing-list.md
@@ -17,10 +17,10 @@ When posting to the mailing lists, use plain text mails. Do
not use HTML mails.
{{< bootstrap-table "table table-hover text-left" >}}
| List Name | Address | Subscribe | Unsubscribe | Archive | Nabble (Online
Forums) | Comment |
||-|---|-|-||-|
-| Camel User List | us...@camel.apache.org |
[subscribe](us...@camel.apache.org) | [unsubscribe](us...@camel.apache.org) |
[Archives](http://mail-archives.apache.org/mod_mbox/camel-users/) |
[Nabble](http://camel.465427.n5.nabble.com/Camel-Users-f465428.html) | Use this
list for your Camel questions. |
-| Camel Developer List | d...@camel.apache.org |
[subscribe](d...@camel.apache.org) | [unsubscribe](d...@camel.apache.org) |
[Archives](http://mail-archives.apache.org/mod_mbox/camel-dev/) |
[Nabble](http://camel.465427.n5.nabble.com/Camel-Development-f479097.html) | |
-| Camel Commits List | commits@camel.apache.org |
[subscribe](commits@camel.apache.org) | [unsubscribe](commits@camel.apache.org)
| [Archives](http://mail-archives.apache.org/mod_mbox/camel-commits/) |
[Nabble](http://camel.465427.n5.nabble.com/Camel-Commits-f498405.html) | |
-| Camel Issues List | iss...@camel.apache.org |
[subscribe](iss...@camel.apache.org) | [unsubscribe](iss...@camel.apache.org) |
[Archives](http://mail-archives.apache.org/mod_mbox/camel-issues/) | | |
+| Camel User List | us...@camel.apache.org |
[subscribe](mailto:us...@camel.apache.org) |
[unsubscribe](mailto:us...@camel.apache.org) |
[Archives](http://mail-archives.apache.org/mod_mbox/camel-users/) |
[Nabble](http://camel.465427.n5.nabble.com/Camel-Users-f465428.html) | Use this
list for your Camel questions. |
+| Camel Developer List | d...@camel.apache.org |
[subscribe](mailto:d...@camel.apache.org) |
[unsubscribe](mailto:d...@camel.apache.org) |
[Archives](http://mail-archives.apache.org/mod_mbox/camel-dev/) |
[Nabble](http://camel.465427.n5.nabble.com/Camel-Development-f479097.html) | |
+| Camel Commits List | commits@camel.apache.org |
[subscribe](mailto:commits@camel.apache.org) |
[unsubscribe](mailto:commits@camel.apache.org) |
[Archives](http://mail-archives.apache.org/mod_mbox/camel-commits/) |
[Nabble](http://camel.465427.n5.nabble.com/Camel-Commits-f498405.html) | |
+| Camel Issues List | iss...@camel.apache.org |
[subscribe](mailto:iss...@camel.apache.org) |
[unsubscribe](mailto:iss...@camel.apache.org) |
[Archives](http://mail-archives.apache.org/mod_mbox/camel-issues/) | | |
{{< /bootstrap-table >}}
There were various discussions before these mailing lists were setup on the
ActiveMQ Mailing Lists such as these
[threads](http://www.nabble.com/forum/Search.jtp?forum=2354=y=%5Bcamel%5D)
[camel-website] 03/04: reduced errors 201 to 84
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 4b1feb4b1911e6266320029f53fa29ee9c297ec9
Author: nayananga@acerubuntu18.04
AuthorDate: Mon Jul 8 03:09:35 2019 +0530
reduced errors 201 to 84
---
antora-ui-camel/src/partials/header-content.hbs | 8 ++--
menu.js | 9 +
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/antora-ui-camel/src/partials/header-content.hbs
b/antora-ui-camel/src/partials/header-content.hbs
index 5451546..cb58ecb 100644
--- a/antora-ui-camel/src/partials/header-content.hbs
+++ b/antora-ui-camel/src/partials/header-content.hbs
@@ -14,14 +14,18 @@
{{#each @items}}
{{#if children}}
-{{name}}
+ {{name}}
{{else}}
- {{name}}
+ {{name}}
{{/if}}
{{#if children}}
{{#each children}}
+{{#hasPrefix url }}
{{name}}
+{{else}}
+{{name}}
+{{/hasPrefix}}
{{/each}}
{{/if}}
diff --git a/menu.js b/menu.js
index 1801200..25844a8 100644
--- a/menu.js
+++ b/menu.js
@@ -25,3 +25,12 @@ Handlebars.registerHelper('withMenuData', (options) => {
});
});
+Handlebars.registerHelper('hasPrefix', function(str, options) {
+ str = Handlebars.Utils.escapeExpression(str);
+ var matches = new RegExp(/http\S+/);
+ if (matches.test(str)) {
+return options.fn(this);
+ }else {
+return options.inverse(this);
+ }
+});
[camel-website] branch master updated (ea7a838 -> 2743d30)
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git. from ea7a838 Fixed 2.23.0 release new 7887eea fix for external link errors, and dropdown navbar-link menu items were set to unclickable new c7ce9f1 reduce errors 545 to 201 new 4b1feb4 reduced errors 201 to 84 new 2743d30 errors reduced 84 to 80 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: antora-ui-camel/src/partials/header-content.hbs | 6 +- content/community/mailing-list.md | 8 menu.js | 9 + 3 files changed, 18 insertions(+), 5 deletions(-)
[camel] branch master updated: Regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 64e3432 Regen 64e3432 is described below commit 64e3432a9d38419ab254b0dd644f398e50be60e7 Author: Andrea Cosentino AuthorDate: Mon Jul 8 08:52:40 2019 +0200 Regen --- .../src/main/docs/rest-swagger-component.adoc | 2 +- components/readme.adoc | 10 -- docs/components/modules/ROOT/pages/rest-swagger-component.adoc | 6 +++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc b/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc index 96d2b8f..0001a2e 100644 --- a/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc +++ b/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc @@ -171,7 +171,7 @@ The component supports 11 options, which are listed below. | *camel.component.rest-swagger.host* | Scheme hostname and port to direct the HTTP requests to in the form of https://hostname:port. Can be configured at the endpoint, component or in the correspoding REST configuration in the Camel Context. If you give this component a name (e.g. petstore) that REST configuration is consulted first, rest-swagger next, and global configuration last. If set overrides any value found in the Swagger specification, RestConfiguration. Can be overridden in en [...] | *camel.component.rest-swagger.produces* | What payload type this component is producing. For example application/json according to the RFC7231. This equates to the value of Content-Type HTTP header. If set overrides any value present in the Swagger specification. Can be overridden in endpoint configuration. | | String | *camel.component.rest-swagger.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean -| *camel.component.rest-swagger.specification-uri* | Path to the Swagger specification file. The scheme, host base path are taken from this specification, but these can be overriden with properties on the component or endpoint level. If not given the component tries to load swagger.json resource. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. \https://api.example.com:8080). Can [...] +| *camel.component.rest-swagger.specification-uri* | Path to the Swagger specification file. The scheme, host base path are taken from this specification, but these can be overriden with properties on the component or endpoint level. If not given the component tries to load swagger.json resource. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. https://api.example.com:8080). Can [...] | *camel.component.rest-swagger.ssl-context-parameters* | Customize TLS parameters used by the component. If not set defaults to the TLS parameters set in the Camel context. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String | *camel.component.rest-swagger.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean |=== diff --git a/components/readme.adoc b/components/readme.adoc index 46a0527..037831b 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -1007,7 +1007,7 @@ Number of Data Formats: 45 in 37 JAR artifacts (0 deprecated) Expression Languages // languages: START -Number of Languages: 16 in 10 JAR artifacts (0 deprecated) +Number of Languages: 17 in 11 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -1041,6 +1041,8 @@ Number of Languages: 16 in 10 JAR artifacts (0 deprecated) | link:camel-base/src/main/docs/tokenize-language.adoc[Tokenize] (camel-base) | 2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates. +| link:camel-jaxp/src/main/docs/xtokenize-language.adoc[XML Tokenize] (camel-jaxp) | 2.14 | To use Camel message body or header with a XML tokenizer in Camel expressions or predicates. + | link:camel-xpath/src/main/docs/xpath-language.adoc[XPath] (camel-xpath) | 1.1 | To use XPath (XML) in Camel expressions or predicates. | link:camel-saxon/src/main/docs/xquery-language.adoc[XQuery] (camel-saxon) | 1.0 | To use XQuery (XML) in Camel expressions or predicates. @@ -1051,7 +1053,7 @@ Number of Languages: 16 in 10 JAR artifacts (0 deprecated) Miscellaneous Components // others: START -Number of Miscellaneous Components: 34 in 34
[camel] branch master updated: escaped incorrectly render links and ran ./mvnw -Pfastinstall install
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 03db548 escaped incorrectly render links and ran ./mvnw -Pfastinstall install new 3056165 Merge pull request #3024 from Nayananga/master 03db548 is described below commit 03db5482a517ac2a4dd01ae8720535f98aec8483 Author: nayananga@acerubuntu18.04 AuthorDate: Mon Jul 8 07:18:47 2019 +0530 escaped incorrectly render links and ran ./mvnw -Pfastinstall install --- components/camel-jolt/src/main/docs/jolt-component.adoc| 2 +- .../camel-mustache/src/main/docs/mustache-component.adoc | 2 +- components/camel-mvel/src/main/docs/mvel-component.adoc| 2 +- .../camel-velocity/src/main/docs/velocity-component.adoc | 2 +- components/readme.adoc | 10 ++ docs/components/modules/ROOT/pages/jolt-component.adoc | 2 +- docs/components/modules/ROOT/pages/mustache-component.adoc | 2 +- docs/components/modules/ROOT/pages/mvel-component.adoc | 2 +- docs/components/modules/ROOT/pages/velocity-component.adoc | 2 +- docs/user-manual/modules/ROOT/pages/index.adoc | 2 +- 10 files changed, 15 insertions(+), 13 deletions(-) diff --git a/components/camel-jolt/src/main/docs/jolt-component.adoc b/components/camel-jolt/src/main/docs/jolt-component.adoc index a05b592..9f1806b 100644 --- a/components/camel-jolt/src/main/docs/jolt-component.adoc +++ b/components/camel-jolt/src/main/docs/jolt-component.adoc @@ -31,7 +31,7 @@ jolt:specName[?options] Where *specName* is the classpath-local URI of the specification to invoke; or the complete URL of the remote specification -(eg: file://folder/myfile.vm[file://folder/myfile.json]). +(eg: \file://folder/myfile.vm). You can append query options to the URI in the following format, `?option=value=value&...` diff --git a/components/camel-mustache/src/main/docs/mustache-component.adoc b/components/camel-mustache/src/main/docs/mustache-component.adoc index 92cee3e..0f54b1d 100644 --- a/components/camel-mustache/src/main/docs/mustache-component.adoc +++ b/components/camel-mustache/src/main/docs/mustache-component.adoc @@ -29,7 +29,7 @@ mustache:templateName[?options] Where *templateName* is the classpath-local URI of the template to invoke; or the complete URL of the remote template (eg: -file://folder/myfile.mustache[file://folder/myfile.mustache]). +\file://folder/myfile.mustache). You can append query options to the URI in the following format, `?option=value=value&...` diff --git a/components/camel-mvel/src/main/docs/mvel-component.adoc b/components/camel-mvel/src/main/docs/mvel-component.adoc index 825a112..a696ac7 100644 --- a/components/camel-mvel/src/main/docs/mvel-component.adoc +++ b/components/camel-mvel/src/main/docs/mvel-component.adoc @@ -29,7 +29,7 @@ mvel:templateName[?options] Where *templateName* is the classpath-local URI of the template to invoke; or the complete URL of the remote template (eg: -file://folder/myfile.mvel[file://folder/myfile.mvel]). +\file://folder/myfile.mvel). You can append query options to the URI in the following format, `?option=value=value&...` diff --git a/components/camel-velocity/src/main/docs/velocity-component.adoc b/components/camel-velocity/src/main/docs/velocity-component.adoc index 27b7254..763e917 100644 --- a/components/camel-velocity/src/main/docs/velocity-component.adoc +++ b/components/camel-velocity/src/main/docs/velocity-component.adoc @@ -30,7 +30,7 @@ velocity:templateName[?options] Where *templateName* is the classpath-local URI of the template to invoke; or the complete URL of the remote template (eg: -file://folder/myfile.vm[file://folder/myfile.vm]). +\file://folder/myfile.vm). You can append query options to the URI in the following format, `?option=value=value&...` diff --git a/components/readme.adoc b/components/readme.adoc index 037831b..46a0527 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -1007,7 +1007,7 @@ Number of Data Formats: 45 in 37 JAR artifacts (0 deprecated) Expression Languages // languages: START -Number of Languages: 17 in 11 JAR artifacts (0 deprecated) +Number of Languages: 16 in 10 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -1041,8 +1041,6 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated) | link:camel-base/src/main/docs/tokenize-language.adoc[Tokenize] (camel-base) | 2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates. -| link:camel-jaxp/src/main/docs/xtokenize-language.adoc[XML Tokenize] (camel-jaxp) | 2.14 | To use Camel message body or header with a XML tokenizer in Camel expressions or predicates. - |
