Merge branch 'master' into feature/topLevelPackageJava

.gitlab-ci.yml

@@ -30,65 +30,45 @@ test:
   stage: test
   tags:
     - exec-docker
-  script: ./gradlew test
+  script: ./gradlew test --continue
+  artifacts:
+    reports:
+      junit:
+        - "**/build/test-results/test/TEST-*.xml"
 
 checkstyle:
   stage: check
   tags:
     - exec-docker
-  script: ./gradlew checkstyle
+  script: ./gradlew checkstyle --continue
   allow_failure: true
   artifacts:
     paths:
-      - build/reports/checkstyle/main.html
-      - uc1-application/build/reports/checkstyle/main.html
-      - uc1-workload-generator/build/reports/checkstyle/main.html
-      - uc2-application/build/reports/checkstyle/main.html
-      - uc2-workload-generator/build/reports/checkstyle/main.html
-      - uc3-application/build/reports/checkstyle/main.html
-      - uc3-workload-generator/build/reports/checkstyle/main.html
-      - uc4-application/build/reports/checkstyle/main.html
-      - uc4-workload-generator/build/reports/checkstyle/main.html
+      - "*/build/reports/checkstyle/main.html"
     when: on_failure
     expire_in: 1 day
-  
+
 pmd:
   stage: check
   tags:
     - exec-docker
-  script: ./gradlew pmd
+  script: ./gradlew pmd --continue
   allow_failure: true
   artifacts:
     paths:
-      - build/reports/pmd/*.html
-      - uc1-application/build/reports/pmd/*.html
-      - uc1-workload-generator/build/reports/pmd/*.html
-      - uc2-application/build/reports/pmd/*.html
-      - uc2-workload-generator/build/reports/pmd/*.html
-      - uc3-application/build/reports/pmd/*.html
-      - uc3-workload-generator/build/reports/pmd/*.html
-      - uc4-application/build/reports/pmd/*.html
-      - uc4-workload-generator/build/reports/pmd/*.html
+      - "*/build/reports/pmd/*.html"
     when: on_failure
     expire_in: 1 day
-  
+
 spotbugs:
   stage: check
   tags:
     - exec-docker
-  script: ./gradlew spotbugs
+  script: ./gradlew spotbugs --continue
   allow_failure: true
   artifacts:
     paths:
-      - build/reports/spotbugs/*.html
-      - uc1-application/build/reports/spotbugs/*.html
-      - uc1-workload-generator/build/reports/spotbugs/*.html
-      - uc2-application/build/reports/spotbugs/*.html
-      - uc2-workload-generator/build/reports/spotbugs/*.html
-      - uc3-application/build/reports/spotbugs/*.html
-      - uc3-workload-generator/build/reports/spotbugs/*.html
-      - uc4-application/build/reports/spotbugs/*.html
-      - uc4-workload-generator/build/reports/spotbugs/*.html
+      - "*/build/reports/spotbugs/*.html"
     when: on_failure
     expire_in: 1 day
 
@@ -116,4 +96,4 @@ spotbugs:
     variables:
       - $DOCKERHUB_ORG
       - $DOCKERHUB_ID
-      - $DOCKERHUB_PW
+      - $DOCKERHUB_PW
\ No newline at end of file

build.gradle

-apply plugin: 'java-library'
-apply plugin: 'pmd'
-apply plugin: 'checkstyle'
-apply plugin: 'com.github.spotbugs'
-apply plugin: 'eclipse'
-
+// Inherited to all subprojects
 buildscript {
   repositories {
     maven {
@@ -15,15 +10,35 @@ buildscript {
   }
 }
 
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
+// Plugins for all projects
+allprojects {
+  apply plugin: 'eclipse'
+}
+
+// Plugins for subprojects
+subprojects {
+  apply plugin: 'application'
+  apply plugin: 'checkstyle'
+  apply plugin: 'pmd'
+  apply plugin: 'com.github.spotbugs'
+  apply plugin: 'java-library'
+}
+
+// Java version for all subprojects
+subprojects {
+  java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+  }
+}
 
+// Check for updates every build
 configurations.all {
-    // Check for updates every build
     resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
 }
 
-allprojects { 
+// Repositories for all projects
+allprojects {
 	repositories {
 	    jcenter()
 	    maven {
@@ -32,42 +47,23 @@ allprojects {
 	}
 }
 
-dependencies {
-    // These dependencies is exported to consumers, that is to say found on their compile classpath.
-    api('org.industrial-devops:titan-ccp-common:0.0.3-SNAPSHOT') { changing = true }
-    api 'net.kieker-monitoring:kieker:1.14-SNAPSHOT'
-    api 'net.sourceforge.teetime:teetime:3.0'
-
-    // These dependencies are used internally, and not exposed to consumers on their own compile classpath.
-    implementation 'org.apache.kafka:kafka-clients:2.1.0'
-    implementation 'com.google.guava:guava:24.1-jre'
-    implementation 'org.jctools:jctools-core:2.1.1'
-
-    // Use JUnit test framework
-    testImplementation 'junit:junit:4.12'
-}
-
-pmd {
-  ruleSets = [] // Gradle requires to clean the rule sets first
-  ruleSetFiles = files("config/pmd.xml")
-  ignoreFailures = false
-  toolVersion = "6.7.0"
-}
-
-checkstyle {
-  configDir = file("config")
-  configFile = file("config/checkstyle.xml")
-  maxWarnings = 0
-  ignoreFailures = false
-  toolVersion = "8.12"
-}
-
-spotbugs {
-  excludeFilter = file("config/spotbugs-exclude-filter.xml")
-  reportLevel = "low"
-  effort = "max"
-  ignoreFailures = false
-  toolVersion = '3.1.7'
+// Dependencies
+subprojects {
+  dependencies {
+      // These dependencies is exported to consumers, that is to say found on their compile classpath.
+      api('org.industrial-devops:titan-ccp-common:0.0.3-SNAPSHOT') { changing = true }
+      api 'net.kieker-monitoring:kieker:1.14-SNAPSHOT'
+      api 'net.sourceforge.teetime:teetime:3.0'
+
+      // These dependencies are used internally, and not exposed to consumers on their own compile classpath.
+      implementation 'org.apache.kafka:kafka-clients:2.1.0'
+      implementation 'com.google.guava:guava:24.1-jre'
+      implementation 'org.jctools:jctools-core:2.1.1'
+      implementation 'org.slf4j:slf4j-simple:1.6.1'
+
+      // Use JUnit test framework
+      testImplementation 'junit:junit:4.12'
+  }
 }
 
 // Per default XML reports for SpotBugs are generated
@@ -80,33 +76,64 @@ tasks.withType(com.github.spotbugs.SpotBugsTask) {
   }
 }
 
-task checkstyle {
-  group 'Quality Assurance'
-  description 'Run Checkstyle'
-  
-  dependsOn 'checkstyleMain'
-  dependsOn 'checkstyleTest'
-}
+// Subprojects quality tools tasks
+subprojects {
+  task pmd {
+    group 'Quality Assurance'
+    description 'Run PMD'
+
+    dependsOn 'pmdMain'
+    dependsOn 'pmdTest'
+  }
 
-task pmd {
-  group 'Quality Assurance'
-  description 'Run PMD'
+  task checkstyle {
+    group 'Quality Assurance'
+    description 'Run Checkstyle'
 
-  dependsOn 'pmdMain'
-  dependsOn 'pmdTest'
+    dependsOn 'checkstyleMain'
+    dependsOn 'checkstyleTest'
+  }
+
+  task spotbugs {
+    group 'Quality Assurance'
+    description 'Run SpotBugs'
+
+    dependsOn 'spotbugsMain'
+    dependsOn 'spotbugsTest'
+  }
 }
 
-task spotbugs {
-  group 'Quality Assurance'
-  description 'Run SpotBugs'
-  
-  dependsOn 'spotbugsMain'
-  dependsOn 'spotbugsTest'
+// Subprojects quality tools configuration
+subprojects {
+  pmd {
+    ruleSets = [] // Gradle requires to clean the rule sets first
+    ruleSetFiles = files("$rootProject.projectDir/config/pmd.xml")
+    ignoreFailures = false
+    toolVersion = "6.7.0"
+  }
+
+  checkstyle {
+    configDirectory = file("$rootProject.projectDir/config")
+    configFile = file("$rootProject.projectDir/config/checkstyle.xml")
+    maxWarnings = 0
+    ignoreFailures = false
+    toolVersion = "8.12"
+  }
+
+  spotbugs {
+    excludeFilter = file("$rootProject.projectDir/config/spotbugs-exclude-filter.xml")
+    reportLevel = "low"
+    effort = "max"
+    ignoreFailures = false
+    toolVersion = '3.1.7'
+  }
 }
 
-eclipse {
-    classpath {
-       downloadSources=true
-       downloadJavadoc=true
-    }
-}
+allprojects {
+  eclipse {
+      classpath {
+         downloadSources=true
+         downloadJavadoc=true
+      }
\ No newline at end of file
+  }
+}

uc1-application/build.gradle

-apply plugin: 'application'
-apply plugin: 'eclipse'
-
-buildscript {
-  repositories {
-    maven {
-      url "https://plugins.gradle.org/m2/"
-    }
-  }
-}
-
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
-
-dependencies {
-    compile project(':')
-
-    compile 'org.slf4j:slf4j-simple:1.6.1'
-
-    // Use JUnit test framework
-    testCompile 'junit:junit:4.12'
-}
-
 mainClassName = "spesb.uc1.application.HistoryService"
-
-eclipse {
-    classpath {
-       downloadSources=true
-       downloadJavadoc=true
-    }
-}

uc1-workload-generator/build.gradle

-apply plugin: 'application'
-apply plugin: 'eclipse'
-
-buildscript {
-  repositories {
-    maven {
-      url "https://plugins.gradle.org/m2/"
-    }
-  }
-}
-
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
-
-dependencies {
-    compile project(':')
-
-    compile 'org.slf4j:slf4j-simple:1.6.1'
-
-    // Use JUnit test framework
-    testCompile 'junit:junit:4.12'
-}
-
 mainClassName = "spesb.uc1.workloadgenerator.LoadGenerator"
-
-eclipse {
-    classpath {
-       downloadSources=true
-       downloadJavadoc=true
-    }
-}

uc2-application/build.gradle

-apply plugin: 'application'
-apply plugin: 'eclipse'
-
-buildscript {
-  repositories {
-    maven {
-      url "https://plugins.gradle.org/m2/"
-    }
-  }
-}
-
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
-
-dependencies {
-    compile project(':')
-
-    compile 'org.slf4j:slf4j-simple:1.6.1'
-
-    // Use JUnit test framework
-    testCompile 'junit:junit:4.12'
-}
-
 mainClassName = "spesb.uc2.application.AggregationService"
-
-eclipse {
-    classpath {
-       downloadSources=true
-       downloadJavadoc=true
-    }
-}

uc2-workload-generator/build.gradle

-apply plugin: 'application'
-apply plugin: 'eclipse'
-
-buildscript {
-  repositories {
-    maven {
-      url "https://plugins.gradle.org/m2/"
-    }
-  }
-}
-
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
-
-dependencies {
-    compile project(':')
-
-    compile 'org.slf4j:slf4j-simple:1.6.1'
-
-    // Use JUnit test framework
-    testCompile 'junit:junit:4.12'
-}
-
 mainClassName = "spesb.uc2.workloadgenerator.LoadGenerator"
-
-eclipse {
-    classpath {
-       downloadSources=true
-       downloadJavadoc=true
-    }
-}

uc3-application/build.gradle

-apply plugin: 'application'
-apply plugin: 'eclipse'
-
-buildscript {
-  repositories {
-    maven {
-      url "https://plugins.gradle.org/m2/"
-    }
-  }
-}
-
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
-
 allprojects {
 	repositories {
-	    jcenter()
-	    maven {
-	    	url "https://oss.sonatype.org/content/repositories/snapshots/"
-	    }
     	maven {
     		url 'https://packages.confluent.io/maven/'
     	}
@@ -25,20 +7,7 @@ allprojects {
 }
 
 dependencies {
-    compile project(':')
-
     compile('org.industrial-devops:titan-ccp-common-kafka:0.1.0-SNAPSHOT')
-    compile 'org.slf4j:slf4j-simple:1.6.1'
-
-    // Use JUnit test framework
-    testCompile 'junit:junit:4.12'
 }
 
 mainClassName = "spesb.uc3.application.HistoryService"
-
-eclipse {
-    classpath {
-       downloadSources=true
-       downloadJavadoc=true
-    }
-}

uc3-workload-generator/build.gradle

-apply plugin: 'application'
-apply plugin: 'eclipse'
-
-buildscript {
-  repositories {
-    maven {
-      url "https://plugins.gradle.org/m2/"
-    }
-  }
-}
-
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
-
-dependencies {
-    compile project(':')
-
-    compile 'org.slf4j:slf4j-simple:1.6.1'
-
-    // Use JUnit test framework
-    testCompile 'junit:junit:4.12'
-}
-
 mainClassName = "spesb.uc3.workloadgenerator.LoadGenerator"
-
-eclipse {
-    classpath {
-       downloadSources=true
-       downloadJavadoc=true
-    }
-}

uc4-application/build.gradle

-apply plugin: 'application'
-apply plugin: 'eclipse'
-
-buildscript {
-  repositories {
-    maven {
-      url "https://plugins.gradle.org/m2/"
-    }
-  }
-}
-
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
-
 allprojects {
 	repositories {
-	    jcenter()
-	    maven {
-	    	url "https://oss.sonatype.org/content/repositories/snapshots/"
-	    }
     	maven {
     		url 'https://packages.confluent.io/maven/'
     	}
@@ -25,20 +7,7 @@ allprojects {
 }
 
 dependencies {
-    compile project(':')
-
-    compile 'org.slf4j:slf4j-simple:1.6.1'
     compile('org.industrial-devops:titan-ccp-common-kafka:0.1.0-SNAPSHOT')
-
-    // Use JUnit test framework
-    testCompile 'junit:junit:4.12'
 }
 
 mainClassName = "spesb.uc4.application.HistoryService"
-
-eclipse {
-    classpath {
-       downloadSources=true
-       downloadJavadoc=true
-    }
-}

uc4-workload-generator/build.gradle

-apply plugin: 'application'
-apply plugin: 'eclipse'
-
-buildscript {
-  repositories {
-    maven {
-      url "https://plugins.gradle.org/m2/"
-    }
-  }
-}
-
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
-
-dependencies {
-    compile project(':')
-
-    compile 'org.slf4j:slf4j-simple:1.6.1'
-
-    // Use JUnit test framework
-    testCompile 'junit:junit:4.12'
-}
-
 mainClassName = "spesb.uc4.workloadgenerator.LoadGenerator"
-
-eclipse {
-    classpath {
-       downloadSources=true
-       downloadJavadoc=true
-    }
-}