Moved gradle sub parts to gradle folder #1321 + introduce archive

- all gradle sub files from rootfolder are now moved to `gradle` subfolder - introduced `sechub-commons-archive` gradle submodule for handling issues #1320, #1319 and #1167
mercedes-benz · May 9, 2022 · 4403785 · 4403785
1 parent 5f9ff7a
commit 4403785
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 buildscript{
 
-	apply from: "${rootProject.projectDir}/libraries.gradle"
-	apply from: "${rootProject.projectDir}/projects.gradle"
+	apply from: "${rootProject.projectDir}/gradle/libraries.gradle"
+	apply from: "${rootProject.projectDir}/gradle/projects.gradle"
 
     def customMavenRepoURL4plugins = System.getenv('CUST_MVN_URL_PLUGINS')
     if (customMavenRepoURL4plugins!=null){
@@ -120,9 +120,9 @@ spotless {
 	}
 }
 
-apply from: "${rootProject.projectDir}/build-versioning.gradle"
-apply from: "${rootProject.projectDir}/build-java.gradle"
-apply from: "${rootProject.projectDir}/build-spring.gradle"
-apply from: "${rootProject.projectDir}/build-maven.gradle"
-apply from: "${rootProject.projectDir}/build-eclipse.gradle"
-apply from: "${rootProject.projectDir}/build-report.gradle"
+apply from: "${rootProject.projectDir}/gradle/build-versioning.gradle"
+apply from: "${rootProject.projectDir}/gradle/build-java.gradle"
+apply from: "${rootProject.projectDir}/gradle/build-spring.gradle"
+apply from: "${rootProject.projectDir}/gradle/build-maven.gradle"
+apply from: "${rootProject.projectDir}/gradle/build-eclipse.gradle"
+apply from: "${rootProject.projectDir}/gradle/build-report.gradle"
diff --git a/build-eclipse.gradle → gradle/build-eclipse.gradle b/build-eclipse.gradle → gradle/build-eclipse.gradle
diff --git a/build-java.gradle → gradle/build-java.gradle b/build-java.gradle → gradle/build-java.gradle
diff --git a/build-maven.gradle → gradle/build-maven.gradle b/build-maven.gradle → gradle/build-maven.gradle
diff --git a/build-report.gradle → gradle/build-report.gradle b/build-report.gradle → gradle/build-report.gradle
diff --git a/build-spring.gradle → gradle/build-spring.gradle b/build-spring.gradle → gradle/build-spring.gradle
diff --git a/build-versioning.gradle → gradle/build-versioning.gradle b/build-versioning.gradle → gradle/build-versioning.gradle
diff --git a/libraries.gradle → gradle/libraries.gradle b/libraries.gradle → gradle/libraries.gradle
diff --git a/projects.gradle → gradle/projects.gradle b/projects.gradle → gradle/projects.gradle
@@ -14,6 +14,7 @@ projectType = [
                project(':sechub-commons-model'),
                project(':sechub-commons-model-testframework'),
                project(':sechub-commons-pds'),
+               project(':sechub-commons-archive'),
                project(':sechub-storage-core'),
                project(':sechub-wrapper-owasp-zap'),
 

diff --git a/sechub-commons-archive/build.gradle b/sechub-commons-archive/build.gradle
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: MIT
+plugins {
+    id 'java-library'
+}
+
+dependencies{
+
+    api spring_boot_dependency.slf4j_api
+
+    api project(':sechub-commons-core')
+    api project(':sechub-commons-model')
+
+    testImplementation project(':sechub-testframework')
+    testImplementation spring_boot_dependency.junit_jupiter
+
+    testImplementation spring_boot_dependency.mockito_core
+    testImplementation spring_boot_dependency.hamcrest
+}
diff --git a/settings.gradle b/settings.gradle
@@ -10,6 +10,7 @@ include 'sechub-cli',
 'sechub-commons-core',
 'sechub-commons-model',
 'sechub-commons-pds',
+'sechub-commons-archive',
 
 /* server POD area */
 'sechub-server',       // executable spring boot jar