diff --git a/api/bnd.bnd b/api/bnd.bnd
deleted file mode 100644
index d7560672..00000000
--- a/api/bnd.bnd
+++ /dev/null
@@ -1,6 +0,0 @@
-Import-Package:\
-	org.osgi.service.remoteserviceadmin,\
-	org.osgi.service.event
-Export-Package:\
-	org.osgi.service.remoteserviceadmin,\
-	org.osgi.service.event
diff --git a/api/pom.xml b/api/pom.xml
deleted file mode 100644
index 412df180..00000000
--- a/api/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<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>
-
-    <parent>
-        <groupId>org.apache.aries.rsa</groupId>
-        <artifactId>org.apache.aries.rsa.parent</artifactId>
-        <version>1.8-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
-    </parent>
-    
-    <artifactId>org.apache.aries.rsa.api</artifactId>
-    <packaging>bundle</packaging>
-    <name>Aries Remote Service Admin Compendium APIs</name>
-    
-    <description>
-        The minimal set of OSGi Compendium APIs required by DOSGi.
-        This bundle should be deployed instead of the full OSGi Compendium bundle to prevent issues
-        caused by multiple exports of other OSGi APIs that are not used by DOSGi. See DOSGI-208.
-    </description>
-
-</project>
diff --git a/examples/echotcp/Readme.md b/examples/echotcp/Readme.md
index dd34ce89..0fcb4e9f 100644
--- a/examples/echotcp/Readme.md
+++ b/examples/echotcp/Readme.md
@@ -10,7 +10,7 @@ Download Apache Karaf 4.0.5
 Extract to container_a and start. In the shell execute the commands below:
 
 ```
-feature:repo-add aries-rsa 1.8-SNAPSHOT
+feature:repo-add aries-rsa 1.8.0
 feature:install scr aries-rsa-provider-tcp aries-rsa-discovery-zookeeper aries-rsa-discovery-zookeeper-server
 install -s mvn:org.apache.aries.rsa.examples.echotcp/org.apache.aries.rsa.examples.echotcp.api
 install -s mvn:org.apache.aries.rsa.examples.echotcp/org.apache.aries.rsa.examples.echotcp.service
@@ -28,7 +28,7 @@ It should look similar to this:
 Extract to container_b and start. In the shell execute the commands below:
 
 ```
-feature:repo-add aries-rsa 1.8-SNAPSHOT
+feature:repo-add aries-rsa 1.8.0
 feature:install scr aries-rsa-provider-tcp aries-rsa-discovery-zookeeper
 install -s mvn:org.apache.aries.rsa.examples.echotcp/org.apache.aries.rsa.examples.echotcp.api
 install -s mvn:org.apache.aries.rsa.examples.echotcp/org.apache.aries.rsa.examples.echotcp.consumer
diff --git a/parent/pom.xml b/parent/pom.xml
index 91bd72b7..bdef21bf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>14</version>
+        <version>17</version>
         <relativePath />
     </parent>