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 54d4fbdf724b17d1252c51599c03ae172c969703 Author: Andrea Cosentino <[email protected]> AuthorDate: Fri Nov 8 13:39:49 2019 +0100 Revert "Camel-Jpbm: Fixed Karaf feature" This reverts commit 5fdc2bc86b8904eae8f35b0000e1ef8e46902445. --- parent/pom.xml | 1 - platforms/karaf/features/src/main/resources/features.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 573adde..b8d93ee 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -332,7 +332,6 @@ <glassfish-jaxb-runtime-version>${jakarta-jaxb-version}</glassfish-jaxb-runtime-version> <jaxb2-maven-plugin-version>2.5.0</jaxb2-maven-plugin-version> <jbpm-version>7.29.0.Final</jbpm-version> - <jbpm-guava-osgi-version>25.0-jre</jbpm-guava-osgi-version> <jboss-logging-version>3.4.0.Final</jboss-logging-version> <jboss-marshalling-version>1.4.10.Final</jboss-marshalling-version> <jboss-transaction-spi.version>7.5.1.Final</jboss-transaction-spi.version> diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 633a610..3e0c5ab 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1441,7 +1441,7 @@ <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-jackson/${jbpm-version}</bundle> <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-xstream/${jbpm-version}</bundle> <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle> - <bundle dependency='true'>mvn:com.google.guava/guava/${jbpm-guava-osgi-version}</bundle> + <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-math3/${commons-math3-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
