[DOSGI-249] Adapt artifact ids
diff --git a/.gitignore b/.gitignore
index 9629ccf..a1bddc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
.settings/
target/
velocity.log
+generated/
diff --git a/common/pom.xml b/common/pom.xml
index cf06052..00dd723 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -20,13 +20,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>cxf-dosgi-ri-common</artifactId>
+ <artifactId>cxf-dosgi-common</artifactId>
<packaging>bundle</packaging>
<name>CXF DOSGi Common</name>
<parent>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-parent</artifactId>
+ <artifactId>cxf-dosgi-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/decorator/pom.xml b/decorator/pom.xml
index 495124f..153e05c 100644
--- a/decorator/pom.xml
+++ b/decorator/pom.xml
@@ -20,13 +20,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>cxf-dosgi-ri-decorator</artifactId>
+ <artifactId>cxf-dosgi-decorator</artifactId>
<packaging>bundle</packaging>
<name>CXF DOSGi Service decorator support</name>
<parent>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-parent</artifactId>
+ <artifactId>cxf-dosgi-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/distribution/features/pom.xml b/distribution/features/pom.xml
index 22f8eeb..2446931 100644
--- a/distribution/features/pom.xml
+++ b/distribution/features/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-distribution-parent</artifactId>
+ <artifactId>cxf-dosgi-distribution-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/distribution/features/src/main/resources/features.xml b/distribution/features/src/main/resources/features.xml
index 442b922..8297d20 100644
--- a/distribution/features/src/main/resources/features.xml
+++ b/distribution/features/src/main/resources/features.xml
@@ -19,21 +19,21 @@
<feature>http</feature>
<feature>cxf-http-jetty</feature>
<bundle dependency="true">mvn:org.apache.felix/org.apache.felix.scr/2.0.2</bundle>
- <bundle>mvn:${project.groupId}/cxf-dosgi-ri-common/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/cxf-dosgi-ri-decorator/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/cxf-dosgi-common/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/cxf-dosgi-decorator/${project.version}</bundle>
</feature>
<feature name="cxf-dosgi-provider-ws" version="${project.version}">
<feature>cxf-dosgi-common</feature>
<feature>cxf-jaxws</feature>
<feature>cxf-databinding-aegis</feature>
- <bundle>mvn:${project.groupId}/cxf-dosgi-ri-provider-ws/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/cxf-dosgi-provider-ws/${project.version}</bundle>
</feature>
<feature name="cxf-dosgi-provider-rs" version="${project.version}">
<feature>cxf-dosgi-common</feature>
<feature>cxf-jaxrs</feature>
- <bundle>mvn:${project.groupId}/cxf-dosgi-ri-provider-rs/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/cxf-dosgi-provider-rs/${project.version}</bundle>
</feature>
</features>
diff --git a/distribution/multi-bundle/pom.xml b/distribution/multi-bundle/pom.xml
index ab39138..a91c103 100644
--- a/distribution/multi-bundle/pom.xml
+++ b/distribution/multi-bundle/pom.xml
@@ -20,13 +20,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>cxf-dosgi-ri-multibundle-distribution</artifactId>
+ <artifactId>cxf-dosgi-multibundle-distribution</artifactId>
<name>CXF DOSGi Multi-Bundle Distribution</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-distribution-parent</artifactId>
+ <artifactId>cxf-dosgi-distribution-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/distribution/multi-bundle/src/main/assembly/assembly.xml b/distribution/multi-bundle/src/main/assembly/assembly.xml
index 2844317..4744815 100644
--- a/distribution/multi-bundle/src/main/assembly/assembly.xml
+++ b/distribution/multi-bundle/src/main/assembly/assembly.xml
@@ -29,18 +29,18 @@
<fileSets>
<fileSet>
<directory>target/distribution_bundles</directory>
- <outputDirectory>apache-cxf-dosgi-ri-${dosgi.version}/dosgi_bundles</outputDirectory>
+ <outputDirectory>apache-cxf-dosgi-${dosgi.version}/dosgi_bundles</outputDirectory>
</fileSet>
<fileSet>
<directory>target/distribution_configs</directory>
- <outputDirectory>apache-cxf-dosgi-ri-${dosgi.version}/conf</outputDirectory>
+ <outputDirectory>apache-cxf-dosgi-${dosgi.version}/conf</outputDirectory>
</fileSet>
<fileSet>
<directory>target/maven-shared-archive-resources/META-INF</directory>
<excludes>
<exclude>DEPENDENCIES</exclude>
</excludes>
- <outputDirectory>apache-cxf-dosgi-ri-${dosgi.version}</outputDirectory>
+ <outputDirectory>apache-cxf-dosgi-${dosgi.version}</outputDirectory>
</fileSet>
<fileSet>
<directory>src/main/release</directory>
@@ -48,7 +48,7 @@
<include>README</include>
<include>release_notes.txt</include>
</includes>
- <outputDirectory>apache-cxf-dosgi-ri-${dosgi.version}</outputDirectory>
+ <outputDirectory>apache-cxf-dosgi-${dosgi.version}</outputDirectory>
</fileSet>
</fileSets>
</assembly>
diff --git a/distribution/multi-bundle/src/main/release/README b/distribution/multi-bundle/src/main/release/README
index 40d7b0d..d87959c 100644
--- a/distribution/multi-bundle/src/main/release/README
+++ b/distribution/multi-bundle/src/main/release/README
@@ -2,16 +2,13 @@
=======================================================================
-The dOSGi subproject of Apache CXF provides the Reference Implementation
-of the Remote Services Specification version 1.0, Chapter 13 in the OSGi
-Compendium Specification, and OSGi Remote Service Admin Specification
+The dOSGi subproject of Apache CXF provides the Remote Services Specification version 1.0,
+ Chapter 13 in the OSGi Compendium Specification, and OSGi Remote Service Admin Specification
version 1.0, Chapter 122 in the OSGi Enterprise Specification[1].
+This release is provided for your convenience in two distribution formats:
-This release is provided for your convenience in three different
-distribution formats:
-
-1. Multi-bundle distro: cxf-dosgi-ri-multibundle-distribution-1.2.{tar.gaz|zip}
+1. Multi-bundle distro
Contains the dOSGi implementation and all 3rd party dependencies as
separate bundles within an archive. The current distribution is an
@@ -27,37 +24,18 @@
equinox.discovery.config.ini.append snippets as appropriate.
-2. Single-bundle distro: cxf-dosgi-ri-singlebundle-distribution-1.2.jar
-
-Contains the dOSGi implementation and all 3rd party dependencies wrapped
-in a single OSGi bundle so as to allow direct installation in your favourite
-OSGi container in one fell swoop.
-
-
-3. Source distro: cxf-dosgi-ri-source-distribution-1.2.{tar.gz|zip}
+2. Source distro
Contains the entire source tree for dOSGi.
-The best starting point for using dOSGi is the Getting Started Guide[2].
+For more information check the CXF DOSGi web site [2]
-Also note the very detailed walk-through of the greeter demo[3].
-
-If you need more help, or want to provide any feedback, please feel free
-to drop us a note on the CXF dev or users list[4].
-
-If you trip over any problems with dOSGi, don't hesitate to submit an issue
-to the CXF JIRA[5] with the component set to "Distributed-OSGi".
-
-
-Thanks for using dOSGi!
+Thanks for using CXF dOSGi!
Regards,
The CXF dOSGi team.
[1] see chapter 122 http://www.osgi.org/Download/Release4V42
-[2] http://cxf.apache.org/distributed-osgi.html#DistributedOSGi-GettingStarted
-[3] http://cxf.apache.org/distributed-osgi-greeter-demo-walkthrough.htm
-[4] http://cxf.apache.org/mailing-lists.html
-[5] https://issues.apache.org/jira/browse/CXF
+[2] http://cxf.apache.org/distributed-osgi.html
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 5bb17cd..60c09d8 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -20,7 +20,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-distribution-parent</artifactId>
+ <artifactId>cxf-dosgi-distribution-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>CXF DOSGi Distribution Parent</name>
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-parent</artifactId>
+ <artifactId>cxf-dosgi-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/distribution/repository/pom.xml b/distribution/repository/pom.xml
index f87ce62..f70d989 100644
--- a/distribution/repository/pom.xml
+++ b/distribution/repository/pom.xml
@@ -3,27 +3,40 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-parent</artifactId>
+ <artifactId>cxf-dosgi-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
- <artifactId>cxf-dosgi-ri-repository</artifactId>
+ <artifactId>cxf-dosgi-repository</artifactId>
+ <name>CXF DOSGi Distribution Repository</name>
+
<dependencies>
<dependency>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>repository</artifactId>
- <version>1.9.0</version>
+ <version>1.10-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <version>5.0.4</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-provider-ws</artifactId>
+ <artifactId>cxf-dosgi-provider-ws</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-provider-rs</artifactId>
+ <artifactId>cxf-dosgi-provider-rs</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -32,6 +45,11 @@
</artifactId>
<version>1.6.3_1</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jsr339-api-2.0.1</artifactId>
+ <version>2.6.0</version>
+ </dependency>
</dependencies>
- <name>CXF DOSGi Distribution Repository</name>
+
</project>
diff --git a/distribution/sources/pom.xml b/distribution/sources/pom.xml
index 56a0d0d..809e1fe 100644
--- a/distribution/sources/pom.xml
+++ b/distribution/sources/pom.xml
@@ -21,14 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-source-distribution</artifactId>
+ <artifactId>cxf-dosgi-source-distribution</artifactId>
<version>2.0-SNAPSHOT</version>
<name>CXF DOSGi Source Distribution</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-distribution-parent</artifactId>
+ <artifactId>cxf-dosgi-distribution-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/itests/multi-bundle/pom.xml b/itests/multi-bundle/pom.xml
index 2dae19b..e7d2ec4 100644
--- a/itests/multi-bundle/pom.xml
+++ b/itests/multi-bundle/pom.xml
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-parent</artifactId>
+ <artifactId>cxf-dosgi-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.cxf.dosgi.systests</groupId>
- <artifactId>cxf-dosgi-ri-itests-multibundle</artifactId>
+ <artifactId>cxf-dosgi-itests-multibundle</artifactId>
<packaging>jar</packaging>
<name>CXF DOSGi Integration Tests Multi Bundle</name>
@@ -194,7 +194,7 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-multibundle-distribution</artifactId>
+ <artifactId>cxf-dosgi-multibundle-distribution</artifactId>
<version>${project.version}</version>
<type>zip</type>
<classifier>dir</classifier>
diff --git a/itests/pom.xml b/itests/pom.xml
index f8f6e5f..d4c3594 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-parent</artifactId>
+ <artifactId>cxf-dosgi-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.cxf.dosgi.systests</groupId>
- <artifactId>cxf-dosgi-ri-itests</artifactId>
+ <artifactId>cxf-dosgi-itests</artifactId>
<version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
diff --git a/parent/pom.xml b/parent/pom.xml
index 461b71f..e5fc564 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -14,12 +14,12 @@
<parent>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri</artifactId>
+ <artifactId>cxf-dosgi-main</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>cxf-dosgi-ri-parent</artifactId>
+ <artifactId>cxf-dosgi-parent</artifactId>
<packaging>pom</packaging>
<name>CXF DOSGi Parent</name>
@@ -30,7 +30,7 @@
<osgi.version>5.0.0</osgi.version>
<osgi.compendium.version>5.0.0</osgi.compendium.version>
- <aries.rsa.version>1.9.0</aries.rsa.version>
+ <aries.rsa.version>1.10-SNAPSHOT</aries.rsa.version>
<cxf.version>3.1.7</cxf.version>
<felix.version>5.4.0</felix.version>
<zookeeper.version>3.4.8</zookeeper.version>
diff --git a/pom.xml b/pom.xml
index 87e8472..7ee4200 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri</artifactId>
+ <artifactId>cxf-dosgi-main</artifactId>
<version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
diff --git a/provider-rs/bnd.bnd b/provider-rs/bnd.bnd
index 99f067a..1b3fa2e 100644
--- a/provider-rs/bnd.bnd
+++ b/provider-rs/bnd.bnd
@@ -1,3 +1,5 @@
Import-Package: javax.servlet;version='[2,4)', javax.servlet.http;version='[2,4)', *
Private-Package: org.apache.cxf.dosgi.dsw.*
+Provide-Capability: osgi.remoteserviceadmin.distribution;\
+ configs:List<String>="org.apache.cxf.rs"; version:Version=1.0
diff --git a/provider-rs/pom.xml b/provider-rs/pom.xml
index 0a097c7..f51ebf0 100644
--- a/provider-rs/pom.xml
+++ b/provider-rs/pom.xml
@@ -20,13 +20,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>cxf-dosgi-ri-provider-rs</artifactId>
+ <artifactId>cxf-dosgi-provider-rs</artifactId>
<packaging>bundle</packaging>
<name>CXF DOSGi provider rs</name>
<parent>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-parent</artifactId>
+ <artifactId>cxf-dosgi-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-common</artifactId>
+ <artifactId>cxf-dosgi-common</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/provider-ws/bnd.bnd b/provider-ws/bnd.bnd
index 99f067a..0282b4b 100644
--- a/provider-ws/bnd.bnd
+++ b/provider-ws/bnd.bnd
@@ -1,3 +1,5 @@
Import-Package: javax.servlet;version='[2,4)', javax.servlet.http;version='[2,4)', *
Private-Package: org.apache.cxf.dosgi.dsw.*
+Provide-Capability: osgi.remoteserviceadmin.distribution;\
+ configs:List<String>="org.apache.cxf.ws"; version:Version=1.0
diff --git a/provider-ws/pom.xml b/provider-ws/pom.xml
index e816f2c..c969a31 100644
--- a/provider-ws/pom.xml
+++ b/provider-ws/pom.xml
@@ -20,13 +20,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>cxf-dosgi-ri-provider-ws</artifactId>
+ <artifactId>cxf-dosgi-provider-ws</artifactId>
<packaging>bundle</packaging>
<name>CXF DOSGi provider ws</name>
<parent>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-parent</artifactId>
+ <artifactId>cxf-dosgi-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-common</artifactId>
+ <artifactId>cxf-dosgi-common</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/samples/pom.xml b/samples/pom.xml
index 21ceeb8..17596cd 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -28,10 +28,15 @@
<parent>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-parent</artifactId>
+ <artifactId>cxf-dosgi-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
+
</parent>
+
+ <properties>
+ <topDirectoryLocation>..</topDirectoryLocation>
+ </properties>
<modules>
<module>rest</module>
diff --git a/samples/rest/api/pom.xml b/samples/rest/api/pom.xml
index 71187c1..3799608 100644
--- a/samples/rest/api/pom.xml
+++ b/samples/rest/api/pom.xml
@@ -19,16 +19,15 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.cxf.dosgi.samples</groupId>
<artifactId>cxf-dosgi-samples-rest-api</artifactId>
<packaging>bundle</packaging>
<name>CXF DOSGi Samples REST API</name>
<parent>
- <groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <groupId>org.apache.cxf.dosgi.samples</groupId>
+ <artifactId>cxf-dosgi-samples-rest-parent</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<properties>
@@ -37,14 +36,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jsr339-api-m10</artifactId>
- <version>${servicemix.specs.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
- <version>${servicemix.specs.version}</version>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jsr339-api-2.0.1</artifactId>
+ <version>2.6.0</version>
</dependency>
</dependencies>
diff --git a/samples/rest/impl/pom.xml b/samples/rest/impl/pom.xml
index 3886700..6f8ca18 100644
--- a/samples/rest/impl/pom.xml
+++ b/samples/rest/impl/pom.xml
@@ -30,11 +30,6 @@
<dependencies>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
<groupId>org.apache.cxf.dosgi.samples</groupId>
<artifactId>cxf-dosgi-samples-rest-api</artifactId>
<version>${project.version}</version>
diff --git a/samples/security_filter/pom.xml b/samples/security_filter/pom.xml
index bdaec00..5e1c75c 100644
--- a/samples/security_filter/pom.xml
+++ b/samples/security_filter/pom.xml
@@ -13,13 +13,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.dosgi.samples</groupId>
- <artifactId>cxf-dosgi-ri-samples-security-filter</artifactId>
+ <artifactId>cxf-dosgi-samples-security-filter</artifactId>
<packaging>bundle</packaging>
<name>CXF DOSGi Samples Security Filter</name>
<parent>
<groupId>org.apache.cxf.dosgi</groupId>
- <artifactId>cxf-dosgi-ri-parent</artifactId>
+ <artifactId>cxf-dosgi-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
