Skip to content
Snippets Groups Projects
Commit 6e14aaf1 authored by René Schöne's avatar René Schöne
Browse files

Upgrade Gradle to 6.7.1 and use conventions plugin mechanism.

parent 6c394865
Branches
No related tags found
1 merge request!19dev to master
Pipeline #8280 passed
Showing
with 150 additions and 278 deletions
apply plugin: 'application' plugins {
id 'eraser.java-application-conventions'
}
dependencies { dependencies {
compile project(':eraser-base') implementation project(':eraser-base')
compile project(':feedbackloop.learner_backup') implementation project(':feedbackloop.learner_backup')
compile project(':datasets')
implementation group: 'com.opencsv', name: 'opencsv', version: '4.1' implementation group: 'com.opencsv', name: 'opencsv', version: '4.1'
compile group: 'org.apache.httpcomponents', name: 'httpclient', version: "${apache_httpcomponents_version}" implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: "${apache_httpcomponents_version}"
compile group: 'org.apache.httpcomponents', name: 'fluent-hc', version: "${apache_httpcomponents_version}" implementation group: 'org.apache.httpcomponents', name: 'fluent-hc', version: "${apache_httpcomponents_version}"
testCompile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.11.2' testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.11.2'
}
run {
mainClassName = 'de.tudresden.inf.st.eraser.benchmark.Main'
standardInput = System.in
if (project.hasProperty("appArgs")) {
args Eval.me(appArgs)
}
} }
sourceSets { application.mainClass = 'de.tudresden.inf.st.eraser.benchmark.Main'
main {
java {
srcDir 'src/main/java'
}
}
}
plugins {
id "com.github.ben-manes.versions" version "0.20.0"
}
allprojects {
group = 'de.tudresden.inf.st'
version = '0.1'
}
subprojects {
apply plugin: 'java'
sourceCompatibility = 1.8
targetCompatibility = 1.8
task packageSources(type: Jar) {
classifier = 'sources'
from sourceSets.main.allSource
}
artifacts.archives packageSources
configurations {
testArtifacts.extendsFrom testRuntime
}
task testJar(type: Jar) {
classifier "test"
from sourceSets.test.output
}
artifacts {
testArtifacts testJar
}
repositories {
mavenCentral()
}
dependencies {
compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.2'
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.2'
testCompile group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'org.hamcrest', name: 'hamcrest-junit', version: '2.0.0.0'
}
}
plugins {
id 'groovy-gradle-plugin'
}
repositories {
gradlePluginPortal()
}
dependencies {
implementation 'com.github.ben-manes:gradle-versions-plugin:0.36.0'
}
plugins {
id 'eraser.java-common-conventions'
id 'application'
}
plugins {
id 'java'
id 'idea'
id 'com.github.ben-manes.versions'
}
repositories {
mavenCentral()
}
dependencies {
implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.2'
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.2'
testImplementation group: 'junit', name: 'junit', version: '4.12'
testImplementation group: 'org.hamcrest', name: 'hamcrest-junit', version: '2.0.0.0'
// testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.2'
// testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
}
// tasks.named('test') {
// useJUnitPlatform()
// }
plugins {
id 'java'
id 'jastadd'
}
repositories {
mavenCentral()
}
dependencies {
implementation group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.2'
}
dependencies { plugins {
compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1' id 'eraser.java-application-conventions'
id 'java-library'
} }
sourceSets { dependencies {
main { api group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
java {
srcDir 'src/main/java'
}
}
} }
apply plugin: 'jastadd'
apply plugin: 'application'
apply plugin: 'jacoco'
apply plugin: 'idea'
apply plugin: 'distribution'
dependencies {
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}"
compile group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
compile group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15'
compile group: 'org.influxdb', name: 'influxdb-java', version: '2.15'
testCompile group: 'org.testcontainers', name: 'testcontainers', version: '1.11.2'
testCompile group: 'org.testcontainers', name: 'influxdb', version: '1.11.2'
testCompile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.11.2'
}
buildscript { buildscript {
repositories.mavenLocal() repositories.mavenLocal()
repositories.mavenCentral() repositories.mavenCentral()
...@@ -22,14 +6,28 @@ buildscript { ...@@ -22,14 +6,28 @@ buildscript {
} }
} }
run { plugins {
mainClassName = 'de.tudresden.inf.st.eraser.Main' id 'eraser.java-application-conventions'
standardInput = System.in id 'java-library'
if (project.hasProperty("appArgs")) { id 'com.github.ben-manes.versions'
args Eval.me(appArgs) id 'jacoco'
id 'distribution'
} }
apply plugin: 'jastadd'
dependencies {
api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}"
api group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
api group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15'
implementation group: 'org.influxdb', name: 'influxdb-java', version: '2.15'
testImplementation group: 'org.testcontainers', name: 'testcontainers', version: '1.11.2'
testImplementation group: 'org.testcontainers', name: 'influxdb', version: '1.11.2'
testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.11.2'
} }
application.mainClass = 'de.tudresden.inf.st.eraser.Main'
test { test {
testLogging { testLogging {
events "passed", "skipped", "failed" events "passed", "skipped", "failed"
...@@ -97,7 +95,7 @@ String[] arguments = ["libs/rd-builder.jar", "-d", "doc/"] ...@@ -97,7 +95,7 @@ String[] arguments = ["libs/rd-builder.jar", "-d", "doc/"]
def allSrcFiles = sourceSets.main.allSource.findAll { it.name.endsWith('java') }.toArray() def allSrcFiles = sourceSets.main.allSource.findAll { it.name.endsWith('java') }.toArray()
def ragdocViewSrcData = '../ragdoc-view/src/data/' def ragdocViewSrcData = '../ragdoc-view/src/data/'
task ragdoc(type: JavaExec, dependsOn: assemble, overwrite: true) { task ragdocFixed(type: JavaExec, dependsOn: assemble) {
group = 'documentation' group = 'documentation'
description = 'Create ragdoc json documentation files' description = 'Create ragdoc json documentation files'
main = "-jar" main = "-jar"
......
plugins { plugins {
id 'application' id 'eraser.java-application-conventions'
id 'io.franzbecker.gradle-lombok' version '3.0.0' id 'io.franzbecker.gradle-lombok' version '3.0.0'
} }
dependencies { dependencies {
compile project(':eraser-base') implementation project(':eraser-base')
compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.11.2' implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.11.2'
compile group: 'com.sparkjava', name: 'spark-core', version: '2.9.0' implementation group: 'com.sparkjava', name: 'spark-core', version: '2.9.0'
} }
run { application.mainClass = 'de.tudresden.inf.st.eraser.spark.Application'
mainClassName = 'de.tudresden.inf.st.eraser.spark.Application'
standardInput = System.in
}
sourceSets {
main {
java {
srcDir 'src/main/java'
}
}
}
plugins { plugins {
id 'java' id 'eraser.java-application-conventions'
id 'application'
id 'distribution' id 'distribution'
id 'io.github.http-builder-ng.http-plugin' version '0.1.1' id 'io.github.http-builder-ng.http-plugin' version '0.1.1'
} }
repositories {
mavenCentral()
}
sourceCompatibility = 1.8
dependencies { dependencies {
compile project(':eraser-base') implementation project(':eraser-base')
compile project(':eraser.spark') implementation project(':eraser.spark')
compile project(':feedbackloop.api') implementation project(':feedbackloop.api')
compile project(':feedbackloop.analyze') implementation project(':feedbackloop.analyze')
compile project(':feedbackloop.plan') implementation project(':feedbackloop.plan')
compile project(':feedbackloop.execute') implementation project(':feedbackloop.execute')
compile project(':feedbackloop.learner_backup') implementation project(':feedbackloop.learner_backup')
compile project(':datasets') implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: "${jackson_version}"
compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: "${jackson_version}" implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}"
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}" implementation group: 'net.sourceforge.argparse4j', name: 'argparse4j', version: '0.8.1'
compile group: 'net.sourceforge.argparse4j', name: 'argparse4j', version: '0.8.1' // implementation project(':feedbackloop.learner')
// compile project(':feedbackloop.learner')
} }
run { application.mainClass = 'de.tudresden.inf.st.eraser.starter.EraserStarter'
mainClassName = 'de.tudresden.inf.st.eraser.starter.EraserStarter'
standardInput = System.in
}
import io.github.httpbuilderng.http.HttpTask import io.github.httpbuilderng.http.HttpTask
...@@ -46,23 +35,6 @@ task shutdown (type: HttpTask) { ...@@ -46,23 +35,6 @@ task shutdown (type: HttpTask) {
} }
} }
sourceSets {
main {
java {
srcDir 'src/main/java'
}
}
}
//distributions {
// main {
// contents {
// from {
// 'src/main/resources/starter.eraser'
// }
// }
// }
//}
applicationDistribution.from("src/main/resources") { applicationDistribution.from("src/main/resources") {
include "starter.eraser" include "starter.eraser"
} }
......
dependencies { plugins {
compile project(':eraser-base') id 'eraser.java-common-conventions'
compile project(':feedbackloop.api')
} }
sourceSets { dependencies {
main { implementation project(':eraser-base')
java { implementation project(':feedbackloop.api')
srcDir 'src/main/java'
}
}
} }
plugins { plugins {
id 'eraser.java-common-conventions'
id 'io.franzbecker.gradle-lombok' version '3.0.0' id 'io.franzbecker.gradle-lombok' version '3.0.0'
} }
dependencies { dependencies {
compile project(':eraser-base') implementation project(':eraser-base')
compile project(':commons.color') compile project(':commons.color')
compile group: 'org.encog', name: 'encog-core', version: '3.4' compile group: 'org.encog', name: 'encog-core', version: '3.4'
} }
sourceSets {
main {
java {
srcDir 'src/main/java'
}
}
}
dependencies { plugins {
compile project(':eraser-base') id 'eraser.java-common-conventions'
compile project(':feedbackloop.api')
} }
sourceSets { dependencies {
main { implementation project(':eraser-base')
java { implementation project(':feedbackloop.api')
srcDir 'src/main/java'
}
}
} }
apply plugin: 'application' plugins {
id 'eraser.java-application-conventions'
dependencies {
compile project(':eraser-base')
compile project(':feedbackloop.api')
compile group: 'org.encog', name: 'encog-core', version: '3.4'
} }
run { dependencies {
mainClassName = 'de.tudresden.inf.st.eraser.feedbackloop.learner.Main' implementation project(':eraser-base')
standardInput = System.in implementation project(':feedbackloop.api')
if (project.hasProperty("appArgs")) { implementation group: 'org.encog', name: 'encog-core', version: '3.4'
args Eval.me(appArgs)
}
} }
sourceSets { application.mainClass = 'de.tudresden.inf.st.eraser.feedbackloop.learner.Main'
main {
java {
srcDir 'src/main/java'
}
}
}
plugins { plugins {
id 'application' id 'eraser.java-application-conventions'
id 'io.franzbecker.gradle-lombok' version '3.0.0' id 'io.franzbecker.gradle-lombok' version '3.0.0'
} }
dependencies { dependencies {
compile project(':eraser-base') implementation project(':eraser-base')
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}" implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}"
compile group: 'org.encog', name: 'encog-core', version: '3.4' implementation group: 'org.encog', name: 'encog-core', version: '3.4'
implementation group: 'com.opencsv', name: 'opencsv', version: '4.1' implementation group: 'com.opencsv', name: 'opencsv', version: '4.1'
implementation group: 'commons-io', name: 'commons-io', version: '2.5' implementation group: 'commons-io', name: 'commons-io', version: '2.5'
implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: "${apache_httpcomponents_version}" implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: "${apache_httpcomponents_version}"
...@@ -16,16 +16,4 @@ dependencies { ...@@ -16,16 +16,4 @@ dependencies {
// compile group: 'com.sparkjava', name: 'spark-core', version: '2.9.0' // compile group: 'com.sparkjava', name: 'spark-core', version: '2.9.0'
} }
run { application.mainClass = 'de.tudresden.inf.st.eraser.feedbackloop.learner_backup.Main'
mainClassName = 'de.tudresden.inf.st.eraser.feedbackloop.learner_backup.Main'
standardInput = System.in
if (project.hasProperty("appArgs")) {
args Eval.me(appArgs)
}
}
sourceSets.main {
java {
srcDir 'src/main/java'
}
}
apply plugin: 'application' plugins {
id 'eraser.java-application-conventions'
dependencies {
compile project(':eraser-base')
compile project(':feedbackloop.api')
compile project(':feedbackloop.monitor')
compile project(':feedbackloop.analyze')
compile project(':feedbackloop.plan')
compile project(':feedbackloop.execute')
} }
run { dependencies {
mainClassName = 'de.tudresden.inf.st.eraser.feedbackloop.main.Main' implementation project(':eraser-base')
standardInput = System.in implementation project(':feedbackloop.api')
if (project.hasProperty("appArgs")) { implementation project(':feedbackloop.monitor')
args Eval.me(appArgs) implementation project(':feedbackloop.analyze')
} implementation project(':feedbackloop.plan')
implementation project(':feedbackloop.execute')
} }
sourceSets { application.mainClass = 'de.tudresden.inf.st.eraser.feedbackloop.main.Main'
main {
java {
srcDir 'src/main/java'
}
}
}
apply plugin: 'application' plugins {
id 'eraser.java-application-conventions'
dependencies {
compile project(':eraser-base')
compile project(':feedbackloop.api')
} }
run { dependencies {
mainClassName = 'de.tudresden.inf.st.eraser.feedbackloop.monitor.Main' implementation project(':eraser-base')
standardInput = System.in implementation project(':feedbackloop.api')
if (project.hasProperty("appArgs")) {
args Eval.me(appArgs)
}
} }
sourceSets { application.mainClass = 'de.tudresden.inf.st.eraser.feedbackloop.monitor.Main'
main {
java {
srcDir 'src/main/java'
}
}
}
apply plugin: 'application' plugins {
id 'eraser.java-application-conventions'
}
dependencies { dependencies {
compile project(':eraser-base') implementation project(':eraser-base')
compile project(':feedbackloop.api') compile project(':feedbackloop.api')
} }
run { application.mainClass = 'de.tudresden.inf.st.eraser.feedbackloop.plan.Main'
mainClassName = 'de.tudresden.inf.st.eraser.feedbackloop.plan.Main'
standardInput = System.in
if (project.hasProperty("appArgs")) {
args Eval.me(appArgs)
}
}
sourceSets {
main {
java {
srcDir 'src/main/java'
}
}
}
No preview for this file type
#Tue May 07 14:40:56 CEST 2019
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment