Merge pull request #991 from TNG/fix/release-issues

Fix/release issues
TNG · Oct 11, 2022 · 99500d3 · 99500d3
2 parents 892f083 + 5528c07
commit 99500d3
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 4 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,3 @@
 # Declare files that will always have LF line endings on checkout.
 *.sh text eol=lf
+gradlew text eol=lf
diff --git a/jgiven-junit/build.gradle b/jgiven-junit/build.gradle
@@ -42,5 +42,6 @@ files { file("../jgiven-core/src/main/translations").listFiles() }.collect {
         expand(props)
         filteringCharset = 'UTF-8'
     }
+    sourcesJar.dependsOn += taskName
     compileJava.dependsOn += taskName
 }
diff --git a/jgiven-junit/src/test/java/com/tngtech/jgiven/junit/concurrency/Stages.java b/jgiven-junit/src/test/java/com/tngtech/jgiven/junit/concurrency/Stages.java
@@ -48,7 +48,7 @@ ParallelThenStage the_value_on_this_thread_is(String expectation) {
     }
 
     private static void logState(Stage<?> stage, ThreadLocal<?> stageState) {
-        LoggerFactory.getLogger(stage.getClass()).info("Object {} on thread {} with state {} and thread local value {}",
+        LoggerFactory.getLogger(stage.getClass()).trace("Object {} on thread {} with state {} and thread local value {}",
             stage, Thread.currentThread().getId(), stageState, stageState.get());
     }
 

diff --git a/jgiven-junit5/build.gradle b/jgiven-junit5/build.gradle
@@ -51,5 +51,6 @@ files { file("../jgiven-core/src/main/translations").listFiles() }.collect {
         expand(props)
         filteringCharset = 'UTF-8'
     }
+    sourcesJar.dependsOn += taskName
     compileJava.dependsOn += taskName
 }
diff --git a/jgiven-junit5/src/test/java/com/tngtech/jgiven/junit5/test/concurrency/Stages.java b/jgiven-junit5/src/test/java/com/tngtech/jgiven/junit5/test/concurrency/Stages.java
@@ -47,7 +47,7 @@ ParallelThenStage the_value_on_this_thread_is(String expectation) {
     }
 
     private static void logState(Stage<?> stage, ThreadLocal<?> stageState) {
-        LoggerFactory.getLogger(stage.getClass()).info("Object {} on thread {} with state {} and thread local value {}",
+        LoggerFactory.getLogger(stage.getClass()).trace("Object {} on thread {} with state {} and thread local value {}",
             stage, Thread.currentThread().getId(), stageState, stageState.get());
     }
 

diff --git a/jgiven-maven-plugin/build.gradle b/jgiven-maven-plugin/build.gradle
@@ -21,18 +21,28 @@ task generatePom(type: Copy, dependsOn: copyClasses) {
     }
 }
 
-task generateMavenPlugin(type: CrossPlatformExec, dependsOn: generatePom) {
+task generateMavenPlugin(type: CrossPlatformExec, dependsOn: generatePom){
     // currenlty it seems to be the more or less only clean solution
     // to generate a plugin.xml file to use maven directly
     // if anyone has a better solution please let us know!
     buildCommand 'mvn', '-nsu', '-U', '-f', 'build/maven/pom.xml', 'plugin:descriptor'
 }
 
+Set<Task> findPublishTask(String projectName){
+    rootProject.findProject(projectName).getTasks().findAll {it instanceof PublishToMavenLocal}
+}
+
 generateMavenPlugin.onlyIf {
    // as the generateMavenPlugin task requires mvn, it is only executed
    // when actually uploading the archives
    // that way the standard build stays maven-free
-   gradle.taskGraph.getAllTasks().any{it instanceof AbstractPublishToMaven}
+    boolean shallGeneratePlugin = gradle.taskGraph.getAllTasks().any{it instanceof AbstractPublishToMaven}
+    if(shallGeneratePlugin){
+       generateMavenPlugin.dependsOn += findPublishTask("jgiven-core")
+       generateMavenPlugin.dependsOn += findPublishTask("jgiven-html5-report")
+    }
+    return shallGeneratePlugin
+
 }
 
 task copyMavenPlugin(type: Copy, dependsOn: generateMavenPlugin) {