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 <[email protected]> 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>
