Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 706ddbcb9 -> 7b4c14f1a
neaten up version numbers in hibernate features. Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7b4c14f1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7b4c14f1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7b4c14f1 Branch: refs/heads/3.1.x-fixes Commit: 7b4c14f1aadb810d5b91fa0adfa2a6bc70e45a76 Parents: 706ddbc Author: Benson Margulies <ben...@basistech.com> Authored: Fri Dec 11 14:53:19 2015 -0500 Committer: Benson Margulies <ben...@basistech.com> Committed: Fri Dec 11 14:53:19 2015 -0500 ---------------------------------------------------------------------- .../features/src/main/resources/features.xml | 20 ++++++++++---------- parent/pom.xml | 6 ++++++ 2 files changed, 16 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/7b4c14f1/osgi/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml index 0f39e10..ebd32d1 100644 --- a/osgi/karaf/features/src/main/resources/features.xml +++ b/osgi/karaf/features/src/main/resources/features.xml @@ -445,21 +445,21 @@ <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hibernate-validator/${cxf.hibernate-validator.bundle.version}</bundle> <!-- The hibernate bundle demands 1.1.0 of javax.validator, but servicemix only provides 1.0.0. So we add in the API bundle and hope that the split-package declaration in servicemix does the job. --> - <bundle start-level="30" dependency="true">mvn:javax.validation/validation-api/1.1.0.Final</bundle> + <bundle start-level="30" dependency="true">mvn:javax.validation/validation-api/${cxf.validation.api.version}</bundle> <!-- The servicemix bundle for hibernate demands joda-time --> - <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/2.3_1</bundle> + <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${cxf.servicemix.jodatime.version}</bundle> <!-- The servicemix bundle for hibernate demands jsoup --> - <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsoup/1.5.2_2</bundle> + <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsoup/${cxf.servicemix.jsoup.version}</bundle> <!-- hibernate requires jboss-logging --> - <bundle start-level="30" dependency="true">mvn:org.jboss.logging/jboss-logging/3.1.3.GA</bundle> + <bundle start-level="30" dependency="true">mvn:org.jboss.logging/jboss-logging/${cxf.jboss.logging.version}</bundle> <!-- ditto for classmate --> - <bundle start-level="30" dependency="true">mvn:com.fasterxml/classmate/1.1.0</bundle> + <bundle start-level="30" dependency="true">mvn:com.fasterxml/classmate/${cxf.classmate.version}</bundle> <!-- stax --> - <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.2/2.4.0</bundle> - <bundle start-level="30" dependency="true">mvn:org.codehaus.woodstox/stax2-api/4.0.0</bundle> - <bundle start-level="30" dependency="true">mvn:org.codehaus.woodstox/woodstox/5.0.2</bundle> - <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/3.2.0_1</bundle> - <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/1.8.7_2</bundle> + <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.2/${cxf.servicemix.specs.version}</bundle> + <bundle start-level="30" dependency="true">mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}</bundle> + <bundle start-level="30" dependency="true">mvn:org.codehaus.woodstox/woodstox-core-asl/${cxf.woodstox.core.version}</bundle> + <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cxf.servicemix.cglib.version}</bundle> + <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${cxf.servicemix.aspectj.version}</bundle> </feature> <feature name="cxf-bean-validation" version="${project.version}" resolver="(obr)"> http://git-wip-us.apache.org/repos/asf/cxf/blob/7b4c14f1/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index e0666c4..f417940 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -75,6 +75,7 @@ <cxf.bcprov.version>1.53</cxf.bcprov.version> <cxf.cglib.bundle.version>2.2_2</cxf.cglib.bundle.version> <cxf.cglib.osgi.version>[2.1.3,3.0.0)</cxf.cglib.osgi.version> + <cxf.classmate.version>1.1.0</cxf.classmate.version> <cxf.commons-codec.version>1.10</cxf.commons-codec.version> <cxf.commons-collections.version>3.2.2</cxf.commons-collections.version> <cxf.commons-lang.version>2.6</cxf.commons-lang.version> @@ -163,6 +164,7 @@ <cxf.cdi.api.version>1.1</cxf.cdi.api.version> <cxf.json.api.version>1.0</cxf.json.api.version> <cxf.jboss.weld.version>2.1.2.Final</cxf.jboss.weld.version> + <cxf.jboss.logging.version>3.1.3.GA</cxf.jboss.logging.version> <cxf.osgi.validation.api.version>1.1.0</cxf.osgi.validation.api.version> <cxf.hibernate.validator.version>5.0.2.Final</cxf.hibernate.validator.version> <cxf.glassfish.json.version>1.0.4</cxf.glassfish.json.version> @@ -179,6 +181,10 @@ <cxf.felix.framework.version>2.0.5</cxf.felix.framework.version> <cxf.felix.configadmin.version>1.2.4</cxf.felix.configadmin.version> <cxf.xmlbeans.bundle.version>2.6.0_2</cxf.xmlbeans.bundle.version> + <cxf.servicemix.aspectj.version>1.8.7_2</cxf.servicemix.aspectj.version> + <cxf.servicemix.cglib.version>3.2.0_1</cxf.servicemix.cglib.version> + <cxf.servicemix.jodatime.version>2.3_1</cxf.servicemix.jodatime.version> + <cxf.servicemix.jsoup.version>1.5.2_2</cxf.servicemix.jsoup.version> <cxf.servicemix.specs.version>2.4.0</cxf.servicemix.specs.version> <cxf.servicemix.specs.version.jaxrs>2.4.0</cxf.servicemix.specs.version.jaxrs> <cxf.javax.mail.version>1.4.4</cxf.javax.mail.version>
