diff --git a/java/com.sap.sse.mail/META-INF/MANIFEST.MF b/java/com.sap.sse.mail/META-INF/MANIFEST.MF
index f15bb83799e..620b52aed39 100755
--- a/java/com.sap.sse.mail/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.mail/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Export-Package: com.sap.sse.mail,
  com.sap.sse.mail.impl,
  com.sap.sse.mail.queue,
  com.sap.sse.mail.queue.impl
-Import-Package: javax.mail,
+Import-Package: javax.activation,
+ javax.mail,
  javax.mail.internet,
  javax.mail.util;version="1.4.0",
  org.osgi.framework,
diff --git a/java/com.sap.sse.security/META-INF/MANIFEST.MF b/java/com.sap.sse.security/META-INF/MANIFEST.MF
index 9209a197c5a..58def33dcb4 100644
--- a/java/com.sap.sse.security/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.security/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.jetty.osgi-servlet-api;bundle-version="3.1.0",
  org.json.simple,
  com.sun.jersey,
- org.apache.commons.beanutils;bundle-version="1.8.0",
+ org.apache.commons.beanutils;bundle-version="1.9.4",
  org.apache.shiro.core;bundle-version="1.2.2",
  org.apache.shiro.ehcache;bundle-version="1.2.3",
  org.apache.shiro.web;bundle-version="1.2.2",
@@ -37,7 +37,8 @@ Require-Bundle: org.eclipse.jetty.osgi-servlet-api;bundle-version="3.1.0",
  com.sap.sse.security.interface;visibility:=reexport,
  com.chargebee.chargebee-java;bundle-version="2.9.0",
  org.apache.httpcomponents.httpclient,
- org.apache.httpcomponents.httpcore
+ org.apache.httpcomponents.httpcore,
+ org.apache.commons.collections;bundle-version="3.2.2"
 Web-ContextPath: /security
 Export-Package: com.sap.sse.security,
  com.sap.sse.security.impl;x-friends:="com.sap.sailing.domain.test,com.sap.sailing.server.testsupport",
diff --git a/java/com.sap.sse.shared.android.test/.classpath b/java/com.sap.sse.shared.android.test/.classpath
index eca7bdba8f0..3e5654f17eb 100644
--- a/java/com.sap.sse.shared.android.test/.classpath
+++ b/java/com.sap.sse.shared.android.test/.classpath
@@ -2,6 +2,10 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/java/com.sap.sse.test/pom.xml b/java/com.sap.sse.test/pom.xml
index 93fbdbbcfb3..26c8a069929 100644
--- a/java/com.sap.sse.test/pom.xml
+++ b/java/com.sap.sse.test/pom.xml
@@ -9,24 +9,4 @@
   </parent>
   <artifactId>com.sap.sse.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <version>${tycho-version}</version>
-        <configuration>
-          <dependency-resolution>
-            <extraRequirements>
-              <requirement>
-                <type>eclipse-plugin</type>
-                <id>com.sap.sse.apacheservicemixfragment</id>
-                <versionRange>0.0.0</versionRange>
-              </requirement>
-            </extraRequirements>
-          </dependency-resolution>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/java/elemental2/.settings/org.eclipse.jdt.core.prefs b/java/elemental2/.settings/org.eclipse.jdt.core.prefs
index c5379fb0db8..9f6ece88bdf 100755
--- a/java/elemental2/.settings/org.eclipse.jdt.core.prefs
+++ b/java/elemental2/.settings/org.eclipse.jdt.core.prefs
@@ -1,15 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/java/net.sf.marineapi.test/.settings/org.eclipse.jdt.core.prefs b/java/net.sf.marineapi.test/.settings/org.eclipse.jdt.core.prefs
index c5379fb0db8..144c60c0ff4 100644
--- a/java/net.sf.marineapi.test/.settings/org.eclipse.jdt.core.prefs
+++ b/java/net.sf.marineapi.test/.settings/org.eclipse.jdt.core.prefs
@@ -8,8 +8,5 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/java/net.sf.marineapi/.settings/org.eclipse.jdt.core.prefs b/java/net.sf.marineapi/.settings/org.eclipse.jdt.core.prefs
index c5379fb0db8..144c60c0ff4 100644
--- a/java/net.sf.marineapi/.settings/org.eclipse.jdt.core.prefs
+++ b/java/net.sf.marineapi/.settings/org.eclipse.jdt.core.prefs
@@ -8,8 +8,5 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/java/org.hamcrest.core/.classpath b/java/org.hamcrest.core/.classpath
index 01836c4842f..eca7bdba8f0 100644
--- a/java/org.hamcrest.core/.classpath
+++ b/java/org.hamcrest.core/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/java/pom.xml b/java/pom.xml
index 10d2c890c52..b62dc7e99ba 100755
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -76,11 +76,13 @@
           <name>!ldi.releaseBuild</name>
         </property>
       </activation>
+      <properties>
+        <with.not.android.relevant>true</with.not.android.relevant>
+      </properties>
       <modules>
         <module>elemental2</module>
         <module>org.hamcrest.core</module>
         <module>com.sap.sse</module>
-        <module>com.sap.sse.apacheservicemixfragment</module>
         <module>com.sap.sse.test</module>
         <module>com.sap.sse.landscape.common</module>
         <module>com.sap.sse.landscape</module>
@@ -93,7 +95,6 @@
         <module>com.sap.sailing.landscape.test</module>
         <module>com.sap.sailing.landscape.common</module>
         <module>com.sap.sailing.landscape.ui</module>
-        <module>com.sap.sse.jersey.jaxbdependencyfragment</module>
         <module>com.sap.sailing.routeconverterjava11extension</module>
         <module>com.sap.sse.mail</module>
         <module>com.sap.sse.mail.replication.test</module>
@@ -300,16 +301,6 @@
                   <id>com.sap.sailing.routeconverterjava11extension</id>
                   <versionRange>0.0.0</versionRange>
                 </requirement>
-                <requirement>
-                  <type>eclipse-plugin</type>
-                  <id>com.sap.sse.jersey.jaxbdependencyfragment</id>
-                  <versionRange>0.0.0</versionRange>
-                </requirement>
-                <requirement>
-                  <type>eclipse-plugin</type>
-                  <id>com.sap.sse.apacheservicemixfragment</id>
-                  <versionRange>0.0.0</versionRange>
-                </requirement>
               </extraRequirements>
             </dependency-resolution>
           </configuration>