diff --git a/build-java.gradle b/build-java.gradle
index 29f9c987cf..a1763a7bfa 100644
--- a/build-java.gradle
+++ b/build-java.gradle
@@ -28,6 +28,7 @@ subprojects{
     }
     
     apply plugin: 'java'
+    apply plugin: 'java-library'
 
 	/* Setup UTF-8 for compile AND test compilation*/
 	[ compileJava, compileTestJava ]*.options*.encoding = 'UTF-8'
diff --git a/build-maven.gradle b/build-maven.gradle
index 7b6a0ce6d3..9e6412c6f1 100644
--- a/build-maven.gradle
+++ b/build-maven.gradle
@@ -10,10 +10,7 @@
 
 subprojects {
 
-	apply plugin: 'maven'
-
 	group = "com.mercedesbenz.sechub"
-    
 
     if (!projectType.publishedLibraries.contains(project)){
         return;
@@ -75,7 +72,7 @@ subprojects {
                    }
                }
            }
-      }
+         }
       }
       
     }
diff --git a/build-spring.gradle b/build-spring.gradle
index c11898f776..fe8f3f41a6 100644
--- a/build-spring.gradle
+++ b/build-spring.gradle
@@ -28,51 +28,49 @@ subprojects {
 
 	dependencies {
 
-        testCompile(library.springboot_starter_test)
-        compile(library.springboot_starter_json)
+        testImplementation(library.springboot_starter_test)
+        implementation(library.springboot_starter_json)
         
 
 	    if (projectType.springBootAdapterProjects.contains(project)){
-            // next line: compile only, because spring boot does add android-json on test compile as lightweight imp
-            //compile(library.openjson)
 
             /* REST */
-            compile(library.jackson_JDK8)
-            compile(library.springboot_starter_web)
+            implementation(library.jackson_JDK8)
+            implementation(library.springboot_starter_web)
 
 
             if (! project.name.equals('sechub-adapter')){
-                compile project(':sechub-adapter')
+                api project(':sechub-adapter')
             }
 
-            testCompile library.wiremock
-            testCompile project(':sechub-testframework')
+            testImplementation library.wiremock
+            testImplementation project(':sechub-testframework')
 
         }
 
         if (projectType.springBootSecHubServerProjects.contains(project)){
-            compile(library.springboot_starter_web)
-            compile(library.springboot_starter_validation)
-            testCompile project(':sechub-testframework')
+            api(library.springboot_starter_web)
+            api(library.springboot_starter_validation)
+            testImplementation project(':sechub-testframework')
 
             /* REST */
-            compile(library.jackson_JDK8)
+            implementation(library.jackson_JDK8)
 
             /* database */
-            compile(library.database_postgres)
-            compile(library.database_h2)
-            compile(library.springboot_starter_data_jpa)
+            implementation(library.database_postgres)
+            implementation(library.database_h2)
+            api(library.springboot_starter_data_jpa)
             //compile(library.springboot_starter_actuator)
 
             /* security */
-            compile(library.springboot_starter_security)
-            testCompile(library.springframework_security_test)
+            api(library.springboot_starter_security)
+            testImplementation(library.springframework_security_test)
 
             /* develop */
            // currently deactivated: compile(library.springboot_devtoolssf)
         }
        if (projectType.springDocProjects.contains(project)){
-            compile(library.springboot_starter_web)
+            api(library.springboot_starter_web)
        }
     }
 }
diff --git a/buildDoc b/buildDoc
index e2bb076702..0bd0191fac 100755
--- a/buildDoc
+++ b/buildDoc
@@ -1,4 +1,5 @@
 #!/bin/bash 
+set -e
 cd `dirname $0`
 
 # This script build full documentation and also creates all precondition parts
diff --git a/libraries.gradle b/libraries.gradle
index 2dc84a0e1b..d93cda570c 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -22,11 +22,13 @@ ext {
        
         /* autark JUnit parts, with same versions like current used spring boot version */
         // https://mvnrepository.com/artifact/junit/junit
-        junit: "junit:junit:4.13.1",
+        junit4: "junit:junit:4.13.1",
         junit5_impl: 'org.junit.jupiter:junit-jupiter-api:${libraryVersion.junit5Version}',
         junit5_runtime: 'org.junit.jupiter:junit-jupiter-engine:${libraryVersion.junit5Version}',
         junit5_params: 'org.junit.jupiter:junit-jupiter-params:${libraryVersion.junit5Version}',
         
+        amazonaws_sdk: 'com.amazonaws:aws-java-sdk-s3:1.12.30',
+        
 //      Adopting existing Junit4 to Junit5 tests: 
 //      currently we keep our exting Junit4 tests and do NOT transform them. 
 //      If we start this, please refer: 
diff --git a/sechub-adapter-checkmarx/build.gradle b/sechub-adapter-checkmarx/build.gradle
index a8fbf6ebc6..e743ec4347 100644
--- a/sechub-adapter-checkmarx/build.gradle
+++ b/sechub-adapter-checkmarx/build.gradle
@@ -7,6 +7,6 @@
  */
 dependencies {
 
-    compile project(':sechub-adapter')
+    api project(':sechub-adapter')
 }
  
\ No newline at end of file
diff --git a/sechub-adapter-nessus/build.gradle b/sechub-adapter-nessus/build.gradle
index a8fbf6ebc6..e743ec4347 100644
--- a/sechub-adapter-nessus/build.gradle
+++ b/sechub-adapter-nessus/build.gradle
@@ -7,6 +7,6 @@
  */
 dependencies {
 
-    compile project(':sechub-adapter')
+    api project(':sechub-adapter')
 }
  
\ No newline at end of file
diff --git a/sechub-adapter-netsparker/build.gradle b/sechub-adapter-netsparker/build.gradle
index 217aac00f2..83d5ab2bad 100644
--- a/sechub-adapter-netsparker/build.gradle
+++ b/sechub-adapter-netsparker/build.gradle
@@ -6,6 +6,6 @@
  * ============================================================================
  */
 dependencies {
-	compile library.apache_commons_lang3
-    compile project(':sechub-adapter')
+    api project(':sechub-adapter')
+	implementation library.apache_commons_lang3
 }
diff --git a/sechub-adapter/build.gradle b/sechub-adapter/build.gradle
index 25f7839cbe..3f1f46541a 100644
--- a/sechub-adapter/build.gradle
+++ b/sechub-adapter/build.gradle
@@ -6,8 +6,9 @@
  * ============================================================================
  */
 dependencies {
-    compile library.apache_httpcomponents_core
-    compile library.apache_httpcomponents_client
-    compile project(':sechub-commons-model')
+    api project(':sechub-commons-model')
+
+    implementation library.apache_httpcomponents_core
+    implementation library.apache_httpcomponents_client
 }
 
diff --git a/sechub-analyzer-cli/build.gradle b/sechub-analyzer-cli/build.gradle
index 369080bd41..5d40d4ce7d 100644
--- a/sechub-analyzer-cli/build.gradle
+++ b/sechub-analyzer-cli/build.gradle
@@ -12,7 +12,7 @@ dependencies {
 	implementation library.jackson_jr_all
 	implementation library.google_re2j
 	
-	testImplementation library.junit
+	testImplementation library.junit4
 	testImplementation library.mockito
 	testImplementation library.mockito_inline
     testImplementation library.hamcrest
@@ -21,14 +21,14 @@ dependencies {
 task buildAnalyzerCLI(type: Jar) {
     group 'sechub'
     description 'Builds the SecHub Analyzer CLI tool.'
-    baseName = 'analyzer'
+    archiveBaseName = 'analyzer'
     
 	manifest {
         attributes 'Main-Class': 'com.mercedesbenz.sechub.analyzer.cli.SecHubAnalyzerApplication'
     }
 
     from { 
-    	configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } 
+    	configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } 
     }
 
     with jar
diff --git a/sechub-cli/build.gradle b/sechub-cli/build.gradle
index c6dca1758e..f41fe94fd9 100644
--- a/sechub-cli/build.gradle
+++ b/sechub-cli/build.gradle
@@ -18,6 +18,7 @@ task genGo(type: Exec) {
         commandLine "${projectDir}/gen_go.sh"
     }
 }
+apply plugin: 'base' // necessary to have assenble parts working without maven-publish
 
 assemble.dependsOn(tasks.genGo)
 tasks.eclipse.dependsOn(tasks.genGo)
@@ -75,11 +76,11 @@ task linterGo(type:Exec) {
 }
 
 task assembleArtifact(type: Zip, group: 'client') {
-    archiveName "sechub-client-${project.version}.zip"
-    destinationDir file("$buildDir/zip/")
+    archiveFileName= "sechub-client-${project.version}.zip"
+    destinationDirectory=file("$buildDir/zip/")
     from "${projectDir}/build/go/"
     from "${rootProject.projectDir}/sechub-doc/build/asciidoc/sechub-client.pdf" // we add the documentation into zip
-    description "Assemble archive $archiveName into ${relativePath(destinationDir)}"
+    description "Assemble archive $archiveName into ${relativePath(destinationDirectory)}"
 }
 
 version =   VersionData.getClientVersion()
diff --git a/sechub-developertools/build.gradle b/sechub-developertools/build.gradle
index c6a4cb1789..af6a3afa8e 100644
--- a/sechub-developertools/build.gradle
+++ b/sechub-developertools/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     implementation project(':sechub-scan')
     
     implementation project(':sechub-commons-pds')
-    
+
 }
 
 task startIntegrationTestAdminUI(type: JavaExec){
@@ -38,7 +38,7 @@ task startIntegrationTestAdminUI(type: JavaExec){
 task buildDeveloperAdminUI(type: Jar, dependsOn: build) {
     group 'sechub'
     description 'Builds the SecHub Developer Admin tool as standalone executable jar. Use launch-developer-admin-ui script to execute'
-    baseName = 'sechub-developer-admin-ui'
+    archiveBaseName = 'sechub-developer-admin-ui'
     
     manifest {
         attributes 'Main-Class': 'com.mercedesbenz.sechub.developertools.admin.ui.DeveloperAdministrationUI'
diff --git a/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/generator/HTMLReportCSSFragementGenerator.java b/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/generator/HTMLReportCSSFragementGenerator.java
index db047951ce..74020e129e 100644
--- a/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/generator/HTMLReportCSSFragementGenerator.java
+++ b/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/generator/HTMLReportCSSFragementGenerator.java
@@ -3,8 +3,8 @@
 
 import java.io.File;
 
-import com.mercedesbenz.sechub.developertools.TextFileWriter;
 import com.mercedesbenz.sechub.integrationtest.TextFileReader;
+import com.mercedesbenz.sechub.integrationtest.TextFileWriter;
 
 /**
  * How to use ? Why this generator?
diff --git a/sechub-doc/build.gradle b/sechub-doc/build.gradle
index 908116f13c..17ec470617 100644
--- a/sechub-doc/build.gradle
+++ b/sechub-doc/build.gradle
@@ -10,11 +10,45 @@ apply plugin: 'org.asciidoctor.jvm.convert'
 apply plugin: 'org.asciidoctor.jvm.pdf'
 
 dependencies {
-    implementation project(':sechub-server') // we want to expect server and all dependencies for documentation
-    implementation project(':sechub-pds') // we want to expect pds and all dependencies for documentation
+    def wanted = []
+    def unwanted = [
+        'sechub-cli', /* go only, no library dependency here*/
+        'sechub-doc',/* itself ... */
+        'sechub-developertools',/* only tests or tools */
+        'sechub-other',/* not java */
+        'sechub-pds-solutions', /* only pds scripts*/
+        
+        ]
+    /* fetch all sub projects, except unwanted and all only used for testing */
+    for (Project inspectedProject: rootProject.allprojects){
+        if (rootProject.equals(inspectedProject)){
+            // root project is always not wanted
+            continue
+        }
+        def projectName = inspectedProject.name
+        if (projectName.endsWith('test')){
+            // test projects are always not wanted 
+            continue
+        }
+        if (projectName.endsWith('testframework')){
+            // testframework projects are always not wanted 
+            continue
+        }
+        if (unwanted.contains(projectName)){
+            // special unwanted - so inore 
+            continue
+        }
+        wanted << projectName
+        //println ">>$projectName"
+    }
+    /* all projects are added as implementation, so can be inspected by Reflections */
+    for (String wantedProjectName: wanted){
+        implementation project(":${wantedProjectName}") 
+    }
     implementation library.apache_commons_io
+    
     testImplementation library.epages_restdoc_api_spec_mockmvc
-    testImplementation  project(':sechub-commons-model-testframework')
+    testImplementation project(':sechub-commons-model-testframework')
 
     /* next parts are necessary for rest doc generation in conjunction
        with reflection annoation scanning done wiht @UsecaseRestDoc
@@ -152,7 +186,8 @@ asciidoctorj {
 
 task convertSecHubHTMLPages(type: Copy){
 
-     /* Albert: Why those replace pattern stuff ?
+     /* Why those replace pattern stuff ?
+      * ----------------------------------
       * Because of PDF problems with rendered images, we were forced to use absolute image pathes so
       * PDF documented has got content inside (see build.gradle in sechub-doc for info)
       *
diff --git a/sechub-integrationtest/build.gradle b/sechub-integrationtest/build.gradle
index 7727bef17a..6c49fd1adc 100644
--- a/sechub-integrationtest/build.gradle
+++ b/sechub-integrationtest/build.gradle
@@ -11,13 +11,18 @@ plugins {
 }
 dependencies {
 
+    /* why as API? because to provide all parts here to developer tools */
     api project(':sechub-testframework')
-    api project(':sechub-adapter') // we reuse trustall approach from adapters
     api project(':sechub-shared-kernel') 
     api project(':sechub-scan-product-pds') // we want configuration entries available
+    api project(':sechub-commons-pds')
     api library.springboot_starter_mail // to have easier access to email parts
     
-    api project(':sechub-commons-pds')
+    api project(':sechub-adapter') // we reuse trustall approach from adapters
+    api project(':sechub-adapter-pds')
+    api project(':sechub-administration') 
+    
+    api library.junit4
 }
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -244,8 +249,6 @@ class IntegrationTestScriptAccess extends CmdExecutor{
               exec.getCommand().add("$sharedVolumeBaseDir");
               
           }
-          
-
           exec.execute(workingDir)
         }
 
diff --git a/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/TextFileWriter.java b/sechub-integrationtest/src/main/java/com/mercedesbenz/sechub/integrationtest/TextFileWriter.java
similarity index 79%
rename from sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/TextFileWriter.java
rename to sechub-integrationtest/src/main/java/com/mercedesbenz/sechub/integrationtest/TextFileWriter.java
index 4d95b9fc16..e4932b0d70 100644
--- a/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/TextFileWriter.java
+++ b/sechub-integrationtest/src/main/java/com/mercedesbenz/sechub/integrationtest/TextFileWriter.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-package com.mercedesbenz.sechub.developertools;
+package com.mercedesbenz.sechub.integrationtest;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -15,7 +15,15 @@ public class TextFileWriter {
 
     private static final Logger LOG = LoggerFactory.getLogger(TextFileWriter.class);
 
+    public void save(String text, File targetFile, Charset charset) throws IOException {
+        internalSave(targetFile, text, true, charset);
+    }
+
     public void save(File targetFile, String text, boolean overwrite) throws IOException {
+        internalSave(targetFile, text, overwrite, Charset.forName("UTF-8"));
+    }
+
+    private void internalSave(File targetFile, String text, boolean overwrite, Charset charset) throws IOException {
         if (targetFile == null) {
             throw new IllegalArgumentException("null not allowed as file!");
         }
@@ -42,9 +50,10 @@ public void save(File targetFile, String text, boolean overwrite) throws IOExcep
                 throw new IllegalStateException("was not able to create new file:" + targetFile);
             }
         }
-        try (BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(targetFile), Charset.forName("UTF-8")))) {
+        try (BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(targetFile), charset))) {
             bw.write(text);
         }
         LOG.info("Written:" + targetFile);
     }
+
 }
diff --git a/sechub-integrationtest/src/main/java/com/mercedesbenz/sechub/integrationtest/internal/SecHubClientExecutor.java b/sechub-integrationtest/src/main/java/com/mercedesbenz/sechub/integrationtest/internal/SecHubClientExecutor.java
index fdbf1cfea8..bee5fa0b1d 100644
--- a/sechub-integrationtest/src/main/java/com/mercedesbenz/sechub/integrationtest/internal/SecHubClientExecutor.java
+++ b/sechub-integrationtest/src/main/java/com/mercedesbenz/sechub/integrationtest/internal/SecHubClientExecutor.java
@@ -18,9 +18,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import wiremock.com.google.common.io.Files;
-
 import com.mercedesbenz.sechub.commons.model.TrafficLight;
+import com.mercedesbenz.sechub.integrationtest.TextFileWriter;
 import com.mercedesbenz.sechub.integrationtest.api.IntegrationTestSetup;
 import com.mercedesbenz.sechub.integrationtest.api.TestUser;
 import com.mercedesbenz.sechub.integrationtest.api.WithSecHubClient.ApiTokenStrategy;
@@ -373,7 +372,8 @@ private File ensureExampleContentFoldersExist() {
                 File testFile1 = new File(projectResourceFoldder, "TestMeIfYouCan.java");
                 if (!testFile1.exists()) {
                     try {
-                        Files.write("class TestMeifYouCan {}", testFile1, Charset.forName("UTF-8"));
+                        TextFileWriter writer = new TextFileWriter();
+                        writer.save("class TestMeifYouCan {}", testFile1, Charset.forName("UTF-8"));
                     } catch (IOException e) {
                         throw new IllegalStateException("Cannot create test output!", e);
                     }
diff --git a/sechub-notification/build.gradle b/sechub-notification/build.gradle
index f3b29de945..d38f2b1e65 100644
--- a/sechub-notification/build.gradle
+++ b/sechub-notification/build.gradle
@@ -7,10 +7,10 @@
  */
 dependencies {
 
-    compile project(':sechub-shared-kernel')
-    compile library.springboot_starter_mail
-    compile library.apache_commons_lang3
+    implementation project(':sechub-shared-kernel')
+    implementation library.springboot_starter_mail
+    implementation library.apache_commons_lang3
     
-    testCompile project(':sechub-testframework')
+    testImplementation project(':sechub-testframework')
 
 }
diff --git a/sechub-pds/build.gradle b/sechub-pds/build.gradle
index bf0298d42b..b49fa42a96 100644
--- a/sechub-pds/build.gradle
+++ b/sechub-pds/build.gradle
@@ -12,31 +12,31 @@ plugins {
  
 dependencies {
 
-    compile library.springboot_starter_web
-    compile library.springboot_starter_data_jpa
-    compile library.springboot_starter_security
-    compile library.flyway
-    compile library.logstashLogbackEncoder
-    compile library.database_h2
-    compile library.database_postgres
-    compile library.apache_commons_io
-
-    compile project(':sechub-pds-core')
-
-    testCompile project(':sechub-testframework') // testframework has no dependencies or page effects, so we can use the lib for testing
-    testCompile library.springboot_starter_test
-    testCompile library.springframework_security_test
+    implementation library.springboot_starter_web
+    implementation library.springboot_starter_data_jpa
+    implementation library.springboot_starter_security
+    implementation library.flyway
+    implementation library.logstashLogbackEncoder
+    implementation library.database_h2
+    implementation library.database_postgres
+    implementation library.apache_commons_io
+
+    api project(':sechub-pds-core')
+
+    testImplementation project(':sechub-testframework') // testframework has no dependencies or page effects, so we can use the lib for testing
+    testImplementation library.springboot_starter_test
+    testImplementation library.springframework_security_test
     
 }
 
 task assembleArtifact(type: Zip, group: 'sechub') {
-    archiveName "sechub-pds-documentation-${project.version}.zip"
+    archiveFileName = "sechub-pds-documentation-${project.version}.zip"
     archiveClassifier.set('documentation')
-    destinationDir file("$buildDir/zip/")
+    destinationDirectory= file("$buildDir/zip/")
     from "${projectDir}/build/go/"
     from "${rootProject.projectDir}/sechub-doc/build/asciidoc"
     include '**/sechub-product-delegation-server.*'
-    description "Assemble archive $archiveName into ${relativePath(destinationDir)}"
+    description "Assemble archive $archiveName into ${relativePath(destinationDirectory)}"
 }
 
 /**
diff --git a/sechub-scan-product-checkmarx/build.gradle b/sechub-scan-product-checkmarx/build.gradle
index c890240f2f..999bb95fd4 100644
--- a/sechub-scan-product-checkmarx/build.gradle
+++ b/sechub-scan-product-checkmarx/build.gradle
@@ -7,9 +7,9 @@
  */
 dependencies {
 
-    compile project(':sechub-scan')
-    compile project(':sechub-adapter-checkmarx')
+    implementation project(':sechub-scan')
+    implementation project(':sechub-adapter-checkmarx')
 
-    testCompile project(':sechub-testframework')
+    testImplementation project(':sechub-testframework')
 }
 
diff --git a/sechub-scan-product-nessus/build.gradle b/sechub-scan-product-nessus/build.gradle
index e637625012..66a37b336a 100644
--- a/sechub-scan-product-nessus/build.gradle
+++ b/sechub-scan-product-nessus/build.gradle
@@ -7,9 +7,9 @@
  */
 dependencies {
 
-    compile project(':sechub-scan')
-    compile project(':sechub-adapter-nessus')
+    implementation project(':sechub-scan')
+    implementation project(':sechub-adapter-nessus')
 
-    testCompile project(':sechub-testframework')
+    testImplementation project(':sechub-testframework')
 }
 
diff --git a/sechub-scan-product-netsparker/build.gradle b/sechub-scan-product-netsparker/build.gradle
index b78c0ed303..76a761bff7 100644
--- a/sechub-scan-product-netsparker/build.gradle
+++ b/sechub-scan-product-netsparker/build.gradle
@@ -7,9 +7,9 @@
  */
 dependencies {
 
-    compile project(':sechub-scan')
-    compile project(':sechub-adapter-netsparker')
+    implementation project(':sechub-scan')
+    implementation project(':sechub-adapter-netsparker')
 
-    testCompile project(':sechub-testframework')
+    testImplementation project(':sechub-testframework')
 }
 
diff --git a/sechub-scan-product-pds/build.gradle b/sechub-scan-product-pds/build.gradle
index c0e9871ced..dd3b8033a9 100644
--- a/sechub-scan-product-pds/build.gradle
+++ b/sechub-scan-product-pds/build.gradle
@@ -9,8 +9,8 @@ dependencies {
 
     implementation project(':sechub-commons-pds')
 
-    compile project(':sechub-scan')
-    compile project(':sechub-adapter-pds')
-    testCompile project(':sechub-testframework')
+    implementation project(':sechub-scan')
+    implementation project(':sechub-adapter-pds')
+    testImplementation project(':sechub-testframework')
 }
 
diff --git a/sechub-scan-product-sereco/build.gradle b/sechub-scan-product-sereco/build.gradle
index 850b68697f..75b3f6e521 100644
--- a/sechub-scan-product-sereco/build.gradle
+++ b/sechub-scan-product-sereco/build.gradle
@@ -7,11 +7,11 @@
  */
 dependencies {
 
-    compile project(':sechub-scan')
-    compile project(':sechub-sereco')
+    implementation project(':sechub-scan')
+    implementation project(':sechub-sereco')
     
-    testCompile project(':sechub-testframework')
-    testCompile project(':sechub-scan-testframework')
+    testImplementation project(':sechub-testframework')
+    testImplementation project(':sechub-scan-testframework')
 
 }
 
diff --git a/sechub-scan-testframework/build.gradle b/sechub-scan-testframework/build.gradle
index eb1287d515..d74b661b56 100644
--- a/sechub-scan-testframework/build.gradle
+++ b/sechub-scan-testframework/build.gradle
@@ -7,8 +7,10 @@
  */
 dependencies {
 
-    compile project(':sechub-testframework')
-    compile project(':sechub-scan')
+    implementation library.junit4
+
+    implementation project(':sechub-testframework')
+    implementation project(':sechub-scan')
 
 }
 
diff --git a/sechub-scan/build.gradle b/sechub-scan/build.gradle
index 7a10144516..a9cb59f12e 100644
--- a/sechub-scan/build.gradle
+++ b/sechub-scan/build.gradle
@@ -7,11 +7,11 @@
  */
 dependencies {
 
-    compile project(':sechub-shared-kernel')
-    compile project(':sechub-adapter') // we use this dependency to provide common adapter support for dedicated scan projects (e.g. sechub-scan-product-netsparker)
-    compile library.springboot_starter_thymeleaf
+    api project(':sechub-shared-kernel')
+    implementation project(':sechub-adapter') // we use this dependency to provide common adapter support for dedicated scan projects (e.g. sechub-scan-product-netsparker)
+    implementation library.springboot_starter_thymeleaf
 
-    testCompile project(':sechub-testframework')
+    testImplementation project(':sechub-testframework')
 
 }
 
diff --git a/sechub-server-core/build.gradle b/sechub-server-core/build.gradle
index c1db762af9..717ed76b19 100644
--- a/sechub-server-core/build.gradle
+++ b/sechub-server-core/build.gradle
@@ -1,24 +1,25 @@
 // SPDX-License-Identifier: MIT
 dependencies {
 
-    compile(library.springboot_starter_batch)
-    compile(library.flyway)
+    api(library.springboot_starter_batch)
+    implementation(library.flyway)
     
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
-    compile 'io.micrometer:micrometer-registry-prometheus:1.7.2'
+    implementation 'io.micrometer:micrometer-registry-prometheus:1.7.2'
     
-    compile project(':sechub-shared-kernel')
-    compile project(':sechub-schedule')
-    compile project(':sechub-authorization')
-    compile project(':sechub-administration')
-    compile project(':sechub-notification')
-    compile project(':sechub-scan-product-netsparker')
-    compile project(':sechub-scan-product-nessus')
-    compile project(':sechub-scan-product-sereco')
-    compile project(':sechub-scan-product-checkmarx')
-    compile project(':sechub-scan-product-pds')
-    compile project(':sechub-sereco')
+    api project(':sechub-shared-kernel')
+    api project(':sechub-schedule')
+    api project(':sechub-authorization')
+    api project(':sechub-administration')
+    api project(':sechub-notification')
+    api project(':sechub-scan')
+    api project(':sechub-scan-product-netsparker')
+    api project(':sechub-scan-product-nessus')
+    api project(':sechub-scan-product-sereco')
+    api project(':sechub-scan-product-checkmarx')
+    api project(':sechub-scan-product-pds')
+    api project(':sechub-sereco')
 
-    testCompile (library.hsqldb)
-    testCompile project(':sechub-testframework')
+    testImplementation (library.hsqldb)
+    testImplementation project(':sechub-testframework')
 }
\ No newline at end of file
diff --git a/sechub-server/build.gradle b/sechub-server/build.gradle
index 19c71e9d13..32122e86e9 100644
--- a/sechub-server/build.gradle
+++ b/sechub-server/build.gradle
@@ -12,21 +12,21 @@ plugins {
  
 dependencies {
 
-    compile project(':sechub-server-core')
+    api project(':sechub-server-core')
 
-    testCompile project(':sechub-testframework')
+    testImplementation project(':sechub-testframework')
 }
 
 task assembleArtifact(type: Zip, group: 'sechub') {
-    archiveName "sechub-server-documentation-${project.version}.zip"
+    archiveFileName= "sechub-server-documentation-${project.version}.zip"
     archiveClassifier.set('documentation')
-    destinationDir file("$buildDir/zip/")
+    destinationDirectory= file("$buildDir/zip/")
     from "${projectDir}/build/go/"
     from "${rootProject.projectDir}/sechub-doc/build/asciidoc"
     exclude '**/sechub-product-delegation-server.*'
     exclude '**/sechub-client.*'
     exclude '**/.asciidoctor/**'
-    description "Assemble archive $archiveName into ${relativePath(destinationDir)}"
+    description "Assemble archive $archiveName into ${relativePath(destinationDirectory)}"
 }
 
 /**
diff --git a/sechub-shared-kernel/build.gradle b/sechub-shared-kernel/build.gradle
index b36da7352e..a04ddb0197 100644
--- a/sechub-shared-kernel/build.gradle
+++ b/sechub-shared-kernel/build.gradle
@@ -12,13 +12,15 @@ plugins {
 dependencies {
 
     api project(':sechub-commons-model')
-    compile project(':sechub-storage-sharedvolume-spring')
-    compile project(':sechub-storage-s3-aws')
-    compile project(':sechub-adapter')
+    api project(':sechub-storage-core')
+    
+    implementation project(':sechub-storage-sharedvolume-spring')
+    api project(':sechub-storage-s3-aws')
+    implementation project(':sechub-adapter')
 
-    compile library.apache_commons_validator
-    compile library.logstashLogbackEncoder
+    implementation library.apache_commons_validator
+    implementation library.logstashLogbackEncoder
 
-    testCompile project(':sechub-testframework')
+    testImplementation project(':sechub-testframework')
 
 }
diff --git a/sechub-storage-core/build.gradle b/sechub-storage-core/build.gradle
index b4fba3b471..158e0349cb 100644
--- a/sechub-storage-core/build.gradle
+++ b/sechub-storage-core/build.gradle
@@ -8,9 +8,9 @@
  */
 dependencies {
 
-    testCompile library.junit
-    testCompile library.mockito
-    testCompile library.mockito_inline
-    testCompile project(':sechub-testframework')
+    testImplementation library.junit4
+    testImplementation library.mockito
+    testImplementation library.mockito_inline
+    testImplementation project(':sechub-testframework')
 
 }
diff --git a/sechub-storage-s3-aws-test/build.gradle b/sechub-storage-s3-aws-test/build.gradle
index b43db50b81..ea8d675478 100644
--- a/sechub-storage-s3-aws-test/build.gradle
+++ b/sechub-storage-s3-aws-test/build.gradle
@@ -7,17 +7,17 @@
  * ============================================================================
  */
 dependencies {
-    compile library.slf4j
-    compile project(':sechub-storage-core')
-    compile project(':sechub-storage-s3-aws')
+    implementation library.slf4j
+    implementation project(':sechub-storage-core')
+    implementation project(':sechub-storage-s3-aws')
 
      // https://mvnrepository.com/artifact/com.adobe.testing/s3mock
-    testCompile group: 'com.adobe.testing', name: 's3mock', version: '2.1.36'
-    testCompile group: 'com.adobe.testing', name: 's3mock-junit4', version: '2.1.36'
+    testImplementation group: 'com.adobe.testing', name: 's3mock', version: '2.1.36'
+    testImplementation group: 'com.adobe.testing', name: 's3mock-junit4', version: '2.1.36'
 
-    testCompile library.junit
-    testCompile library.mockito
-    testCompile library.mockito_inline
-    testCompile project(':sechub-testframework')
+    testImplementation library.junit4
+    testImplementation library.mockito
+    testImplementation library.mockito_inline
+    testImplementation project(':sechub-testframework')
 
 }
diff --git a/sechub-storage-s3-aws/build.gradle b/sechub-storage-s3-aws/build.gradle
index bae8c22bda..d3d05fd710 100644
--- a/sechub-storage-s3-aws/build.gradle
+++ b/sechub-storage-s3-aws/build.gradle
@@ -7,10 +7,10 @@
  * ============================================================================
  */
 dependencies {
-    compile library.slf4j
-    compile project(':sechub-storage-core')
+    implementation library.slf4j
+    api project(':sechub-storage-core')
     // https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-s3
-    compile group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.30'
+    api library.amazonaws_sdk
 
 
 }
diff --git a/sechub-storage-sharedvolume-spring/build.gradle b/sechub-storage-sharedvolume-spring/build.gradle
index 04e9e77c23..f5926ea85c 100644
--- a/sechub-storage-sharedvolume-spring/build.gradle
+++ b/sechub-storage-sharedvolume-spring/build.gradle
@@ -9,6 +9,7 @@
 dependencies {
     implementation library.slf4j
     implementation project(':sechub-storage-core')
+    
 	testImplementation library.mockito_inline
 	testImplementation project(':sechub-testframework')
 }
diff --git a/sechub-test/build.gradle b/sechub-test/build.gradle
index c079cbc8fc..5bc1ad5c48 100644
--- a/sechub-test/build.gradle
+++ b/sechub-test/build.gradle
@@ -3,10 +3,11 @@ dependencies {
 
     /* we don reference spring boot application projects but core parts - 
        reason: fat jars are build which cannot be directly used for testing etc. */
-    testCompile project(':sechub-server-core')
-    testCompile project(':sechub-pds-core')
-    testCompile project(':sechub-testframework')
-    testCompile project(':sechub-doc') // here we got the dependency to Reflections 
-
+    testImplementation project(':sechub-server-core')
+    testImplementation project(':sechub-pds-core')
+    testImplementation project(':sechub-adapter')
+    testImplementation project(':sechub-testframework')
+    testImplementation project(':sechub-doc') // here we got the dependency to Reflections 
+    testImplementation library.springboot_starter_thymeleaf
 }
 
diff --git a/sechub-testframework/build.gradle b/sechub-testframework/build.gradle
index 3cc21d44db..45d4d6ecb4 100644
--- a/sechub-testframework/build.gradle
+++ b/sechub-testframework/build.gradle
@@ -7,12 +7,12 @@
  */
 dependencies {
 
-    compile library.junit
-    compile library.mockito
-    compile library.mockito_inline
-    compile library.hamcrest
-    compile library.slf4j
+    implementation library.junit4
+    implementation library.mockito
+    implementation library.mockito_inline
+    implementation library.hamcrest
+    implementation library.slf4j
 
-    compile library.wiremock
+    implementation library.wiremock
 
 } 
diff --git a/settings.gradle b/settings.gradle
index 0b23526c0e..1abf10c2ee 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,12 +23,10 @@ include 'sechub-cli',
 
 /* integration test*/
 'sechub-integrationtest',
-'sechub-pds-integrationtest',
 
 /* server parts */
 'sechub-schedule',
 'sechub-scan',
-'sechub-scan-testbase',
 'sechub-scan-product-netsparker',
 'sechub-scan-product-nessus',
 'sechub-scan-product-checkmarx',