Repository: camel Updated Branches: refs/heads/camel-2.13.x [created] f9a596657
http://git-wip-us.apache.org/repos/asf/camel/blob/56bd1e61/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index e17487e..d06c12a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -332,9 +332,8 @@ <pdfbox-version>1.6.0</pdfbox-version> <plexus-container-default-version>1.0-alpha-48</plexus-container-default-version> <plexus-utils-version>1.5.6</plexus-utils-version> - <pojosr-version>0.2.1</pojosr-version> - <protobuf-java-bundle-version>2.3.0_3</protobuf-java-bundle-version> - <protobuf-version>2.3.0</protobuf-version> + <pojosr-version>0.2.1</pojosr-version> + <protobuf-version>2.5.0</protobuf-version> <qpid-bundle-version>0.26_1</qpid-bundle-version> <qpid-version>0.26</qpid-version> <quartz-bundle-version>1.8.6_1</quartz-bundle-version> http://git-wip-us.apache.org/repos/asf/camel/blob/56bd1e61/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 97fcfa8..61fb300 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -247,7 +247,7 @@ <feature version='${project.version}'>camel-core</feature> <feature>http</feature> <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.protobuf-java/${protobuf-java-bundle-version}</bundle> + <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-smile/${jackson2-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime-bundle-version}</bundle> @@ -404,7 +404,7 @@ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-math/${commons-math-version}</bundle> <bundle dependency='true'>mvn:commons-net/commons-net/${commons-net-version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.protobuf-java/${protobuf-java-bundle-version}</bundle> + <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle> <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle> <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty6-bundle-version}</bundle> @@ -476,7 +476,7 @@ <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle> <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle> - <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/2.5.0</bundle><!-- newer than ${protobuf-java-bundle-version} --> + <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.guice/${guice-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.paranamer/${paranamer-bundle-version}</bundle> @@ -826,7 +826,7 @@ <bundle dependency='true'>wrap:mvn:org.eclipse.jdt.core.compiler/ecj/${eclipse-compiler-version}</bundle> <bundle dependency='true'>mvn:org.mvel/mvel2/${mvel-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.protobuf-java/${protobuf-java-bundle-version}</bundle> + <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-optaplanner/${project.version}</bundle> </feature> @@ -840,7 +840,7 @@ </feature> <feature name='camel-protobuf' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.protobuf-java/${protobuf-java-bundle-version}</bundle> + <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle> <bundle>mvn:org.apache.camel/camel-protobuf/${project.version}</bundle> </feature> <feature name='camel-quartz' version='${project.version}' resolver='(obr)' start-level='50'>
