Repository: camel Updated Branches: refs/heads/master 18f3e27d8 -> f1aee991d
CAMEL-9600 update fop to 2.1 in karaf features Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9e18a1d1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9e18a1d1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9e18a1d1 Branch: refs/heads/master Commit: 9e18a1d157d453c9b24b6a88424802222a2b639b Parents: 69aea91 Author: syakimovich <s0yakimov...@gmail.com> Authored: Fri Apr 8 14:47:02 2016 +0300 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Apr 9 07:43:40 2016 +0200 ---------------------------------------------------------------------- parent/pom.xml | 7 ++++--- platforms/karaf/features/src/main/resources/features.xml | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9e18a1d1/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 72ff50f..a1b3b3e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -173,7 +173,7 @@ <felix-scr-annotations-version>1.9.12</felix-scr-annotations-version> <findbugs-maven-plugin-version>2.5.2</findbugs-maven-plugin-version> <flatpack-version>3.4.3</flatpack-version> - <fop-bundle-version>1.1_1</fop-bundle-version> + <fop-bundle-version>2.1_1</fop-bundle-version> <fop-version>2.1</fop-version> <ftpserver-version>1.0.6</ftpserver-version> <freemarker-bundle-version>2.3.23_1</freemarker-bundle-version> @@ -585,12 +585,13 @@ <xerces-version>2.11.0</xerces-version> <!-- needed to manage the xml-apis version in camel-xmljson --> <xml-apis-version>1.4.01</xml-apis-version> + <xml-apis-ext-version>1.3.04</xml-apis-ext-version> <xml-resolver-version>1.2</xml-resolver-version> <xmlbeans-bundle-version>2.6.0_2</xmlbeans-bundle-version> <xmlbeans-maven-plugin-version>2.3.3</xmlbeans-maven-plugin-version> <xmlbeans-version>2.6.0</xmlbeans-version> - <xmlgraphics-commons-bundle-version>1.5_1</xmlgraphics-commons-bundle-version> - <xmlgraphics-batik-version>1.7</xmlgraphics-batik-version> + <xmlgraphics-commons-bundle-version>2.1_1</xmlgraphics-commons-bundle-version> + <xmlgraphics-batik-version>1.8</xmlgraphics-batik-version> <xmlresolver-bundle-version>1.2_5</xmlresolver-bundle-version> <xmlrpc-version>3.1.3</xmlrpc-version> <xmlrpc-client-bundle-version>3.1.3_1</xmlrpc-client-bundle-version> http://git-wip-us.apache.org/repos/asf/camel/blob/9e18a1d1/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 e26b738..a102264 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -487,6 +487,7 @@ <bundle dependency="true">wrap:mvn:org.apache.xmlgraphics/batik-svggen/${xmlgraphics-batik-version}$Bundle-SymbolicName=org.apache.xmlgraphics.batik-svggen&Bundle-Version=${xmlgraphics-batik-version}</bundle> <bundle dependency="true">wrap:mvn:org.apache.xmlgraphics/batik-extension/${xmlgraphics-batik-version}$Bundle-SymbolicName=org.apache.xmlgraphics.batik-extension&Bundle-Version=${xmlgraphics-batik-version}</bundle> <bundle dependency="true">wrap:mvn:org.apache.xmlgraphics/batik-ext/${xmlgraphics-batik-version}$Bundle-SymbolicName=org.apache.xmlgraphics.batik-ext&Bundle-Version=${xmlgraphics-batik-version}</bundle> + <bundle dependency="true">wrap:mvn:xml-apis/xml-apis-ext/${xml-apis-ext-version}$Bundle-SymbolicName=xml-apis-ext&Bundle-Version=${xml-apis-ext-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fop/${fop-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-fop/${project.version}</bundle>
