This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push: new 47a5b63 organize servicemix specs 47a5b63 is described below commit 47a5b631ee8fee22c9a3e592666626f9d2123d3b Author: Alexey Markevich <buhhu...@gmail.com> AuthorDate: Fri Mar 26 21:56:32 2021 +0300 organize servicemix specs --- osgi/itests/pom.xml | 5 ++--- osgi/karaf/features/src/main/resources/features.xml | 2 +- osgi/repository/pom.xml | 11 ----------- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml index 14999c5..18813d3 100644 --- a/osgi/itests/pom.xml +++ b/osgi/itests/pom.xml @@ -118,9 +118,8 @@ </dependency> <dependency> - <groupId>org.apache.servicemix.specs</groupId> - <artifactId>org.apache.servicemix.specs.jsr303-api-1.1.0</artifactId> - <version>${cxf.servicemix.specs.version}</version> + <groupId>jakarta.validation</groupId> + <artifactId>jakarta.validation-api</artifactId> <scope>provided</scope> </dependency> <dependency> diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml index 048fb4f..5ffc45c 100644 --- a/osgi/karaf/features/src/main/resources/features.xml +++ b/osgi/karaf/features/src/main/resources/features.xml @@ -24,7 +24,7 @@ <bundle start-level="9">mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1</bundle> <bundle start-level="10" dependency="true">mvn:com.sun.activation/jakarta.activation/${cxf.jakarta.activation.version}</bundle> <bundle start-level="10" dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/${cxf.javax.annotation-api.version}</bundle> - <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${cxf.servicemix.specs.version}</bundle> + <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.2/${cxf.servicemix.specs.version}</bundle> <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.3/${cxf.servicemix.specs.jaxb.version}</bundle> <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.3/${cxf.specs.jaxws.api.version}</bundle> <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/${cxf.servicemix.jaxrs.specs.version}</bundle> diff --git a/osgi/repository/pom.xml b/osgi/repository/pom.xml index 1371b19..f546c67 100644 --- a/osgi/repository/pom.xml +++ b/osgi/repository/pom.xml @@ -247,21 +247,10 @@ <dependency> <groupId>org.apache.cxf.xjc-utils</groupId> <artifactId>cxf-xjc-runtime</artifactId> - <exclusions> - <exclusion><!-- TODO can be removed with next cxf-xjc-runtime release --> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.codehaus.jettison</groupId> <artifactId>jettison</artifactId> </dependency> - <dependency> - <groupId>org.apache.servicemix.specs</groupId> - <artifactId>org.apache.servicemix.specs.jaxrs-api-2.1</artifactId> - <version>${cxf.servicemix.specs.version}</version> - </dependency> </dependencies> </project>