[camel] branch master updated: Fixed CS issue in camel-paho
This is an automated email from the ASF dual-hosted git repository.
aldettinger 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 bc43a09 Fixed CS issue in camel-paho
bc43a09 is described below
commit bc43a09e94b59fe6fdb87fb6cd5a1f35e4386efe
Author: aldettinger
AuthorDate: Thu May 10 01:22:18 2018 +0200
Fixed CS issue in camel-paho
---
.../apache/camel/component/paho/PahoComponentVerifierExtension.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponentVerifierExtension.java
b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponentVerifierExtension.java
index c58ee9b..cfe3045 100644
---
a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponentVerifierExtension.java
+++
b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponentVerifierExtension.java
@@ -67,7 +67,7 @@ public class PahoComponentVerifierExtension extends
DefaultComponentVerifierExte
if (ObjectHelper.isNotEmpty(brokerUrl)) {
try {
// Create MQTT client
- if (ObjectHelper.isEmpty(username) &&
ObjectHelper.isEmpty(password)) {
+if (ObjectHelper.isEmpty(username) &&
ObjectHelper.isEmpty(password)) {
MqttClient client = new MqttClient(brokerUrl,
MqttClient.generateClientId());
client.connect();
client.disconnect();
@@ -78,7 +78,7 @@ public class PahoComponentVerifierExtension extends
DefaultComponentVerifierExte
connOpts.setPassword(password.toCharArray());
client.connect(connOpts);
client.disconnect();
- }
+}
} catch (MqttException e) {
builder.error(
ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.ILLEGAL_PARAMETER_VALUE,
"Unable to connect to MQTT broker")
--
To stop receiving notification emails like this one, please contact
aldettin...@apache.org.
[camel] branch master updated: Duplicated component name
This is an automated email from the ASF dual-hosted git repository. ningjiang 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 e0f11a1 Duplicated component name e0f11a1 is described below commit e0f11a180a21359dc0023bc923485f4061cff958 Author: Pablo Marambio Cathalifaud AuthorDate: Wed May 9 16:51:57 2018 -0300 Duplicated component name --- components/readme.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/readme.adoc b/components/readme.adoc index 892f43c..fff152f 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -27,7 +27,7 @@ Number of Components: 293 in 200 JAR artifacts (20 deprecated) `apns:name` | 2.8 | For sending notifications to Apple iOS devices. | link:camel-asterisk/src/main/docs/asterisk-component.adoc[Asterisk] (camel-asterisk) + -`asterisk:name` | 2.18 | The asterisk component is used to interact with Asterisk PBX Server Asterisk PBX Server. +`asterisk:name` | 2.18 | The asterisk component is used to interact with Asterisk PBX Server. | link:camel-atmos/src/main/docs/atmos-component.adoc[Atmos] (camel-atmos) + `atmos:name/operation` | 2.15 | The atmos component is used for integrating with EMC's Atomos Storage. -- To stop receiving notification emails like this one, please contact ningji...@apache.org.
[camel] branch master updated: Fix checkstyle issues
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.git
The following commit(s) were added to refs/heads/master by this push:
new 628832e Fix checkstyle issues
628832e is described below
commit 628832e35419eac0e65effeb234d4c3553f5b699
Author: Zoran Regvart
AuthorDate: Wed May 9 18:59:02 2018 +0200
Fix checkstyle issues
---
.../camel/component/telegram/model/ReplyKeyboardMarkup.java| 10 +-
.../telegram/service/TelegramServiceRestBotAPIAdapter.java | 8
.../camel/component/telegram/TelegramProducerMediaTest.java| 4 ++--
.../camel/component/telegram/util/TelegramTestSupport.java | 4 ++--
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/ReplyKeyboardMarkup.java
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/ReplyKeyboardMarkup.java
index db66984..2151a69 100644
---
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/ReplyKeyboardMarkup.java
+++
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/ReplyKeyboardMarkup.java
@@ -123,15 +123,15 @@ public class ReplyKeyboardMarkup implements Serializable {
this.keyboard = new ArrayList<>();
}
-public KeyboardBuilder addRow(List
InlineKeyboardButtons) {
+public KeyboardBuilder addRow(List
inlineKeyboardButtons) {
-keyboard.add(InlineKeyboardButtons);
+keyboard.add(inlineKeyboardButtons);
return this;
}
-public KeyboardBuilder
addOneRowByEachButton(List InlineKeyboardButtons) {
+public KeyboardBuilder
addOneRowByEachButton(List inlineKeyboardButtons) {
-for (Iterator iterator =
InlineKeyboardButtons.iterator(); iterator.hasNext();) {
+for (Iterator iterator =
inlineKeyboardButtons.iterator(); iterator.hasNext();) {
keyboard.add(Arrays.asList(iterator.next()));
}
@@ -146,4 +146,4 @@ public class ReplyKeyboardMarkup implements Serializable {
}
}
}
-}
\ No newline at end of file
+}
diff --git
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/TelegramServiceRestBotAPIAdapter.java
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/TelegramServiceRestBotAPIAdapter.java
index 7e6e7c9..465b253 100644
---
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/TelegramServiceRestBotAPIAdapter.java
+++
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/TelegramServiceRestBotAPIAdapter.java
@@ -24,6 +24,10 @@ import java.util.List;
import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+
import org.apache.camel.component.telegram.TelegramService;
import org.apache.camel.component.telegram.model.OutgoingAudioMessage;
import org.apache.camel.component.telegram.model.OutgoingDocumentMessage;
@@ -37,10 +41,6 @@ import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.apache.cxf.jaxrs.ext.multipart.ContentDisposition;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-
/**
* Adapts the {@code RestBotAPI} to the {@code TelegramService} interface.
*/
diff --git
a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java
b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java
index c7e5d9b..a1ccc72 100644
---
a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java
+++
b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.telegram;
-import static org.mockito.ArgumentMatchers.eq;
-
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
@@ -34,6 +32,8 @@ import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.eq;
+
/**
* Tests a producer that sends media information.
*/
diff --git
a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/util/TelegramTestSupport.java
[camel] 03/03: CAMEL-12495 - Camel-Slack: add component verifier from Syndesis project, minor 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.git
commit 1714ff1589be2f5f292f79106d7ae1d36ea661ce
Author: Andrea Cosentino
AuthorDate: Wed May 9 16:05:14 2018 +0200
CAMEL-12495 - Camel-Slack: add component verifier from Syndesis project,
minor fix
---
.../src/main/java/org/apache/camel/component/slack/SlackComponent.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponent.java
b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponent.java
index 132a92e..3714126 100644
---
a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponent.java
+++
b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponent.java
@@ -31,6 +31,8 @@ public class SlackComponent extends DefaultComponent {
}
public SlackComponent(CamelContext context) {
+super(context);
+
registerExtension(new SlackComponentVerifierExtension());
}
--
To stop receiving notification emails like this one, please contact
acosent...@apache.org.
[camel] branch master updated (f4cc9d0 -> 1714ff1)
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 f4cc9d0 CAMEL-11430: Fix camel-kubernetes-starter test
new 35627dd CAMEL-12500: Add missing . between region and host in
SqsEndpoint
new e95fec6 CAMEL-12501 - Camel-Paho: add component verifier from
Syndesis project
new 1714ff1 CAMEL-12495 - Camel-Slack: add component verifier from
Syndesis project, minor fix
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/component/aws/sqs/SqsEndpoint.java | 2 +-
.../apache/camel/component/paho/PahoComponent.java | 15 ++--
.../paho/PahoComponentVerifierExtension.java | 97 ++
.../paho/PahoComponentVerifierExtensionTest.java} | 12 +--
.../camel/component/slack/SlackComponent.java | 2 +
5 files changed, 116 insertions(+), 12 deletions(-)
create mode 100644
components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponentVerifierExtension.java
copy
components/{camel-slack/src/test/java/org/apache/camel/component/slack/SlackComponentVerifierExtensionTest.java
=>
camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentVerifierExtensionTest.java}
(87%)
--
To stop receiving notification emails like this one, please contact
acosent...@apache.org.
[camel] 02/03: CAMEL-12501 - Camel-Paho: add component verifier from Syndesis project
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 e95fec66478bee779705ed3c1e23a2b12bfd0f04
Author: Andrea Cosentino
AuthorDate: Wed May 9 16:04:04 2018 +0200
CAMEL-12501 - Camel-Paho: add component verifier from Syndesis project
---
.../apache/camel/component/paho/PahoComponent.java | 15 ++--
.../paho/PahoComponentVerifierExtension.java | 97 ++
.../paho/PahoComponentVerifierExtensionTest.java | 65 +++
3 files changed, 172 insertions(+), 5 deletions(-)
diff --git
a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponent.java
b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponent.java
index 47cb4fe..f61d00f 100644
---
a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponent.java
+++
b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponent.java
@@ -18,15 +18,16 @@ package org.apache.camel.component.paho;
import java.util.Map;
+import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.impl.UriEndpointComponent;
+import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.spi.Metadata;
import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
/**
* Component to integrate with the Eclispe Paho MQTT library.
*/
-public class PahoComponent extends UriEndpointComponent {
+public class PahoComponent extends DefaultComponent {
private String brokerUrl;
private String clientId;
@@ -34,10 +35,14 @@ public class PahoComponent extends UriEndpointComponent {
private MqttConnectOptions connectOptions;
public PahoComponent() {
-super(PahoEndpoint.class);
+this(null);
+}
+
+public PahoComponent(CamelContext context) {
+super(context);
+
+registerExtension(new PahoComponentVerifierExtension());
}
-
-// Overridden
@Override
protected Endpoint createEndpoint(String uri, String remaining,
Map parameters) throws Exception {
diff --git
a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponentVerifierExtension.java
b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponentVerifierExtension.java
new file mode 100644
index 000..c58ee9b
--- /dev/null
+++
b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponentVerifierExtension.java
@@ -0,0 +1,97 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.paho;
+
+import java.util.Map;
+
+import
org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
+import org.apache.camel.component.extension.verifier.ResultBuilder;
+import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
+import org.apache.camel.component.extension.verifier.ResultErrorHelper;
+import org.apache.camel.util.ObjectHelper;
+import org.eclipse.paho.client.mqttv3.MqttClient;
+import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
+import org.eclipse.paho.client.mqttv3.MqttException;
+
+public class PahoComponentVerifierExtension extends
DefaultComponentVerifierExtension {
+
+public PahoComponentVerifierExtension() {
+this("paho");
+}
+
+public PahoComponentVerifierExtension(String scheme) {
+super(scheme);
+}
+
+// *
+// Parameters validation
+// *
+
+@Override
+protected Result verifyParameters(Map parameters) {
+return ResultBuilder.withStatusAndScope(Result.Status.OK,
Scope.PARAMETERS)
+.error(ResultErrorHelper.requiresOption("brokerUrl", parameters))
+.build();
+}
+
+// *
+// Connectivity validation
+// *
+
+@Override
+protected Result verifyConnectivity(Map parameters) {
+return ResultBuilder.withStatusAndScope(Result.Status.OK,
Scope.CONNECTIVITY)
+.error(parameters, this::verifyCredentials)
+
[camel] 01/03: CAMEL-12500: Add missing . between region and host in SqsEndpoint
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 35627ddb0f318a65455512d3c159fcb822433ee7
Author: Craig Andrews
AuthorDate: Tue May 8 14:00:49 2018 -0400
CAMEL-12500: Add missing . between region and host in SqsEndpoint
There should be a . between the region and the host. Without this change,
the queueUrl is, for example, `https://sqs.sqs.us-gov-west-1amazonaws.com` - it
should be `https://sqs.sqs.us-gov-west-1.amazonaws.com`.
---
.../src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
index 7f3ab4d..4506734 100644
---
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
+++
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
@@ -129,7 +129,7 @@ public class SqsEndpoint extends ScheduledPollEndpoint
implements HeaderFilterSt
if (configuration.getRegion() != null &&
configuration.getQueueOwnerAWSAccountId() != null) {
String host = configuration.getAmazonAWSHost();
host = FileUtil.stripTrailingSeparator(host);
-queueUrl = "https://sqs."; + configuration.getRegion() + host +
"/"
+queueUrl = "https://sqs."; + configuration.getRegion() + "." +
host + "/"
+ configuration.getQueueOwnerAWSAccountId() + "/" +
configuration.getQueueName();
} else if (configuration.getQueueOwnerAWSAccountId() != null) {
GetQueueUrlRequest getQueueUrlRequest = new
GetQueueUrlRequest();
--
To stop receiving notification emails like this one, please contact
acosent...@apache.org.
[camel] branch master updated: CAMEL-11430: Fix camel-kubernetes-starter test
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.git The following commit(s) were added to refs/heads/master by this push: new f4cc9d0 CAMEL-11430: Fix camel-kubernetes-starter test f4cc9d0 is described below commit f4cc9d012595f1735d27adb1d43b2cace38277d8 Author: Zoran Regvart AuthorDate: Wed May 9 15:18:02 2018 +0200 CAMEL-11430: Fix camel-kubernetes-starter test --- .../test/cluster/KubernetesClusterServiceAutoConfigurationTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cluster/KubernetesClusterServiceAutoConfigurationTest.java b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cluster/KubernetesClusterServiceAutoConfigurationTest.java index 1f0f6c4..1bcc929 100644 --- a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cluster/KubernetesClusterServiceAutoConfigurationTest.java +++ b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cluster/KubernetesClusterServiceAutoConfigurationTest.java @@ -45,8 +45,8 @@ import static org.junit.Assert.assertNotNull; "camel.component.kubernetes.cluster.service.kubernetes-namespace=ns1", "camel.component.kubernetes.cluster.service.config-map-name=cm", "camel.component.kubernetes.cluster.service.pod-name=mypod1", - "camel.component.kubernetes.cluster.service.cluster-labels['app']=myapp", - "camel.component.kubernetes.cluster.service.cluster-labels['provider']=myprovider", +"camel.component.kubernetes.cluster.service.cluster-labels.app=myapp", + "camel.component.kubernetes.cluster.service.cluster-labels.provider=myprovider", "camel.component.kubernetes.cluster.service.lease-duration-millis=1", "camel.component.kubernetes.cluster.service.renew-deadline-millis=8000", "camel.component.kubernetes.cluster.service.retry-period-millis=4000", -- To stop receiving notification emails like this one, please contact zregv...@apache.org.
[camel] 03/03: CAMEL-11430: Fix camel-infinispan starter
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.git
commit 14a0fc0bafff39b53a54204e9a76276f1c78c2a8
Author: Zoran Regvart
AuthorDate: Wed May 9 14:25:00 2018 +0200
CAMEL-11430: Fix camel-infinispan starter
---
.../customizer/EmbeddedCacheManagerCustomizer.java | 33 ++
1 file changed, 3 insertions(+), 30 deletions(-)
diff --git
a/platforms/spring-boot/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/springboot/customizer/EmbeddedCacheManagerCustomizer.java
b/platforms/spring-boot/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/springboot/customizer/EmbeddedCacheManagerCustomizer.java
index 08f6dfe..e7758ac 100644
---
a/platforms/spring-boot/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/springboot/customizer/EmbeddedCacheManagerCustomizer.java
+++
b/platforms/spring-boot/components-starter/camel-infinispan-starter/src/main/java/org/apache/camel/component/infinispan/springboot/customizer/EmbeddedCacheManagerCustomizer.java
@@ -26,17 +26,16 @@ import org.infinispan.manager.EmbeddedCacheManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
+import org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
@Order(101)
@Configuration
-@Conditional(EmbeddedCacheManagerCustomizer.Conditions.class)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@ConditionalOnBean({ EmbeddedCacheManager.class, CamelAutoConfiguration.class
})
+@AutoConfigureAfter({ CamelAutoConfiguration.class,
CacheAutoConfiguration.class })
@AutoConfigureBefore(InfinispanComponentAutoConfiguration.class)
@EnableConfigurationProperties(EmbeddedCacheManagerCustomizerConfiguration.class)
public class EmbeddedCacheManagerCustomizer implements HasId,
ComponentCustomizer {
@@ -58,30 +57,4 @@ public class EmbeddedCacheManagerCustomizer implements
HasId, ComponentCustomize
public String getId() {
return "camel.component.infinispan.customizer.embedded-cache-manager";
}
-
-//
*
-// By default ConditionalOnBean works using an OR operation so if you list
-// a number of classes, the condition succeeds if a single instance of the
-// classes is found.
-//
-// A workaround is to use AllNestedConditions and creates some dummy
classes
-// annotated @ConditionalOnBean
-//
-// This should be fixed in spring-boot 2.0 where ConditionalOnBean uses and
-// AND operation instead of the OR as it does today.
-//
*
-
-static class Conditions extends AllNestedConditions {
-public Conditions() {
-super(ConfigurationPhase.REGISTER_BEAN);
-}
-
-@ConditionalOnBean(EmbeddedCacheManager.class)
-static class OnCacheManager {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-static class OnCamelAutoConfiguration {
-}
-}
}
--
To stop receiving notification emails like this one, please contact
zregv...@apache.org.
[camel] 02/03: CAMEL-12498: Fix failing jcache test
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.git
commit d332347459cde08963d3cdba618caf9bf254aac3
Author: Zoran Regvart
AuthorDate: Wed May 9 13:37:00 2018 +0200
CAMEL-12498: Fix failing jcache test
Seems that Hazelcast no longer avails the removed value on the event.
---
.../test/java/org/apache/camel/component/jcache/JCacheConsumerTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConsumerTest.java
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConsumerTest.java
index 975f721..0a6e6c2 100644
---
a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConsumerTest.java
+++
b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConsumerTest.java
@@ -86,7 +86,7 @@ public class JCacheConsumerTest extends
JCacheComponentTestSupport {
mockRemoved.expectedMessagesMatches(new Predicate() {
@Override
public boolean matches(Exchange exchange) {
-return exchange.getIn().getBody(String.class).equals(val2);
+return exchange.getIn().getBody(String.class) == null;
}
});
--
To stop receiving notification emails like this one, please contact
zregv...@apache.org.
[camel] branch master updated (024533c -> 14a0fc0)
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.git. from 024533c CAMEL-12495 - Camel-Slack: add component verifier from Syndesis project new fcbadc2 CAMEL-12497: Fix failing blueprint tests new d332347 CAMEL-12498: Fix failing jcache test new 14a0fc0 CAMEL-11430: Fix camel-infinispan starter The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../camel/component/jcache/JCacheConsumerTest.java | 2 +- parent/pom.xml | 2 +- .../customizer/EmbeddedCacheManagerCustomizer.java | 33 ++ tests/camel-blueprint-cxf-test/pom.xml | 2 +- 4 files changed, 6 insertions(+), 33 deletions(-) -- To stop receiving notification emails like this one, please contact zregv...@apache.org.
[camel] 01/03: CAMEL-12497: Fix failing blueprint tests
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.git commit fcbadc29abfb08be200328f092a06d574613a3b5 Author: Zoran Regvart AuthorDate: Wed May 9 13:19:28 2018 +0200 CAMEL-12497: Fix failing blueprint tests ASM version mismatch was causing tests to fail. This upgrades ASM to the same version used by CXF (5.2) and the aries-blueprint-proxy-impl to latest patch version. --- parent/pom.xml | 2 +- tests/camel-blueprint-cxf-test/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 39f8712..30ae71f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -56,7 +56,7 @@ 1.0.6 1.4.4 1.0.1 - 1.0.4 + 1.0.6 1.0.8 1.1.3 1.0.0.Final diff --git a/tests/camel-blueprint-cxf-test/pom.xml b/tests/camel-blueprint-cxf-test/pom.xml index 4d67f97..1569f74 100644 --- a/tests/camel-blueprint-cxf-test/pom.xml +++ b/tests/camel-blueprint-cxf-test/pom.xml @@ -37,7 +37,7 @@ org.ow2.asm asm-all - 5.1 + 5.2 test -- To stop receiving notification emails like this one, please contact zregv...@apache.org.
[camel] branch master updated: CAMEL-12495 - Camel-Slack: add component verifier from Syndesis project
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 024533c CAMEL-12495 - Camel-Slack: add component verifier from
Syndesis project
024533c is described below
commit 024533cf9e684485c2b1d56fada2a2890911ba0b
Author: Andrea Cosentino
AuthorDate: Wed May 9 13:51:28 2018 +0200
CAMEL-12495 - Camel-Slack: add component verifier from Syndesis project
---
.../camel/component/slack/SlackComponent.java | 11 +-
.../slack/SlackComponentVerifierExtension.java | 114 +
.../slack/SlackComponentVerifierExtensionTest.java | 65
3 files changed, 187 insertions(+), 3 deletions(-)
diff --git
a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponent.java
b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponent.java
index 9929d82..132a92e 100644
---
a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponent.java
+++
b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponent.java
@@ -18,15 +18,20 @@ package org.apache.camel.component.slack;
import java.util.Map;
+import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.impl.UriEndpointComponent;
+import org.apache.camel.impl.DefaultComponent;
-public class SlackComponent extends UriEndpointComponent {
+public class SlackComponent extends DefaultComponent {
private String webhookUrl;
public SlackComponent() {
-super(SlackEndpoint.class);
+this(null);
+}
+
+public SlackComponent(CamelContext context) {
+registerExtension(new SlackComponentVerifierExtension());
}
/**
diff --git
a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java
b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java
new file mode 100644
index 000..a4f3e88
--- /dev/null
+++
b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java
@@ -0,0 +1,114 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.slack;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import
org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
+import org.apache.camel.component.extension.verifier.ResultBuilder;
+import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
+import org.apache.camel.component.extension.verifier.ResultErrorHelper;
+import org.apache.camel.component.slack.helper.SlackMessage;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.json.simple.JSONObject;
+
+public class SlackComponentVerifierExtension extends
DefaultComponentVerifierExtension {
+
+public SlackComponentVerifierExtension() {
+this("slack");
+}
+
+public SlackComponentVerifierExtension(String scheme) {
+super(scheme);
+}
+
+// *
+// Parameters validation
+// *
+@Override
+protected Result verifyParameters(Map parameters) {
+ResultBuilder builder =
ResultBuilder.withStatusAndScope(Result.Status.OK, Scope.PARAMETERS)
+.error(ResultErrorHelper.requiresOption("webhookUrl",
parameters));
+
+return builder.build();
+}
+
+// *
+// Connectivity validation
+// *
+@Override
+protected Result verifyConnectivity(Map parameters) {
+return ResultBuilder.withStatusAndScope(Result.Status.OK,
Scope.CONNECTIVITY)
+.error(parameters, this::verifyCredentials).build();
+}
+
+private void verifyCredentials(ResultBuilder builder, Map
parameters) {
+
+
[camel] branch master updated: Upgrade Reactor to version 3.1.7.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.git The following commit(s) were added to refs/heads/master by this push: new 4df6faa Upgrade Reactor to version 3.1.7.RELEASE 4df6faa is described below commit 4df6faaf1f1c9c12a8309fa9865c425efb44d89e Author: Andrea Cosentino AuthorDate: Wed May 9 11:59:05 2018 +0200 Upgrade Reactor to version 3.1.7.RELEASE --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index c295ba2..39f8712 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -577,7 +577,7 @@ 2.0.0 5.2.0 1.0.2 -3.1.6.RELEASE +3.1.7.RELEASE 0.9.11 0.9.11_1 1.4_1 -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
[camel] branch master updated: Fix daily build to test `returnStatus` use
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.git
The following commit(s) were added to refs/heads/master by this push:
new a701634 Fix daily build to test `returnStatus` use
a701634 is described below
commit a7016343d30aea9171ab8aa1d7230606c427
Author: Zoran Regvart
AuthorDate: Wed May 9 11:59:31 2018 +0200
Fix daily build to test `returnStatus` use
---
Jenkinsfile.daily | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index c631529..57f023e 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -56,7 +56,7 @@ pipeline {
jdk 'JDK 1.9 (latest)'
}
steps {
-sh script: "./mvnw $MAVEN_PARAMS
-Dmaven.test.failure.ignore=true test", returnStatus: 0
+sh script: "./mvnw $MAVEN_PARAMS
-Dmaven.test.failure.ignore=true test", returnStatus: true
}
post {
always {
@@ -72,7 +72,7 @@ pipeline {
jdk 'JDK 10 (latest)'
}
steps {
-sh script: "./mvnw $MAVEN_PARAMS
-Dmaven.test.failure.ignore=true test", returnStatus: 0
+sh script: "./mvnw $MAVEN_PARAMS
-Dmaven.test.failure.ignore=true test", returnStatus: true
}
post {
always {
--
To stop receiving notification emails like this one, please contact
zregv...@apache.org.
[camel] branch test-jdk-9-10 deleted (was effb0ac)
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a change to branch test-jdk-9-10 in repository https://gitbox.apache.org/repos/asf/camel.git. was effb0ac Daily build to test with newer JDK versions This change permanently discards the following revisions: discard effb0ac Daily build to test with newer JDK versions -- To stop receiving notification emails like this one, please contact zregv...@apache.org.
[camel] 02/03: Upgrade Chronicle Threads to version 1.12.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 commit 6126c26b25e18cf91fe58a84346e201c18bbbdd4 Author: Andrea Cosentino AuthorDate: Wed May 9 11:33:04 2018 +0200 Upgrade Chronicle Threads to version 1.12.4 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index a64457b..a86c40c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -125,7 +125,7 @@ 2.4.17 1.12.2 4.6.106 -1.12.3 +1.12.4 1.12.4 3.3.1 3.3.1_1 -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
[camel] 01/03: Upgrade Chronicle Core to version 1.12.6
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 40258f1ffb7be5db80a4288203f2c7925cd86bd7 Author: Andrea Cosentino AuthorDate: Wed May 9 11:32:34 2018 +0200 Upgrade Chronicle Core to version 1.12.6 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 69284ad..a64457b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -120,7 +120,7 @@ 3.2.6_1 3.2.6 1.12.11 -1.12.5 +1.12.6 1.13.27 2.4.17 1.12.2 -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
[camel] branch master updated (6a76100 -> 53b6b22)
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 6a76100 Daily build to test with newer JDK versions new 40258f1 Upgrade Chronicle Core to version 1.12.6 new 6126c26 Upgrade Chronicle Threads to version 1.12.4 new 53b6b22 Upgrade Chronicle Queue to version 4.6.107 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
[camel] 03/03: Upgrade Chronicle Queue to version 4.6.107
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 53b6b227d481a4b85537f08c49a674a0d11ccd33 Author: Andrea Cosentino AuthorDate: Wed May 9 11:33:36 2018 +0200 Upgrade Chronicle Queue to version 4.6.107 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index a86c40c..c295ba2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -124,7 +124,7 @@ 1.13.27 2.4.17 1.12.2 -4.6.106 +4.6.107 1.12.4 1.12.4 3.3.1 -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
[camel] branch master updated: Daily build to test with newer JDK versions
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.git
The following commit(s) were added to refs/heads/master by this push:
new 6a76100 Daily build to test with newer JDK versions
6a76100 is described below
commit 6a76100098fd9c7a8030871bba95c4d51bd4011e
Author: Zoran Regvart
AuthorDate: Tue May 8 16:23:22 2018 +0200
Daily build to test with newer JDK versions
---
Jenkinsfile.daily | 89 +++
1 file changed, 89 insertions(+)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
new file mode 100644
index 000..c631529
--- /dev/null
+++ b/Jenkinsfile.daily
@@ -0,0 +1,89 @@
+/*
+ * 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.
+ */
+
+def LOCAL_REPOSITORY = env.LOCAL_REPOSITORY ?:
'/home/jenkins/jenkins-slave/maven-repositories/0'
+def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
+def BUILD_JDK_NAME = env.JDK_NAME ?: 'JDK 1.8 (latest)'
+
+def MAVEN_PARAMS = "-U -B -e -fae -V -Dmaven.repo.local=${LOCAL_REPOSITORY}
-Dnoassembly -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2"
+
+pipeline {
+
+agent {
+label AGENT_LABEL
+}
+
+triggers {
+cron('@daily')
+}
+
+options {
+buildDiscarder(
+logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
+)
+disableConcurrentBuilds()
+}
+
+stages {
+
+stage('Build') {
+tools {
+jdk BUILD_JDK_NAME
+}
+steps {
+sh "./mvnw $MAVEN_PARAMS -Dmaven.test.skip.exec=true clean
install"
+}
+}
+
+stage('Test JDK 9') {
+tools {
+jdk 'JDK 1.9 (latest)'
+}
+steps {
+sh script: "./mvnw $MAVEN_PARAMS
-Dmaven.test.failure.ignore=true test", returnStatus: 0
+}
+post {
+always {
+junit allowEmptyResults: true, testResults:
'**/target/surefire-reports/*.xml'
+junit allowEmptyResults: true, testResults:
'**/target/failsafe-reports/*.xml'
+sh "find . -path '*/target/surefire-reports/*' -delete -o
-path '*/target/failsafe-reports/*' -delete"
+}
+}
+}
+
+stage('Test JDK 10') {
+tools {
+jdk 'JDK 10 (latest)'
+}
+steps {
+sh script: "./mvnw $MAVEN_PARAMS
-Dmaven.test.failure.ignore=true test", returnStatus: 0
+}
+post {
+always {
+junit allowEmptyResults: true, testResults:
'**/target/surefire-reports/*.xml'
+junit allowEmptyResults: true, testResults:
'**/target/failsafe-reports/*.xml'
+sh "find . -path '*/target/surefire-reports/*' -delete -o
-path '*/target/failsafe-reports/*' -delete"
+}
+}
+}
+
+}
+
+}
+
--
To stop receiving notification emails like this one, please contact
zregv...@apache.org.
[camel] 04/06: In order to disable custom keyboard if it's activated
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 99d5cd18e8a66410f5c0697b6e7aa78f866507b2
Author: Willian Antunes
AuthorDate: Tue May 1 16:46:49 2018 -0700
In order to disable custom keyboard if it's activated
---
.../telegram/integration/TelegramServiceTest.java | 17 +
1 file changed, 17 insertions(+)
diff --git
a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceTest.java
b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceTest.java
index 4afbdb0..fcd4e43 100644
---
a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceTest.java
+++
b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceTest.java
@@ -131,6 +131,23 @@ public class TelegramServiceTest {
service.sendMessage(authorizationToken, msg);
}
+
+@Test
+public void testSendMessageDisablingCustomKeyboard() {
+TelegramService service = TelegramServiceProvider.get().getService();
+
+OutgoingTextMessage msg = new OutgoingTextMessage();
+msg.setChatId(chatId);
+msg.setText("Your answer was accepted!");
+
+ReplyKeyboardMarkup replyMarkup = ReplyKeyboardMarkup.builder()
+.removeKeyboard(true)
+.build();
+
+msg.setReplyKeyboardMarkup(replyMarkup);
+
+service.sendMessage(authorizationToken, msg);
+}
@Test
public void testSendFull() {
--
To stop receiving notification emails like this one, please contact
acosent...@apache.org.
[camel] branch master updated (e94cd11 -> 3724128)
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 e94cd11 Regen new a16fedc Test to cover custom keyboard new de7502d Updated client to be more dynamic (JSON instead of FORM) new 2d2d824 New/updated models to comply with JSON/API requirements new 99d5cd1 In order to disable custom keyboard if it's activated new 8a5ffc6 OutgoingTextMessage builder and a test considering producer situation new 3724128 License header and updated documentation The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/docs/telegram-component.adoc | 57 .../telegram/model/InlineKeyboardButton.java | 63 + .../component/telegram/model/OutgoingMessage.java | 1 + .../telegram/model/OutgoingTextMessage.java| 65 - .../telegram/model/ReplyKeyboardMarkup.java| 149 + .../component/telegram/service/RestBotAPI.java | 13 +- .../service/TelegramServiceRestBotAPIAdapter.java | 20 ++- .../telegram/TelegramProducerMediaTest.java| 28 +++- .../telegram/integration/TelegramServiceTest.java | 57 .../telegram/util/TelegramTestSupport.java | 37 - 10 files changed, 445 insertions(+), 45 deletions(-) copy tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/DependencySet.java => components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineKeyboardButton.java (52%) create mode 100644 components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/ReplyKeyboardMarkup.java -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
[camel] 05/06: OutgoingTextMessage builder and a test considering producer situation
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 8a5ffc62e77ffcf3d2fa5f9bbc9d6aaa28e62e67
Author: Willian Antunes
AuthorDate: Sat May 5 06:18:47 2018 -0700
OutgoingTextMessage builder and a test considering producer situation
---
.../telegram/model/OutgoingTextMessage.java| 51 ++
.../telegram/TelegramProducerMediaTest.java| 28 +++-
.../telegram/util/TelegramTestSupport.java | 37 +++-
3 files changed, 112 insertions(+), 4 deletions(-)
diff --git
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingTextMessage.java
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingTextMessage.java
index 2040d91..0f8262e 100644
---
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingTextMessage.java
+++
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingTextMessage.java
@@ -37,6 +37,15 @@ public class OutgoingTextMessage extends OutgoingMessage {
private ReplyKeyboardMarkup replyKeyboardMarkup;
public OutgoingTextMessage() {
+
+}
+
+public OutgoingTextMessage(String text, String parseMode, Boolean
disableWebPagePreview, ReplyKeyboardMarkup replyKeyboardMarkup) {
+
+this.text = text;
+this.parseMode = parseMode;
+this.disableWebPagePreview = disableWebPagePreview;
+this.replyKeyboardMarkup = replyKeyboardMarkup;
}
public String getText() {
@@ -70,6 +79,48 @@ public class OutgoingTextMessage extends OutgoingMessage {
public void setReplyKeyboardMarkup(ReplyKeyboardMarkup
replyKeyboardMarkup) {
this.replyKeyboardMarkup = replyKeyboardMarkup;
}
+
+public static Builder builder() {
+
+return new Builder();
+}
+
+public static class Builder {
+
+private String text;
+private String parseMode;
+private Boolean disableWebPagePreview;
+private ReplyKeyboardMarkup replyKeyboardMarkup;
+
+public Builder text(String text) {
+
+this.text = text;
+return this;
+}
+
+public Builder parseMode(String parseMode) {
+
+this.parseMode = parseMode;
+return this;
+}
+
+public Builder disableWebPagePreview(Boolean disableWebPagePreview) {
+
+this.disableWebPagePreview = disableWebPagePreview;
+return this;
+}
+
+public Builder replyKeyboardMarkup(ReplyKeyboardMarkup
replyKeyboardMarkup) {
+
+this.replyKeyboardMarkup = replyKeyboardMarkup;
+return this;
+}
+
+public OutgoingTextMessage build() {
+
+return new OutgoingTextMessage(text, parseMode,
disableWebPagePreview, replyKeyboardMarkup);
+}
+}
@Override
public String toString() {
diff --git
a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java
b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java
index 5084e9d..c7e5d9b 100644
---
a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java
+++
b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramProducerMediaTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.telegram;
+import static org.mockito.ArgumentMatchers.eq;
+
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
@@ -32,8 +34,6 @@ import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
-import static org.mockito.ArgumentMatchers.eq;
-
/**
* Tests a producer that sends media information.
*/
@@ -170,6 +170,30 @@ public class TelegramProducerMediaTest extends
TelegramTestSupport {
assertEquals("Hello", captor.getValue().getText());
assertNull(captor.getValue().getParseMode());
}
+
+@Test
+public void testRouteWithTextAndCustomKeyBoard() throws Exception {
+
+TelegramService service = mockTelegramService();
+
+Exchange ex = endpoint.createExchange();
+
+OutgoingTextMessage msg = new
OutgoingTextMessage.Builder().text("Hello").build();
+withInlineKeyboardContainingTwoRows(msg);
+
+ex.getIn().setBody(msg);
+
+context().createProducerTemplate().send(endpoint, ex);
+
+ArgumentCaptor captor =
ArgumentCaptor.forClass(OutgoingTextMessage.class);
+
+Mockito.verify(service).sendMessage(eq("mock-token"),
captor.capture());
+assertEquals("my-id", captor.getValue().getChatId());
+assertEquals("Hello", capto
[camel] 01/06: Test to cover custom keyboard
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 a16fedc58d511187a31ec1e89e8902eebe369116
Author: Willian Antunes
AuthorDate: Tue May 1 16:16:58 2018 -0700
Test to cover custom keyboard
---
.../telegram/integration/TelegramServiceTest.java | 40 ++
1 file changed, 40 insertions(+)
diff --git
a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceTest.java
b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceTest.java
index 9209cb5..4afbdb0 100644
---
a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceTest.java
+++
b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/integration/TelegramServiceTest.java
@@ -17,15 +17,18 @@
package org.apache.camel.component.telegram.integration;
import java.io.IOException;
+import java.util.Arrays;
import org.apache.camel.component.telegram.TelegramParseMode;
import org.apache.camel.component.telegram.TelegramService;
import org.apache.camel.component.telegram.TelegramServiceProvider;
+import org.apache.camel.component.telegram.model.InlineKeyboardButton;
import org.apache.camel.component.telegram.model.OutgoingAudioMessage;
import org.apache.camel.component.telegram.model.OutgoingDocumentMessage;
import org.apache.camel.component.telegram.model.OutgoingPhotoMessage;
import org.apache.camel.component.telegram.model.OutgoingTextMessage;
import org.apache.camel.component.telegram.model.OutgoingVideoMessage;
+import org.apache.camel.component.telegram.model.ReplyKeyboardMarkup;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.camel.component.telegram.util.TelegramTestUtil;
import org.junit.Assert;
@@ -91,6 +94,43 @@ public class TelegramServiceTest {
service.sendMessage(authorizationToken, msg);
}
+
+@Test
+public void testSendMessageWithKeyboard() {
+TelegramService service = TelegramServiceProvider.get().getService();
+
+OutgoingTextMessage msg = new OutgoingTextMessage();
+msg.setChatId(chatId);
+msg.setText("Choose one option!");
+
+InlineKeyboardButton buttonOptionOneI = InlineKeyboardButton.builder()
+.text("Option One - I").build();
+
+InlineKeyboardButton buttonOptionOneII = InlineKeyboardButton.builder()
+.text("Option One - II").build();
+
+InlineKeyboardButton buttonOptionTwoI = InlineKeyboardButton.builder()
+.text("Option Two - I").build();
+
+InlineKeyboardButton buttonOptionThreeI =
InlineKeyboardButton.builder()
+.text("Option Three - I").build();
+
+InlineKeyboardButton buttonOptionThreeII =
InlineKeyboardButton.builder()
+.text("Option Three - II").build();
+
+ReplyKeyboardMarkup replyMarkup = ReplyKeyboardMarkup.builder()
+.keyboard()
+.addRow(Arrays.asList(buttonOptionOneI, buttonOptionOneII))
+.addRow(Arrays.asList(buttonOptionTwoI))
+.addRow(Arrays.asList(buttonOptionThreeI,
buttonOptionThreeII))
+.close()
+.oneTimeKeyboard(true)
+.build();
+
+msg.setReplyKeyboardMarkup(replyMarkup);
+
+service.sendMessage(authorizationToken, msg);
+}
@Test
public void testSendFull() {
--
To stop receiving notification emails like this one, please contact
acosent...@apache.org.
[camel] 02/06: Updated client to be more dynamic (JSON instead of FORM)
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 de7502d2c8c1d667784a7bbd17888ad8884ee805
Author: Willian Antunes
AuthorDate: Tue May 1 16:17:55 2018 -0700
Updated client to be more dynamic (JSON instead of FORM)
---
.../camel/component/telegram/service/RestBotAPI.java | 13 +
.../service/TelegramServiceRestBotAPIAdapter.java| 20 ++--
2 files changed, 19 insertions(+), 14 deletions(-)
diff --git
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/RestBotAPI.java
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/RestBotAPI.java
index 99f3ab3..93642cf 100644
---
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/RestBotAPI.java
+++
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/RestBotAPI.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.telegram.service;
import java.util.List;
+
import javax.ws.rs.Consumes;
-import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
@@ -27,6 +27,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
+import org.apache.camel.component.telegram.model.OutgoingTextMessage;
import org.apache.camel.component.telegram.model.UpdateResult;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
@@ -50,15 +51,11 @@ public interface RestBotAPI {
@POST
@Path("/bot{authorizationToken}/sendMessage")
-@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
void sendMessage(
@PathParam("authorizationToken") String authorizationToken,
-@FormParam("chat_id") String chatId,
-@FormParam("text") String text,
-@FormParam("parse_mode") String parseMode,
-@FormParam("disable_web_page_preview") Boolean
disableWebPagePreview,
-@FormParam("disable_notification") Boolean disableNotification,
-@FormParam("reply_to_message_id") Long replyToMessageId);
+OutgoingTextMessage message);
@POST
diff --git
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/TelegramServiceRestBotAPIAdapter.java
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/TelegramServiceRestBotAPIAdapter.java
index 98fd0e8..7e6e7c9 100644
---
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/TelegramServiceRestBotAPIAdapter.java
+++
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/service/TelegramServiceRestBotAPIAdapter.java
@@ -20,11 +20,10 @@ import java.io.ByteArrayInputStream;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
+
import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap;
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-
import org.apache.camel.component.telegram.TelegramService;
import org.apache.camel.component.telegram.model.OutgoingAudioMessage;
import org.apache.camel.component.telegram.model.OutgoingDocumentMessage;
@@ -38,6 +37,10 @@ import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.apache.cxf.jaxrs.ext.multipart.ContentDisposition;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+
/**
* Adapts the {@code RestBotAPI} to the {@code TelegramService} interface.
*/
@@ -46,7 +49,7 @@ public class TelegramServiceRestBotAPIAdapter implements
TelegramService {
private RestBotAPI api;
public TelegramServiceRestBotAPIAdapter() {
-this.api = JAXRSClientFactory.create(RestBotAPI.BOT_API_DEFAULT_URL,
RestBotAPI.class, Collections.singletonList(new JacksonJsonProvider()));
+this.api = JAXRSClientFactory.create(RestBotAPI.BOT_API_DEFAULT_URL,
RestBotAPI.class, Collections.singletonList(providerByCustomObjectMapper()));
WebClient.getConfig(this.api).getHttpConduit().getClient().setAllowChunking(false);
}
@@ -74,8 +77,7 @@ public class TelegramServiceRestBotAPIAdapter implements
TelegramService {
private void sendMessage(String authorizationToken, OutgoingTextMessage
message) {
-api.sendMessage(authorizationToken, message.getChatId(),
message.getText(), message.getParseMode(), message.getDisableWebPagePreview(),
message.getDisableNotification(), message
-.getReplyToMessageId());
+api.sendMessage(authorizationToken, message);
}
@@ -175,4 +177,10 @@ public class TelegramServiceRestBotAPIAdapt
[camel] 06/06: License header and updated documentation
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 372412829c23ec7552cf99eea903cd59283e0a71
Author: Willian Antunes
AuthorDate: Sun May 6 07:15:05 2018 -0700
License header and updated documentation
---
.../src/main/docs/telegram-component.adoc | 57 ++
.../telegram/model/InlineKeyboardButton.java | 16 ++
.../telegram/model/ReplyKeyboardMarkup.java| 16 ++
3 files changed, 89 insertions(+)
diff --git a/components/camel-telegram/src/main/docs/telegram-component.adoc
b/components/camel-telegram/src/main/docs/telegram-component.adoc
index b90f06c..3ce6891 100644
--- a/components/camel-telegram/src/main/docs/telegram-component.adoc
+++ b/components/camel-telegram/src/main/docs/telegram-component.adoc
@@ -310,3 +310,60 @@
to("telegram:bots/123456789:AAE_dLq5C19xwGjw3yiC2NvEUrZcejK21-Q987654321:AAE_dLq
-
Note that the corresponding URI parameter is simply `chatId`.
+
+### Customizing keyboard
+
+You can customize the user keyboard instead of asking him to write an option.
`OutgoingTextMessage` has the property `ReplyKeyboardMarkup` which can be used
for such thing.
+
+[source,java]
+-
+from("telegram:bots/123456789:AAE_dLq5C19xwGjw3yiC2NvEUrZcejK21-Q987654321:AAE_dLq5C19xwOmg5yiC2NvSrkT3wj5Q1-L")
+.process(exchange -> {
+
+OutgoingTextMessage msg = new OutgoingTextMessage();
+msg.setText("Choose one option!");
+
+InlineKeyboardButton buttonOptionOneI = InlineKeyboardButton.builder()
+.text("Option One - I").build();
+
+InlineKeyboardButton buttonOptionOneII = InlineKeyboardButton.builder()
+.text("Option One - II").build();
+
+InlineKeyboardButton buttonOptionTwoI = InlineKeyboardButton.builder()
+.text("Option Two - I").build();
+
+ReplyKeyboardMarkup replyMarkup = ReplyKeyboardMarkup.builder()
+.keyboard()
+.addRow(Arrays.asList(buttonOptionOneI, buttonOptionOneII))
+.addRow(Arrays.asList(buttonOptionTwoI))
+.close()
+.oneTimeKeyboard(true)
+.build();
+
+msg.setReplyKeyboardMarkup(replyMarkup);
+
+exchange.getIn().setBody(msg);
+})
+
.to("telegram:bots/123456789:AAE_dLq5C19xwGjw3yiC2NvEUrZcejK21-Q987654321:AAE_dLq5C19xwOmg5yiC2NvSrkT3wj5Q1-L");
+-
+
+If you want to disable it the next message must have the property
`removeKeyboard` set on `ReplyKeyboardMarkup` object.
+
+[source,java]
+-
+from("telegram:bots/123456789:AAE_dLq5C19xwGjw3yiC2NvEUrZcejK21-Q987654321:AAE_dLq5C19xwOmg5yiC2NvSrkT3wj5Q1-L")
+.process(exchange -> {
+
+OutgoingTextMessage msg = new OutgoingTextMessage();
+msg.setText("Your answer was accepted!");
+
+ReplyKeyboardMarkup replyMarkup = ReplyKeyboardMarkup.builder()
+.removeKeyboard(true)
+.build();
+
+msg.setReplyKeyboardMarkup(replyMarkup);
+
+exchange.getIn().setBody(msg);
+})
+
.to("telegram:bots/123456789:AAE_dLq5C19xwGjw3yiC2NvEUrZcejK21-Q987654321:AAE_dLq5C19xwOmg5yiC2NvSrkT3wj5Q1-L");
+-
\ No newline at end of file
diff --git
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineKeyboardButton.java
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineKeyboardButton.java
index 06fdaa0..f3f2b4f 100644
---
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineKeyboardButton.java
+++
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineKeyboardButton.java
@@ -1,3 +1,19 @@
+/**
+ * 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.co
[camel] 03/06: New/updated models to comply with JSON/API requirements
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 2d2d8248550b548751f3a11fb586ca84a5880774
Author: Willian Antunes
AuthorDate: Tue May 1 16:18:38 2018 -0700
New/updated models to comply with JSON/API requirements
---
.../telegram/model/InlineKeyboardButton.java | 53
.../component/telegram/model/OutgoingMessage.java | 1 +
.../telegram/model/OutgoingTextMessage.java| 14 ++-
.../telegram/model/ReplyKeyboardMarkup.java| 133 +
4 files changed, 200 insertions(+), 1 deletion(-)
diff --git
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineKeyboardButton.java
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineKeyboardButton.java
new file mode 100644
index 000..06fdaa0
--- /dev/null
+++
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/InlineKeyboardButton.java
@@ -0,0 +1,53 @@
+package org.apache.camel.component.telegram.model;
+
+public class InlineKeyboardButton {
+
+private String text;
+
+public InlineKeyboardButton() {
+
+}
+
+public InlineKeyboardButton(String text) {
+
+this.text = text;
+}
+
+public String getText() {
+
+return text;
+}
+
+public void setText(String text) {
+
+this.text = text;
+}
+
+@Override
+public String toString() {
+final StringBuilder sb = new StringBuilder("InlineKeyboardButton{");
+sb.append("text='").append(text);
+sb.append('}');
+return sb.toString();
+}
+
+public static Builder builder() {
+
+return new Builder();
+}
+
+public static class Builder {
+
+private String text;
+
+public Builder text(String text) {
+
+this.text = text;
+return this;
+}
+
+public InlineKeyboardButton build() {
+return new InlineKeyboardButton(text);
+}
+}
+}
diff --git
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingMessage.java
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingMessage.java
index 060e40c..8f525e3 100644
---
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingMessage.java
+++
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingMessage.java
@@ -27,6 +27,7 @@ public abstract class OutgoingMessage implements Serializable
{
private static final long serialVersionUID = -5958829164103569292L;
+@JsonProperty("chat_id")
protected String chatId;
@JsonProperty("disable_notification")
diff --git
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingTextMessage.java
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingTextMessage.java
index cbaf1ac..2040d91 100644
---
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingTextMessage.java
+++
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/OutgoingTextMessage.java
@@ -32,6 +32,9 @@ public class OutgoingTextMessage extends OutgoingMessage {
@JsonProperty("disable_web_page_preview")
private Boolean disableWebPagePreview;
+
+@JsonProperty("reply_markup")
+private ReplyKeyboardMarkup replyKeyboardMarkup;
public OutgoingTextMessage() {
}
@@ -60,12 +63,21 @@ public class OutgoingTextMessage extends OutgoingMessage {
this.disableWebPagePreview = disableWebPagePreview;
}
+public ReplyKeyboardMarkup getReplyKeyboardMarkup() {
+return replyKeyboardMarkup;
+}
+
+public void setReplyKeyboardMarkup(ReplyKeyboardMarkup
replyKeyboardMarkup) {
+this.replyKeyboardMarkup = replyKeyboardMarkup;
+}
+
@Override
public String toString() {
final StringBuilder sb = new StringBuilder("OutgoingTextMessage{");
sb.append("text='").append(text).append('\'');
sb.append(", parseMode='").append(parseMode).append('\'');
-sb.append(", disableWebPagePreview=").append(disableWebPagePreview);
+sb.append(",
disableWebPagePreview=").append(disableWebPagePreview).append('\'');
+sb.append(", replyKeyboardMarkup=").append(replyKeyboardMarkup);
sb.append('}');
sb.append(' ');
sb.append(super.toString());
diff --git
a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/ReplyKeyboardMarkup.java
b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/model/ReplyKeyboardMarkup.java
new file mode 100644
index 000..d2894cc
--- /dev/null
+++
b/components/camel-telegra
[camel] 01/01: Daily build to test with newer JDK versions
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch test-jdk-9-10
in repository https://gitbox.apache.org/repos/asf/camel.git
commit effb0ac8b360c3f3091b2688a482e62dfab666f6
Author: Zoran Regvart
AuthorDate: Tue May 8 16:23:22 2018 +0200
Daily build to test with newer JDK versions
---
Jenkinsfile.daily | 89 +++
1 file changed, 89 insertions(+)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
new file mode 100644
index 000..c631529
--- /dev/null
+++ b/Jenkinsfile.daily
@@ -0,0 +1,89 @@
+/*
+ * 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.
+ */
+
+def LOCAL_REPOSITORY = env.LOCAL_REPOSITORY ?:
'/home/jenkins/jenkins-slave/maven-repositories/0'
+def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
+def BUILD_JDK_NAME = env.JDK_NAME ?: 'JDK 1.8 (latest)'
+
+def MAVEN_PARAMS = "-U -B -e -fae -V -Dmaven.repo.local=${LOCAL_REPOSITORY}
-Dnoassembly -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2"
+
+pipeline {
+
+agent {
+label AGENT_LABEL
+}
+
+triggers {
+cron('@daily')
+}
+
+options {
+buildDiscarder(
+logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
+)
+disableConcurrentBuilds()
+}
+
+stages {
+
+stage('Build') {
+tools {
+jdk BUILD_JDK_NAME
+}
+steps {
+sh "./mvnw $MAVEN_PARAMS -Dmaven.test.skip.exec=true clean
install"
+}
+}
+
+stage('Test JDK 9') {
+tools {
+jdk 'JDK 1.9 (latest)'
+}
+steps {
+sh script: "./mvnw $MAVEN_PARAMS
-Dmaven.test.failure.ignore=true test", returnStatus: 0
+}
+post {
+always {
+junit allowEmptyResults: true, testResults:
'**/target/surefire-reports/*.xml'
+junit allowEmptyResults: true, testResults:
'**/target/failsafe-reports/*.xml'
+sh "find . -path '*/target/surefire-reports/*' -delete -o
-path '*/target/failsafe-reports/*' -delete"
+}
+}
+}
+
+stage('Test JDK 10') {
+tools {
+jdk 'JDK 10 (latest)'
+}
+steps {
+sh script: "./mvnw $MAVEN_PARAMS
-Dmaven.test.failure.ignore=true test", returnStatus: 0
+}
+post {
+always {
+junit allowEmptyResults: true, testResults:
'**/target/surefire-reports/*.xml'
+junit allowEmptyResults: true, testResults:
'**/target/failsafe-reports/*.xml'
+sh "find . -path '*/target/surefire-reports/*' -delete -o
-path '*/target/failsafe-reports/*' -delete"
+}
+}
+}
+
+}
+
+}
+
--
To stop receiving notification emails like this one, please contact
zregv...@apache.org.
[camel] branch test-jdk-9-10 updated (4a68ba5 -> effb0ac)
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a change to branch test-jdk-9-10 in repository https://gitbox.apache.org/repos/asf/camel.git. discard 4a68ba5 Daily build to test with newer JDK versions add 8a9e7b7 Upgrade Undertow to version 1.4.25.Final add a4693ee Removed classmate property version since it is not used add e94cd11 Regen new effb0ac Daily build to test with newer JDK versions 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 (4a68ba5) \ N -- N -- N refs/heads/test-jdk-9-10 (effb0ac) 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: Jenkinsfile.daily | 4 ++-- components/readme.adoc| 4 +++- docs/user-manual/en/SUMMARY.md| 1 + parent/pom.xml| 3 +-- .../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact zregv...@apache.org.
