Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 6a328a5c0 -> 2ec0130e0
CXF-6705: supply hibernate with all of its dependencies. Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c87aa760 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c87aa760 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c87aa760 Branch: refs/heads/3.1.x-fixes Commit: c87aa76033ddec5a738851117191da098706e494 Parents: 358589c Author: Benson Margulies <ben...@basistech.com> Authored: Fri Dec 11 11:13:38 2015 -0500 Committer: Benson Margulies <ben...@basistech.com> Committed: Fri Dec 11 11:13:38 2015 -0500 ---------------------------------------------------------------------- .../features/src/main/resources/features.xml | 19 ++++++++++++++++++- parent/pom.xml | 7 ++++--- 2 files changed, 22 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c87aa760/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 dafdbea..0f39e10 100644 --- a/osgi/karaf/features/src/main/resources/features.xml +++ b/osgi/karaf/features/src/main/resources/features.xml @@ -442,7 +442,24 @@ <feature name="cxf-bean-validation-core" version="${project.version}" resolver="(obr)"> <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr303-api-${cxf.osgi.validation.api.version}/${cxf.servicemix.specs.version}</bundle> - <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hibernate-validator/${cxf.hibernate-validator.bundle.version}</bundle> + <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> + <!-- 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> + <!-- 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> + <!-- hibernate requires jboss-logging --> + <bundle start-level="30" dependency="true">mvn:org.jboss.logging/jboss-logging/3.1.3.GA</bundle> + <!-- ditto for classmate --> + <bundle start-level="30" dependency="true">mvn:com.fasterxml/classmate/1.1.0</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> </feature> <feature name="cxf-bean-validation" version="${project.version}" resolver="(obr)"> http://git-wip-us.apache.org/repos/asf/cxf/blob/c87aa760/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 7e62766..e0666c4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -156,9 +156,10 @@ <cxf.xmlschema.version>2.2.1</cxf.xmlschema.version> <cxf.xpp3.bundle.version>1.1.4c_6</cxf.xpp3.bundle.version> <cxf.validation.api.version>1.1.0.Final</cxf.validation.api.version> - <!-- the Export-Package is not the same as the Maven artifact - version --> - <cxf.validation.api.package.version>1.0.0</cxf.validation.api.package.version> + <!-- the Export-Package is the same as the Maven artifact + version (with the Final), but we don't want an import package with a version + with a qualifier. We do want a range. --> + <cxf.validation.api.package.version>[1.0.0,2)</cxf.validation.api.package.version> <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>
