You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by co...@apache.org on 2018/06/07 16:11:38 UTC
[camel] branch master updated (b9c4f01 -> c10bc71)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from b9c4f01 CAMEL-12555: fix saga behavior when expression evaluation fails
new 1b65380 Downgrade MINA to fix failing camel-ldap tests (will be fixed from Mina 2.19)
new c10bc71 Upgrade javadoc plugin and fix a few javadoc errors
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/component/box/api/BoxCollaborationsManager.java | 1 -
.../org/apache/camel/component/box/api/BoxEventsManager.java | 2 --
.../org/apache/camel/component/box/api/BoxGroupsManager.java | 10 +++++-----
parent/pom.xml | 2 +-
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +-
pom.xml | 2 +-
6 files changed, 8 insertions(+), 11 deletions(-)
--
To stop receiving notification emails like this one, please contact
coheigea@apache.org.
[camel] 01/02: Downgrade MINA to fix failing camel-ldap tests (will
be fixed from Mina 2.19)
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1b653801f362eca202e7d10e7d976fc68dd33243
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Jun 7 17:09:54 2018 +0100
Downgrade MINA to fix failing camel-ldap tests (will be fixed from Mina 2.19)
---
parent/pom.xml | 2 +-
.../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 24bb841..028b09c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -499,7 +499,7 @@
<milo-version>0.2.1</milo-version>
<mina-bundle-version>1.1.7_6</mina-bundle-version>
<mina-version>1.1.7</mina-version>
- <mina2-version>2.0.18</mina2-version>
+ <mina2-version>2.0.17</mina2-version>
<minimal-json-version>0.9.4</minimal-json-version>
<mock-javamail-version>1.9</mock-javamail-version>
<mockwebserver-version>0.0.17</mockwebserver-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 9816594..9d51c71 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
@@ -3302,7 +3302,7 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>2.0.18</version>
+ <version>2.0.17</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
--
To stop receiving notification emails like this one, please contact
coheigea@apache.org.
[camel] 02/02: Upgrade javadoc plugin and fix a few javadoc errors
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c10bc714a86de5477305e5a3926af7b7ab8119ae
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Jun 7 17:10:52 2018 +0100
Upgrade javadoc plugin and fix a few javadoc errors
---
.../camel/component/box/api/BoxCollaborationsManager.java | 1 -
.../org/apache/camel/component/box/api/BoxEventsManager.java | 2 --
.../org/apache/camel/component/box/api/BoxGroupsManager.java | 10 +++++-----
pom.xml | 2 +-
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCollaborationsManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCollaborationsManager.java
index ec90561..a05317b 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCollaborationsManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCollaborationsManager.java
@@ -198,7 +198,6 @@ public class BoxCollaborationsManager {
*
* @param collaborationId
* - the id of comment to change.
- * @return The comment with changed message.
*/
public void deleteCollaboration(String collaborationId) {
try {
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventsManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventsManager.java
index 0ca7a9e..ad460ab 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventsManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxEventsManager.java
@@ -63,8 +63,6 @@ public class BoxEventsManager {
* - the starting position of the event stream.
* @param listener
* - the listener to add to event stream.
- *
- * @return The event stream.
*/
public void listen(EventListener listener, Long startingPosition) {
try {
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java
index 82dede3..4a3d83d 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java
@@ -295,17 +295,17 @@ public class BoxGroupsManager {
* - the updated information.
* @return The group information.
*/
- public BoxGroupMembership updateGroupMembershipInfo(String groupMemebershipId, BoxGroupMembership.Info info) {
+ public BoxGroupMembership updateGroupMembershipInfo(String groupMembershipId, BoxGroupMembership.Info info) {
try {
- LOG.debug("Updating info for groupMembership(id=" + groupMemebershipId + ")");
- if (groupMemebershipId == null) {
- throw new IllegalArgumentException("Parameter 'groupMemebershipId' can not be null");
+ LOG.debug("Updating info for groupMembership(id=" + groupMembershipId + ")");
+ if (groupMembershipId == null) {
+ throw new IllegalArgumentException("Parameter 'groupMembershipId' can not be null");
}
if (info == null) {
throw new IllegalArgumentException("Parameter 'info' can not be null");
}
- BoxGroupMembership groupMembership = new BoxGroupMembership(boxConnection, groupMemebershipId);
+ BoxGroupMembership groupMembership = new BoxGroupMembership(boxConnection, groupMembershipId);
groupMembership.updateInfo(info);
return groupMembership;
diff --git a/pom.xml b/pom.xml
index 55a8f25..b0fb292 100644
--- a/pom.xml
+++ b/pom.xml
@@ -191,7 +191,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.0-M1</version>
+ <version>3.0.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
--
To stop receiving notification emails like this one, please contact
coheigea@apache.org.