Repository: cxf Updated Branches: refs/heads/master a8fa70b8a -> 450e3ff77
Removing a java6-based validation feature from 3.1.x Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/450e3ff7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/450e3ff7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/450e3ff7 Branch: refs/heads/master Commit: 450e3ff7725e1d9fa51ad2aa01d927343e9520da Parents: a8fa70b Author: Sergey Beryozkin <[email protected]> Authored: Thu Sep 3 14:02:14 2015 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Thu Sep 3 14:02:14 2015 +0100 ---------------------------------------------------------------------- osgi/karaf/features/src/main/resources/features.xml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/450e3ff7/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 2cd334e..8d880a1 100644 --- a/osgi/karaf/features/src/main/resources/features.xml +++ b/osgi/karaf/features/src/main/resources/features.xml @@ -421,19 +421,13 @@ <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> </feature> - <!-- This feature can only be activated if Java 7 is used --> + <feature name="cxf-bean-validation" version="${project.version}" resolver="(obr)"> <feature version="${project.version}">cxf-bean-validation-core</feature> <bundle start-level="30" dependency="true">mvn:javax.el/javax.el-api/${cxf.javax.el.version}</bundle> <bundle start-level="30" dependency="true">mvn:org.glassfish/javax.el/${cxf.javax.el.version}</bundle> </feature> - <feature name="cxf-bean-validation-java6" version="${project.version}" resolver="(obr)"> - <feature version="${project.version}">cxf-bean-validation-core</feature> - <bundle start-level="30" dependency="true">mvn:javax.el/javax.el-api/3.0-b02</bundle> - <bundle start-level="30" dependency="true">mvn:org.glassfish/javax.el/3.0-b01</bundle> - </feature> - <feature name="cxf-management-web" version="${project.version}" resolver="(obr)"> <feature version="${project.version}">cxf-core</feature> <feature version="${project.version}">cxf-jaxrs</feature>
