Author: sergeyb
Date: Fri Feb 14 12:56:12 2014
New Revision: 1568265
URL: http://svn.apache.org/r1568265
Log:
Adding Bean Validation features to features.xml
Modified:
cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
cxf/trunk/parent/pom.xml
cxf/trunk/systests/jaxrs/pom.xml
Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1568265&r1=1568264&r2=1568265&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Fri Feb 14
12:56:12 2014
@@ -372,4 +372,23 @@
<feature version="${project.version}">cxf-ws-discovery-api</feature>
<bundle>mvn:org.apache.cxf.services.ws-discovery/cxf-services-ws-discovery-service/${project.version}</bundle>
</feature>
+
+ <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>
+ </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-b2</bundle>
+ <bundle start-level="30"
dependency="true">mvn:org.glassfish/javax.el/3.0-b1</bundle>
+ </feature>
+
+ <bundle start-level="30"
dependency="true">mvn:org.glassfish/javax.el/3.0.0</bundle>
</features>
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1568265&r1=1568264&r2=1568265&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Fri Feb 14 12:56:12 2014
@@ -154,6 +154,10 @@
<cxf.xmlschema.version>2.1.0</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>
+
<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.javax.el.version>3.0.0</cxf.javax.el.version>
+
<cxf.hibernate-validator.bundle.version>5.0.2.Final_1</cxf.hibernate-validator.bundle.version>
<!-- various OSGi related versions -->
<cxf.aries.version>1.0.0</cxf.aries.version>
<cxf.aries.version.range>[1.0,2)</cxf.aries.version.range>
@@ -163,8 +167,8 @@
<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.specs.version>2.3.0</cxf.servicemix.specs.version>
-
<cxf.servicemix.specs.version.jaxrs>2.3.0</cxf.servicemix.specs.version.jaxrs>
+ <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>
<cxf.jaxb.bundle.version>2.2.1.1_2</cxf.jaxb.bundle.version>
<cxf.saaj-impl.bundle.version>1.3.21_1</cxf.saaj-impl.bundle.version>
Modified: cxf/trunk/systests/jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/pom.xml?rev=1568265&r1=1568264&r2=1568265&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/pom.xml (original)
+++ cxf/trunk/systests/jaxrs/pom.xml Fri Feb 14 12:56:12 2014
@@ -33,7 +33,6 @@
<properties>
<cxf.el.api.version>3.0-b02</cxf.el.api.version>
<cxf.glassfish.el.version>3.0-b01</cxf.glassfish.el.version>
-
<cxf.hibernate.validator.version>5.0.1.Final</cxf.hibernate.validator.version>
</properties>
<dependencies>
<dependency>
