[TAMAYA-175] Clean up of POMs and the distribution after removing the modules from the main repository.
diff --git a/distribution/pom.xml b/distribution/pom.xml
index b8872a9..cec1b2f 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -78,496 +78,6 @@
             <version>${project.version}</version>
             <classifier>javadoc</classifier>
         </dependency>
-
-        <!-- Builder module -->
-
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-builder</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-builder</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-builder</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- Classloader support module -->
-
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-classloader-support</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-classloader-support</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-classloader-support</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- Collection module -->
-
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-collections</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-collections</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-collections</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- Events module -->
-
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-events</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-events</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-events</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- Filter module -->
-
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-filter</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-filter</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-filter</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- Formats module -->
-
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-formats</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-formats</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-formats</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- functions module -->
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-functions</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-functions</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-functions</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- Injection module -->
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-injection</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-injection</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-injection</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- Injection-api module -->
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-injection-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-injection-api</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-injection-api</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- JSON module -->
-
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-json</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-json</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-json</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- Management module -->
-
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-management</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-management</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-management</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- Model module -->
-
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-model</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-model</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- Mutable Config module -->
-
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-mutable-config</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-mutable-config</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-mutable-config</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- Optional module -->
-
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-optional</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-optional</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-optional</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- Resolver module -->
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-resolver</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-resolver</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-resolver</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- Resources module -->
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-resources</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-resources</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-resources</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- Resources module -->
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-server</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-server</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- SPI SUpport -->
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-spisupport</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-spisupport</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-spisupport</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- ******* INtegration ******* -->
-
-        <!-- Camel module -->
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-camel</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-camel</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-camel</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- CDI module -->
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-cdi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-cdi</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-cdi</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- CDI-SE module -->
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-cdi-se</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-cdi-se</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-cdi-se</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- Consul module -->
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-consul</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-consul</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-consul</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- etcd module -->
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-etcd</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-etcd</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-etcd</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- OSGI module -->
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-osgi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-osgi</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-osgi</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-        <!-- Spring Integration -->
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-spring</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-spring</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tamaya.ext</groupId>
-            <artifactId>tamaya-spring</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
-        </dependency>
-
-
     </dependencies>
 
     <scm>
diff --git a/distribution/src/main/assembly/distribution-bin.xml b/distribution/src/main/assembly/distribution-bin.xml
index b994563..fe08d35 100644
--- a/distribution/src/main/assembly/distribution-bin.xml
+++ b/distribution/src/main/assembly/distribution-bin.xml
@@ -55,377 +55,6 @@
             </includes>
         </dependencySet>
 
-
-        <!-- ***** modules ***** -->
-
-        <!-- Builder module -->
-        <dependencySet>
-            <outputDirectory>modules/builder/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-builder</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/builder/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-builder:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!-- Classloader Support module -->
-        <dependencySet>
-            <outputDirectory>modules/classloader-support/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-classloader-support</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/classloader-support/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-classloader-support:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!-- Collections module -->
-        <dependencySet>
-            <outputDirectory>modules/collections/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-collections</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/collections/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-collections:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!-- Events module -->
-        <dependencySet>
-            <outputDirectory>modules/events/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-events</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/events/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-events:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!-- Filter module -->
-        <dependencySet>
-            <outputDirectory>modules/filter/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-filter</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/filter/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-filter:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!--Formats module -->
-        <dependencySet>
-            <outputDirectory>modules/formats/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-formats</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/formats/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-formats:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!--Functions module -->
-        <dependencySet>
-            <outputDirectory>modules/functions/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-functions</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/functions/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-functions:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!--Injection module -->
-        <dependencySet>
-            <outputDirectory>modules/injection/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-injection</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/injection/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-injection:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!--Injection API module -->
-        <dependencySet>
-            <outputDirectory>modules/injection-api/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-injection-api</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/injection-api/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-injection-api:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-
-        <!-- JSON module -->
-        <dependencySet>
-            <outputDirectory>modules/json/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-json</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/json/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-json:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!-- Management module -->
-        <dependencySet>
-            <outputDirectory>modules/management/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-management</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/management/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-management:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!-- Model module -->
-        <dependencySet>
-            <outputDirectory>modules/model/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-model</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/model/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-model:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!-- mutable config -->
-        <dependencySet>
-            <outputDirectory>modules/mutable-config/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-mutable-config</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/mutable-config/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-mutable-config:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!-- optional module -->
-        <dependencySet>
-            <outputDirectory>modules/optional/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-optional</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/optional/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-optional:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!-- Resolver module -->
-        <dependencySet>
-            <outputDirectory>modules/resolver/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-resolver</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/resolver/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-resolver:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!-- Resources module -->
-        <dependencySet>
-            <outputDirectory>modules/resources/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-resources</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/resources/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-resolver:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!-- Server module -->
-        <dependencySet>
-            <outputDirectory>modules/server/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-server</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/server/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-server:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!-- spi-support module -->
-        <dependencySet>
-            <outputDirectory>modules/spi-support/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-spi-support</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/spi-support/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-spi-support:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!-- yaml module -->
-        <dependencySet>
-            <outputDirectory>modules/yaml/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-yaml</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/yaml/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-yaml:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-
-        <!-- ***** Integrations -->
-
-        <!-- camel module -->
-        <dependencySet>
-            <outputDirectory>modules/camel/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-camel</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/camel/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-camel:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!-- cdi module -->
-        <dependencySet>
-            <outputDirectory>modules/cdi/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-cdi</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/cdi/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-cdi:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!-- cdi-se module -->
-        <dependencySet>
-            <outputDirectory>modules/cdi-se/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-cdi-se</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/cdi-se/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-cdi-se:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!-- consul module -->
-        <dependencySet>
-            <outputDirectory>modules/consul/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-consul</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/consul/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-consul:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!-- etcd module -->
-        <dependencySet>
-            <outputDirectory>modules/etcd/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-etcd</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/etcd/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-etcd:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!-- osgi module -->
-        <dependencySet>
-            <outputDirectory>modules/osgi/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-osgi</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/osgi/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-osgi:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
-        <!-- spring module -->
-        <dependencySet>
-            <outputDirectory>modules/spring/lib</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-spring</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>modules/spring/api</outputDirectory>
-            <includes>
-                <include>org.apache.tamaya.ext:tamaya-spring:*:javadoc</include>
-            </includes>
-            <unpack>true</unpack>
-        </dependencySet>
     </dependencySets>
 
     <fileSets>
diff --git a/pom.xml b/pom.xml
index d87dbf6..6f30d97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,12 +56,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <json.spec.version>1.0-alpha-1</json.spec.version>
-        <johnzon.version>0.9-incubating</johnzon.version>
         <junit.version>4.12</junit.version>
 
         <!-- Dependency and plugin relate version properties go here -->
-        <arquillian.version>1.1.7.Final</arquillian.version>
-        <arquillian.deamon.version>1.0.0.Alpha1</arquillian.deamon.version>
 
         <!-- Keep the JRuby version in sync with the one used by Asciidoctor -->
         <asciidoctor.version>1.5.2</asciidoctor.version>
@@ -255,57 +252,6 @@
             </dependency>
 
             <dependency>
-                <groupId>org.jboss.arquillian</groupId>
-                <artifactId>arquillian-bom</artifactId>
-                <version>${arquillian.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-
-            <dependency>
-                <groupId>org.jboss.arquillian.daemon</groupId>
-                <artifactId>arquillian-daemon-container-managed</artifactId>
-                <version>${arquillian.deamon.version}</version>
-                <scope>test</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jboss.arquillian.daemon</groupId>
-                <artifactId>arquillian-daemon-container-common</artifactId>
-                <version>${arquillian.deamon.version}</version>
-                <scope>test</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jboss.arquillian.daemon</groupId>
-                <artifactId>arquillian-daemon-main</artifactId>
-                <version>${arquillian.deamon.version}</version>
-                <scope>test</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jboss.arquillian.daemon</groupId>
-                <artifactId>arquillian-daemon-protocol-arquillian</artifactId>
-                <version>${arquillian.deamon.version}</version>
-                <scope>test</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jboss.arquillian.daemon</groupId>
-                <artifactId>arquillian-daemon-protocol-wire</artifactId>
-                <version>${arquillian.deamon.version}</version>
-                <scope>test</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jboss.arquillian.daemon</groupId>
-                <artifactId>arquillian-daemon-server</artifactId>
-                <version>${arquillian.deamon.version}</version>
-                <scope>test</scope>
-            </dependency>
-
-            <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
                 <version>${mockito.version}</version>
@@ -316,7 +262,6 @@
                         <artifactId>hamcrest-core</artifactId>
                     </exclusion>
                 </exclusions>
-
             </dependency>
 
             <dependency>
@@ -331,13 +276,6 @@
                 <artifactId>geronimo-json_1.0_spec</artifactId>
                 <version>${json.spec.version}</version>
             </dependency>
-
-            <dependency>
-                <groupId>org.apache.johnzon</groupId>
-                <artifactId>johnzon-core</artifactId>
-                <version>${johnzon.version}</version>
-            </dependency>
-
         </dependencies>
     </dependencyManagement>