You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bi...@apache.org on 2015/12/11 17:14:49 UTC
[1/2] cxf git commit: CXF-6705: supply hibernate with all of its
dependencies.
Repository: cxf
Updated Branches:
refs/heads/master 08068c8a6 -> af7175171
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/4bb552ce
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4bb552ce
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4bb552ce
Branch: refs/heads/master
Commit: 4bb552ce8b079c7553881e6ad7fd009d4732052f
Parents: e5fa405
Author: Benson Margulies <be...@basistech.com>
Authored: Fri Dec 11 11:13:38 2015 -0500
Committer: Benson Margulies <be...@basistech.com>
Committed: Fri Dec 11 11:14:08 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/4bb552ce/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/4bb552ce/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ee45d8a..1e6b9f5 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>
[2/2] cxf git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cxf
Posted by bi...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/af717517
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/af717517
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/af717517
Branch: refs/heads/master
Commit: af7175171ade0017e77a8deb17ee90849b9ace1b
Parents: 4bb552c 08068c8
Author: Benson Margulies <be...@basistech.com>
Authored: Fri Dec 11 11:14:27 2015 -0500
Committer: Benson Margulies <be...@basistech.com>
Committed: Fri Dec 11 11:14:27 2015 -0500
----------------------------------------------------------------------
.../oauth2/client/OAuthClientUtils.java | 11 +--
.../oauth2/common/ServerAccessToken.java | 9 +++
.../oauth2/grants/AbstractGrantHandler.java | 66 ++++++++--------
.../grants/code/AbstractCodeDataProvider.java | 1 +
.../code/AuthorizationCodeGrantHandler.java | 38 +++++++--
.../code/ServerAuthorizationCodeGrant.java | 9 +++
.../provider/AbstractOAuthDataProvider.java | 1 +
.../oauth2/services/AbstractOAuthService.java | 9 ++-
.../oauth2/services/AbstractTokenService.java | 81 ++++++++++++--------
.../oauth2/services/AccessTokenService.java | 3 +-
.../services/DirectAuthorizationService.java | 41 ++++++----
.../services/RedirectionBasedGrantService.java | 79 ++++++++++---------
.../oauth2/services/TokenRevocationService.java | 3 +-
.../oidc/idp/IdTokenResponseFilter.java | 3 +
14 files changed, 222 insertions(+), 132 deletions(-)
----------------------------------------------------------------------
Re: [1/2] cxf git commit: CXF-6705: supply hibernate with all of its dependencies.
Posted by Daniel Kulp <dk...@apache.org>.
Benson,
I believe a bunch of these dependencies have version numbers defined in the parent pom. I know joda-time should, the stax-api, (which shouldn’t even be there as that’s pulled in via cxf-specs feature, likewise for woodstox), etc…
Dan
> On Dec 11, 2015, at 11:14 AM, bimargulies@apache.org wrote:
> <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>
>
--
Daniel Kulp
dkulp@apache.org - http://dankulp.com/blog
Talend Community Coder - http://coders.talend.com