diff --git a/build.gradle b/build.gradle index d773362..675e785 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,6 @@ +import com.github.jengelman.gradle.plugins.shadow.transformers.AppendingTransformer +import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer + plugins { id "com.jfrog.artifactory" version "4.28.3" //artifactory support id 'groovy' // groovy support @@ -11,6 +14,7 @@ plugins { id 'com.github.onslip.gradle-one-jar' version '1.0.6' // pack a self contained jar id 'jacoco' // java code coverage plugin id "org.sonarqube" version "3.3" // sonarqube + id "com.github.johnrengelman.shadow" version "7.1.2" // fat jar } ext { @@ -31,13 +35,11 @@ defaultTasks 'build' sourceCompatibility = javaVersion targetCompatibility = javaVersion - apply from: scriptsLocation + 'pmd.gradle' apply from: scriptsLocation + 'spotbugs.gradle' apply from: scriptsLocation + 'spotless.gradle' apply from: scriptsLocation + 'modernizer.gradle' apply from: scriptsLocation + 'checkJavaVersion.gradle' -apply from: scriptsLocation + 'fatJar.gradle' apply from: scriptsLocation + 'tests.gradle' apply from: scriptsLocation + 'jacoco.gradle' // jacoco java code coverage apply from: scriptsLocation + 'sonarqube.gradle' // sonarqube config @@ -125,7 +127,7 @@ publishing { from components.java artifact sourcesJar artifact javadocJar - artifact fatJar + artifact shadowJar versionMapping { usage('java-api') { fromResolutionOf('runtimeClasspath') @@ -151,7 +153,7 @@ tasks.withType(JavaCompile) { } application { - mainClassName = mainClass + mainClassName = "edu.ie3.tools.Main" } jar { @@ -166,3 +168,11 @@ run { // Gradle uses an empty Input as default, leading to a non-blocking behaviour and thus an immediate shutdown standardInput = System.in } + +shadowJar { + transform(AppendingTransformer) { + resource = 'reference.conf' + } + transform(Log4j2PluginsCacheFileTransformer) + zip64 = true +} diff --git a/gradle/scripts/fatJar.gradle b/gradle/scripts/fatJar.gradle deleted file mode 100644 index 5f3823d..0000000 --- a/gradle/scripts/fatJar.gradle +++ /dev/null @@ -1,13 +0,0 @@ -tasks.register('fatJar', Jar){ - getArchiveClassifier().set('fat') - manifest { - attributes( - 'Main-Class': mainClass - ) - } - //baseName = project.archivesBaseName + '-fat' - from { - configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } - } - with jar -} diff --git a/src/main/java/edu/ie3/tools/Converter.java b/src/main/java/edu/ie3/tools/Converter.java index 9317209..b85ca1a 100644 --- a/src/main/java/edu/ie3/tools/Converter.java +++ b/src/main/java/edu/ie3/tools/Converter.java @@ -83,7 +83,9 @@ public void run() { printInit(); validateConnectionProperties(); convert(); - } else logger.info("Converter is already running."); + } else + logger.info( + "Converter is already running or you can't acquire a lock (in which case you might try sudo)."); } /** Validates Connection Properties from user input */