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 2019/11/20 10:22:24 UTC
[camel] branch master updated (473000d -> 83d6125)
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 473000d CAMEL-14191: EIP docs - Add links to last EIP patterns and add new pages if missing content
new 092c868 Fixing owasp plugin
new 8c96f84 Updating Apache Directory
new ac8e2fa Updating iota version
new f3b5746 Updating dozer
new 2bf5f7f Removing unnecessary netty exclusion from zookeeper poms
new 7d641db Updating grpc
new 0512dd8 Updating google maps
new bf7c7a7 Updating Spring Cloud
new 9d55256 Fixing camel-ldif feature
new 83d6125 Updating Shiro
The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/camel/component/iota/IOTAConstants.java | 2 +-
.../apache/camel/component/iota/IOTAEndpoint.java | 18 ++++++-------
.../apache/camel/component/iota/IOTAProducer.java | 22 ++++++++++------
components/camel-zookeeper-master/pom.xml | 10 --------
components/camel-zookeeper/pom.xml | 11 --------
parent/pom.xml | 26 ++++++++++---------
.../karaf/features/src/main/resources/features.xml | 30 +++++++++++-----------
.../components-starter/camel-iota-starter/pom.xml | 12 +++++++++
8 files changed, 65 insertions(+), 66 deletions(-)
[camel] 07/10: Updating google maps
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 0512dd8216e9d956bfdbcc12b82b9640e8f9900c
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Nov 19 16:02:55 2019 +0000
Updating google maps
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index d9d10b8..1086641 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -202,7 +202,7 @@
<findbugs-maven-plugin-version>2.5.2</findbugs-maven-plugin-version>
<google-findbugs-jsr305-version>3.0.2</google-findbugs-jsr305-version>
<google-findbugs-annotations2-version>2.0.3</google-findbugs-annotations2-version>
- <google-maps-services-version>0.2.9</google-maps-services-version>
+ <google-maps-services-version>0.10.1</google-maps-services-version>
<flatpack-version>4.0.4</flatpack-version>
<flink-version>1.9.1</flink-version>
<fop-bundle-version>2.3_1</fop-bundle-version>
[camel] 08/10: Updating Spring Cloud
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 bf7c7a759bea465c76ec42fdb59d438c34c2ac69
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Nov 19 16:05:16 2019 +0000
Updating Spring Cloud
---
parent/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 1086641..213eadf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -585,10 +585,10 @@
<spring-batch-version>4.1.2.RELEASE</spring-batch-version>
<spring-batch-bundle-version>4.1.2.RELEASE_1</spring-batch-bundle-version>
<spring-boot-version>2.2.1.RELEASE</spring-boot-version>
- <spring-cloud-commons-version>2.1.3.RELEASE</spring-cloud-commons-version>
- <spring-cloud-consul-version>2.1.3.RELEASE</spring-cloud-consul-version>
- <spring-cloud-netflix-version>2.1.3.RELEASE</spring-cloud-netflix-version>
- <spring-cloud-zookeeper-version>2.1.3.RELEASE</spring-cloud-zookeeper-version>
+ <spring-cloud-commons-version>2.1.4.RELEASE</spring-cloud-commons-version>
+ <spring-cloud-consul-version>2.1.4.RELEASE</spring-cloud-consul-version>
+ <spring-cloud-netflix-version>2.1.4.RELEASE</spring-cloud-netflix-version>
+ <spring-cloud-zookeeper-version>2.1.4.RELEASE</spring-cloud-zookeeper-version>
<spring-data-commons-bundle-version>2.1.10.RELEASE_1</spring-data-commons-bundle-version>
<spring-data-keyvalue-bundle-version>2.1.10.RELEASE_1</spring-data-keyvalue-bundle-version>
<spring-data-redis-version>2.1.10.RELEASE</spring-data-redis-version>
[camel] 05/10: Removing unnecessary netty exclusion from zookeeper
poms
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 2bf5f7fb8fbc7a12d257b2fdff4e864d46e3ba81
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Nov 19 15:32:42 2019 +0000
Removing unnecessary netty exclusion from zookeeper poms
---
components/camel-zookeeper-master/pom.xml | 10 ----------
components/camel-zookeeper/pom.xml | 11 -----------
2 files changed, 21 deletions(-)
diff --git a/components/camel-zookeeper-master/pom.xml b/components/camel-zookeeper-master/pom.xml
index 7d61b85..fb25a6f 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -53,13 +53,8 @@
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper-version}</version>
- <!-- Just exclude the old version of netty to avoid netty version conflict-->
<exclusions>
<exclusion>
- <groupId>org.jboss.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
@@ -69,11 +64,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- <version>${netty3-version}</version>
- </dependency>
<dependency>
<groupId>org.apache.curator</groupId>
diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml
index 739d752..a421f07 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -46,13 +46,8 @@
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper-version}</version>
- <!-- Just exclude the old version of netty to avoid netty version conflict-->
<exclusions>
<exclusion>
- <groupId>org.jboss.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
@@ -63,12 +58,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- <version>${netty3-version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
<version>${curator-version}</version>
[camel] 03/10: Updating iota version
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 ac8e2fa0f95dd1e6a73e4329d5822d54ea800bfb
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Nov 19 15:11:18 2019 +0000
Updating iota version
---
.../apache/camel/component/iota/IOTAConstants.java | 2 +-
.../apache/camel/component/iota/IOTAEndpoint.java | 18 +++++++++---------
.../apache/camel/component/iota/IOTAProducer.java | 22 ++++++++++++++--------
parent/pom.xml | 2 +-
.../components-starter/camel-iota-starter/pom.xml | 12 ++++++++++++
5 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAConstants.java b/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAConstants.java
index 53cb6ad..aa013e6 100644
--- a/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAConstants.java
+++ b/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAConstants.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.iota;
-import jota.utils.Constants;
+import org.iota.jota.utils.Constants;
public final class IOTAConstants {
diff --git a/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAEndpoint.java b/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAEndpoint.java
index 7cdcfbc..2b25dfb 100644
--- a/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAEndpoint.java
+++ b/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAEndpoint.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.iota;
import java.net.URL;
-import jota.IotaAPI;
+import org.iota.jota.IotaAPI;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -74,7 +74,7 @@ public class IOTAEndpoint extends DefaultEndpoint {
@Override
protected void doStart() throws Exception {
final URL u = new URL(url);
- apiClient = new IotaAPI.Builder().protocol(u.getProtocol()).host(u.getHost()).port(String.valueOf(u.getPort())).build();
+ apiClient = new IotaAPI.Builder().protocol(u.getProtocol()).host(u.getHost()).port(u.getPort()).build();
super.doStart();
}
@@ -92,7 +92,7 @@ public class IOTAEndpoint extends DefaultEndpoint {
/**
* Component name
- *
+ *
* @param url
*/
public void setName(String name) {
@@ -105,7 +105,7 @@ public class IOTAEndpoint extends DefaultEndpoint {
/**
* Node url
- *
+ *
* @param url
*/
public void setUrl(String url) {
@@ -118,7 +118,7 @@ public class IOTAEndpoint extends DefaultEndpoint {
/**
* TAG
- *
+ *
* @param tag
*/
public void setTag(String tag) {
@@ -131,7 +131,7 @@ public class IOTAEndpoint extends DefaultEndpoint {
/**
* Address security level
- *
+ *
* @param security level
*/
public void setSecurityLevel(Integer securityLevel) {
@@ -146,7 +146,7 @@ public class IOTAEndpoint extends DefaultEndpoint {
* The minWeightMagnitude is the minimum number of zeroes that a
* proof-of-work output/transaction hash must end with to be considered
* valid by full nodes
- *
+ *
* @param minWeightMagnitude
*/
@@ -160,7 +160,7 @@ public class IOTAEndpoint extends DefaultEndpoint {
/**
* The depth determines how deep the tangle is analysed for getting Tips
- *
+ *
* @param depth
*/
public void setDepth(Integer depth) {
@@ -177,7 +177,7 @@ public class IOTAEndpoint extends DefaultEndpoint {
/**
* Supported operations are 'sendTransfer', 'getNewAddress'
- *
+ *
* @param operation
*/
public void setOperation(String operation) {
diff --git a/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAProducer.java b/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAProducer.java
index bc4b28d..2cb15d8 100644
--- a/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAProducer.java
+++ b/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAProducer.java
@@ -19,11 +19,12 @@ package org.apache.camel.component.iota;
import java.util.ArrayList;
import java.util.List;
-import jota.dto.response.GetNewAddressResponse;
-import jota.dto.response.GetTransferResponse;
-import jota.dto.response.SendTransferResponse;
-import jota.model.Transfer;
-import jota.utils.TrytesConverter;
+import org.iota.jota.builder.AddressRequest;
+import org.iota.jota.dto.response.GetNewAddressResponse;
+import org.iota.jota.dto.response.GetTransferResponse;
+import org.iota.jota.dto.response.SendTransferResponse;
+import org.iota.jota.model.Transfer;
+import org.iota.jota.utils.TrytesConverter;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultProducer;
import org.apache.commons.lang3.StringUtils;
@@ -74,10 +75,15 @@ public class IOTAProducer extends DefaultProducer {
exchange.getIn().setBody(response.getTransactions());
} else if (endpoint.getOperation().equals(IOTAConstants.GET_NEW_ADDRESS_OPERATION)) {
-
+
Integer index = exchange.getIn().getHeader(IOTAConstants.ADDRESS_INDEX_HEADER, Integer.class);
- GetNewAddressResponse response = endpoint.getApiClient().getNewAddress(seed, endpoint.getSecurityLevel(), index, true, 1, false);
+ AddressRequest addressRequest = new AddressRequest.Builder(seed, endpoint.getSecurityLevel())
+ .index(index)
+ .checksum(true)
+ .amount(1)
+ .build();
+ GetNewAddressResponse response = endpoint.getApiClient().generateNewAddresses(addressRequest);
exchange.getIn().setBody(response.getAddresses());
} else if (endpoint.getOperation().equals(IOTAConstants.GET_TRANSFERS_OPERATION)) {
Integer startIdx = exchange.getIn().getHeader(IOTAConstants.ADDRESS_START_INDEX_HEADER, Integer.class);
@@ -85,7 +91,7 @@ public class IOTAProducer extends DefaultProducer {
GetTransferResponse response = endpoint.getApiClient().getTransfers(seed, endpoint.getSecurityLevel(), startIdx, endIdx, true);
exchange.getIn().setBody(response.getTransfers());
- }
+ }
}
}
diff --git a/parent/pom.xml b/parent/pom.xml
index b41eccb..62b57a0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -365,7 +365,7 @@
<jmh-version>1.22</jmh-version>
<jodatime-bundle-version>1.6.2</jodatime-bundle-version>
<jodatime2-bundle-version>2.10.4</jodatime2-bundle-version>
- <jota-version>1.0.0-beta3</jota-version>
+ <jota-version>1.0.0-beta7</jota-version>
<jolokia-version>1.6.2</jolokia-version>
<jolt-version>0.1.1</jolt-version>
<jolt-bundle-version>0.1.1_1</jolt-bundle-version>
diff --git a/platforms/spring-boot/components-starter/camel-iota-starter/pom.xml b/platforms/spring-boot/components-starter/camel-iota-starter/pom.xml
index 32ca7dc..201061c 100644
--- a/platforms/spring-boot/components-starter/camel-iota-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-iota-starter/pom.xml
@@ -38,6 +38,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-iota</artifactId>
<version>${project.version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
[camel] 02/10: Updating Apache Directory
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 8c96f8455a579c7a097f94631a29ecd4c1503825
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Nov 19 14:31:46 2019 +0000
Updating Apache Directory
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 8926be1..b41eccb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -49,7 +49,7 @@
<ant-bundle-version>1.7.0_6</ant-bundle-version>
<antlr-bundle-version>3.5.2_1</antlr-bundle-version>
<antlr-runtime-bundle-version>3.5.2_1</antlr-runtime-bundle-version>
- <apacheds-version>2.0.0-M24</apacheds-version>
+ <apacheds-version>2.0.0.AM25</apacheds-version>
<apache-any23-version>2.3</apache-any23-version>
<apache-any23-bundle-version>2.3_1</apache-any23-bundle-version>
<apache-drill-version>1.16.0</apache-drill-version>
[camel] 06/10: Updating grpc
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 7d641dba15ff596c56007807eb9a89f710b66a09
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Nov 19 15:45:12 2019 +0000
Updating grpc
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index fdda07f..d9d10b8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -240,7 +240,7 @@
<google-truth-version>0.30</google-truth-version>
<graphql-java-version>13.0</graphql-java-version>
<grizzly-websockets-version>2.3.25</grizzly-websockets-version>
- <grpc-version>1.24.1</grpc-version>
+ <grpc-version>1.25.0</grpc-version>
<grpc-google-auth-library-version>0.13.0</grpc-google-auth-library-version>
<grpc-guava-version>26.0-android</grpc-guava-version>
<grpc-java-jwt-version>3.7.0</grpc-java-jwt-version>
[camel] 01/10: Fixing owasp plugin
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 092c868312b12b7555b688d177cf8e5a0c900047
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Nov 19 14:26:14 2019 +0000
Fixing owasp plugin
---
parent/pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index aedb1a9..8926be1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -5645,13 +5645,14 @@
<skipProvidedScope>false</skipProvidedScope>
<skipRuntimeScope>false</skipRuntimeScope>
<skipTestScope>true</skipTestScope>
+ <skipSystemScope>true</skipSystemScope>
<format>ALL</format>
</configuration>
<executions>
<execution>
<phase>validate</phase>
<goals>
- <goal>check</goal>
+ <goal>aggregate</goal>
</goals>
</execution>
</executions>
[camel] 04/10: Updating dozer
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 f3b5746eed98118fbfb9bae992842c32f0b05137
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Nov 19 15:15:02 2019 +0000
Updating dozer
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 62b57a0..fdda07f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -169,7 +169,7 @@
<docker-java-version>3.1.5</docker-java-version>
<docker-java-bundle-version>3.1.5_1</docker-java-bundle-version>
<dom4j-bundle-version>1.6.1_5</dom4j-bundle-version>
- <dozer-version>6.4.1</dozer-version>
+ <dozer-version>6.5.0</dozer-version>
<drools-version>7.29.0.Final</drools-version>
<dropbox-version>3.1.1</dropbox-version>
<debezium-version>0.10.0.Final</debezium-version>
[camel] 10/10: Updating Shiro
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 83d6125c5ec82638729b83be2366e99d205aa390
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Nov 20 10:21:46 2019 +0000
Updating Shiro
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 2a5754e..bd0bbb2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -561,7 +561,7 @@
<serp-bundle-version>1.14.1_1</serp-bundle-version>
<servicemix-specs-version>2.9.0</servicemix-specs-version>
<servlet-version-range>[3,4)</servlet-version-range>
- <shiro-version>1.4.1</shiro-version>
+ <shiro-version>1.4.2</shiro-version>
<shrinkwrap-descriptors-version>2.0.0</shrinkwrap-descriptors-version>
<shrinkwrap-resolver-version>3.1.3</shrinkwrap-resolver-version>
<shrinkwrap-version>1.2.6</shrinkwrap-version>
[camel] 09/10: Fixing camel-ldif feature
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 9d55256f0cd55700ef5de4c67655367fcaf2b7a7
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Nov 20 09:32:29 2019 +0000
Fixing camel-ldif feature
---
parent/pom.xml | 3 ++-
.../karaf/features/src/main/resources/features.xml | 30 +++++++++++-----------
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 213eadf..2a5754e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -126,6 +126,7 @@
<commons-beanutils-version>1.9.4</commons-beanutils-version>
<commons-codec-version>1.13</commons-codec-version>
<commons-collections-version>3.2.2</commons-collections-version>
+ <commons-collections4-version>4.4</commons-collections4-version>
<commons-compress-version>1.19</commons-compress-version>
<commons-configuration-version>1.9</commons-configuration-version>
<commons-configuration2-version>2.6</commons-configuration2-version>
@@ -458,7 +459,7 @@
<microprofile-health-version>2.1</microprofile-health-version>
<milo-version>0.2.5</milo-version>
<mimepull-version>1.9.12</mimepull-version>
- <mina-version>2.0.21</mina-version>
+ <mina-version>2.1.3</mina-version>
<minidns-version>0.3.4</minidns-version>
<minimal-json-version>0.9.5</minimal-json-version>
<mock-javamail-version>1.9</mock-javamail-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 759dacc..2b9c246 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1631,24 +1631,24 @@
</feature>
<feature name='camel-ldif' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:org.apache.directory.api/api-i18n/1.0.0</bundle>
- <bundle dependency='true'>mvn:org.apache.directory.api/api-asn1-api/1.0.0</bundle>
- <bundle dependency='true'>mvn:org.apache.directory.api/api-asn1-ber/1.0.0</bundle>
- <bundle dependency='true'>mvn:org.apache.directory.api/api-ldap-client-api/1.0.0</bundle>
- <bundle dependency='true'>mvn:org.apache.directory.api/api-ldap-codec-core/1.0.0</bundle>
- <bundle dependency='true'>mvn:org.apache.directory.api/api-ldap-extras-aci/1.0.0</bundle>
- <bundle dependency='true'>mvn:org.apache.directory.api/api-ldap-extras-codec/1.0.0</bundle>
- <bundle dependency='true'>mvn:org.apache.directory.api/api-ldap-extras-codec-api/1.0.0</bundle>
- <bundle dependency='true'>mvn:org.apache.directory.api/api-ldap-extras-util/1.0.0</bundle>
- <bundle dependency='true'>mvn:org.apache.directory.api/api-ldap-model/1.0.0</bundle>
- <bundle dependency='true'>mvn:org.apache.directory.api/api-ldap-schema-data/1.0.0</bundle>
- <bundle dependency='true'>mvn:org.apache.directory.api/api-util/1.0.0</bundle>
+ <bundle dependency='true'>mvn:org.apache.directory.api/api-i18n/2.0.0</bundle>
+ <bundle dependency='true'>mvn:org.apache.directory.api/api-asn1-api/2.0.0</bundle>
+ <bundle dependency='true'>mvn:org.apache.directory.api/api-asn1-ber/2.0.0</bundle>
+ <bundle dependency='true'>mvn:org.apache.directory.api/api-ldap-client-api/2.0.0</bundle>
+ <bundle dependency='true'>mvn:org.apache.directory.api/api-ldap-codec-core/2.0.0</bundle>
+ <bundle dependency='true'>mvn:org.apache.directory.api/api-ldap-extras-aci/2.0.0</bundle>
+ <bundle dependency='true'>mvn:org.apache.directory.api/api-ldap-extras-codec/2.0.0</bundle>
+ <bundle dependency='true'>mvn:org.apache.directory.api/api-ldap-extras-codec-api/2.0.0</bundle>
+ <bundle dependency='true'>mvn:org.apache.directory.api/api-ldap-extras-util/2.0.0</bundle>
+ <bundle dependency='true'>mvn:org.apache.directory.api/api-ldap-model/2.0.0</bundle>
+ <bundle dependency='true'>mvn:org.apache.directory.api/api-ldap-schema-data/2.0.0</bundle>
+ <bundle dependency='true'>mvn:org.apache.directory.api/api-util/2.0.0</bundle>
<bundle dependency='true'>mvn:org.apache.directory.server/apacheds-core-api/${apacheds-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/2.7.7_5</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
- <bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
- <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
- <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.commons/commons-collections4/${commons-collections4-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.commons/commons-pool2/${commons-pool2-version}</bundle>
<bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ldif/${project.version}</bundle>
</feature>