It is good to avoid minor dependency updates in Camel micro releases, and this should be kept as true as possible especially with main dependencies, but with the big fauna of dependencies of the project it is best to have flexibility over this rule to avoid paralysis :-)
A better commit message however would have been maybe more helpful, especially in discouraging those contributors who in future will make updates like this without good motivations. Thank you guys for your work ;-) Cristiano 2013/10/18 Claus Ibsen <[email protected]> > camel-fop doesnt work in karaf without this upgrade. > > > > On Fri, Oct 18, 2013 at 1:08 AM, Christian Müller > <[email protected]> wrote: > > I thought we agreed to not do minor dependency updates in Camel micro > > releases. > > > > Best, > > Christian > > Am 17.10.2013 09:29 schrieb <[email protected]>: > > > >> Updated Branches: > >> refs/heads/camel-2.12.x 6eea01095 -> faff7402f > >> > >> > >> upgrade fop 1.0 to 1.1 > >> > >> > >> Project: http://git-wip-us.apache.org/repos/asf/camel/repo > >> Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/faff7402 > >> Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/faff7402 > >> Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/faff7402 > >> > >> Branch: refs/heads/camel-2.12.x > >> Commit: faff7402fb51a99f9b6529e7d8d8550e0cd88acd > >> Parents: 6eea010 > >> Author: cmueller <[email protected]> > >> Authored: Sat Oct 5 13:06:47 2013 +0200 > >> Committer: Claus Ibsen <[email protected]> > >> Committed: Thu Oct 17 10:29:40 2013 +0200 > >> > >> ---------------------------------------------------------------------- > >> components/camel-fop/pom.xml | 21 > ++++++++++++++++++++ > >> parent/pom.xml | 7 +++++-- > >> .../features/src/main/resources/features.xml | 21 > ++++++++++++++++++++ > >> 3 files changed, 47 insertions(+), 2 deletions(-) > >> ---------------------------------------------------------------------- > >> > >> > >> > >> > http://git-wip-us.apache.org/repos/asf/camel/blob/faff7402/components/camel-fop/pom.xml > >> ---------------------------------------------------------------------- > >> diff --git a/components/camel-fop/pom.xml b/components/camel-fop/pom.xml > >> index bc94586..6651a02 100644 > >> --- a/components/camel-fop/pom.xml > >> +++ b/components/camel-fop/pom.xml > >> @@ -43,6 +43,27 @@ > >> <groupId>org.apache.xmlgraphics</groupId> > >> <artifactId>fop</artifactId> > >> <version>${fop-version}</version> > >> + <!-- See https://issues.apache.org/jira/browse/FOP-2151--> > >> + <exclusions> > >> + <exclusion> > >> + <groupId>org.apache.avalon.framework</groupId> > >> + <artifactId>avalon-framework-api</artifactId> > >> + </exclusion> > >> + <exclusion> > >> + <groupId>org.apache.avalon.framework</groupId> > >> + <artifactId>avalon-framework-impl</artifactId> > >> + </exclusion> > >> + </exclusions> > >> + </dependency> > >> + <dependency> > >> + <groupId>org.apache.avalon.framework</groupId> > >> + <artifactId>avalon-framework-api</artifactId> > >> + <version>${avalon-version}</version> > >> + </dependency> > >> + <dependency> > >> + <groupId>org.apache.avalon.framework</groupId> > >> + <artifactId>avalon-framework-impl</artifactId> > >> + <version>${avalon-version}</version> > >> </dependency> > >> > >> <!-- for testing --> > >> > >> > http://git-wip-us.apache.org/repos/asf/camel/blob/faff7402/parent/pom.xml > >> ---------------------------------------------------------------------- > >> diff --git a/parent/pom.xml b/parent/pom.xml > >> index 8ca52f9..4bedd5c 100644 > >> --- a/parent/pom.xml > >> +++ b/parent/pom.xml > >> @@ -57,6 +57,7 @@ > >> <aspectj-version>1.6.2</aspectj-version> > >> > <atomikos-transactions-version>3.8.0</atomikos-transactions-version> > >> <avalon-bundle-version>4.3.1_1</avalon-bundle-version> > >> + <avalon-version>4.3.1</avalon-version> > >> <avro-version>1.7.3</avro-version> > >> <avro-bundle-version>1.7.3_1</avro-bundle-version> > >> <aws-java-sdk-bundle-version>1.5.1_1</aws-java-sdk-bundle-version> > >> @@ -132,8 +133,8 @@ > >> <felix-framework-version>3.2.2</felix-framework-version> > >> > <findbugs-maven-plugin-version>2.5.2</findbugs-maven-plugin-version> > >> <flatpack-bundle-version>3.2.0_2</flatpack-bundle-version> > >> - <fop-bundle-version>1.0_3</fop-bundle-version> > >> - <fop-version>1.0</fop-version> > >> + <fop-bundle-version>1.1_1</fop-bundle-version> > >> + <fop-version>1.1</fop-version> > >> <ftpserver-version>1.0.6</ftpserver-version> > >> <freemarker-bundle-version>2.3.20_1</freemarker-bundle-version> > >> <freemarker-version>2.3.20</freemarker-version> > >> @@ -413,6 +414,8 @@ > >> <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> > >> <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/faff7402/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 2f7f96d..e37805d 100644 > >> --- a/platforms/karaf/features/src/main/resources/features.xml > >> +++ b/platforms/karaf/features/src/main/resources/features.xml > >> @@ -283,7 +283,28 @@ > >> </feature> > >> <feature name='camel-fop' version='${project.version}' > resolver='(obr)' > >> start-level='50'> > >> <feature version='${project.version}'>camel-core</feature> > >> + <bundle > >> > dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle> > >> + <bundle > >> > dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle> > >> + <bundle > >> > dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle> > >> + <bundle > >> > dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle> > >> <bundle > >> > dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avalon-framework/${avalon-bundle-version}</bundle> > >> + <bundle > >> > dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlgraphics-commons/${xmlgraphics-commons-bundle-version}</bundle> > >> + <bundle > >> > dependency="true">wrap:mvn:org.apache.xmlgraphics/batik-svg-dom/${xmlgraphics-batik-version}</bundle> > >> + <bundle > >> > dependency="true">wrap:mvn:org.apache.xmlgraphics/batik-anim/${xmlgraphics-batik-version}</bundle> > >> + <bundle > >> > dependency="true">wrap:mvn:org.apache.xmlgraphics/batik-css/${xmlgraphics-batik-version}</bundle> > >> + <bundle > >> > dependency="true">wrap:mvn:org.apache.xmlgraphics/batik-dom/${xmlgraphics-batik-version}</bundle> > >> + <bundle > >> > dependency="true">wrap:mvn:org.apache.xmlgraphics/batik-parser/${xmlgraphics-batik-version}</bundle> > >> + <bundle > >> > dependency="true">wrap:mvn:org.apache.xmlgraphics/batik-util/${xmlgraphics-batik-version}</bundle> > >> + <bundle > >> > dependency="true">wrap:mvn:org.apache.xmlgraphics/batik-bridge/${xmlgraphics-batik-version}</bundle> > >> + <bundle > >> > dependency="true">wrap:mvn:org.apache.xmlgraphics/batik-script/${xmlgraphics-batik-version}</bundle> > >> + <bundle > >> > dependency="true">wrap:mvn:org.apache.xmlgraphics/batik-js/${xmlgraphics-batik-version}</bundle> > >> + <bundle > >> > dependency="true">wrap:mvn:org.apache.xmlgraphics/batik-xml/${xmlgraphics-batik-version}</bundle> > >> + <bundle > >> > dependency="true">wrap:mvn:org.apache.xmlgraphics/batik-awt-util/${xmlgraphics-batik-version}</bundle> > >> + <bundle > >> > dependency="true">wrap:mvn:org.apache.xmlgraphics/batik-gvt/${xmlgraphics-batik-version}</bundle> > >> + <bundle > >> > dependency="true">wrap:mvn:org.apache.xmlgraphics/batik-transcoder/${xmlgraphics-batik-version}</bundle> > >> + <bundle > >> > dependency="true">wrap:mvn:org.apache.xmlgraphics/batik-svggen/${xmlgraphics-batik-version}</bundle> > >> + <bundle > >> > dependency="true">wrap:mvn:org.apache.xmlgraphics/batik-extension/${xmlgraphics-batik-version}</bundle> > >> + <bundle > >> > dependency="true">wrap:mvn:org.apache.xmlgraphics/batik-ext/${xmlgraphics-batik-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> > >> </feature> > >> > >> > > > > -- > Claus Ibsen > ----------------- > Red Hat, Inc. > Email: [email protected] > Twitter: davsclaus > Blog: http://davsclaus.com > Author of Camel in Action: http://www.manning.com/ibsen >
