Merge remote-tracking branch 'origin/master' into feat/release-to-github

molgenis · Dec 13, 2023 · 33c29b7 · 33c29b7
2 parents 75cc179 + 23afbc5
commit 33c29b7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/armadillo/build.gradle b/armadillo/build.gradle
@@ -70,7 +70,7 @@ dependencies {
 
 jacocoTestReport {
     reports {
-        xml.enabled true
+        xml.required
     }
     dependsOn test
 }

diff --git a/build.gradle b/build.gradle
@@ -90,7 +90,7 @@ springBoot {
     buildInfo()
 }
 bootJar {
-    mainClassName = mainClassName
+    mainClass = mainClassName
     manifest {
         attributes(
                 'Specification-Version': project.version.toString(),
@@ -105,7 +105,7 @@ bootJar {
 
 //define run
 application {
-    mainClass.set(mainClassName)
+    mainClass.set(rootProject.mainClassName)
 }
 
 //define release
@@ -123,8 +123,8 @@ docker {
     name imageName
     tags 'latest', tagName
     dockerfile file('Dockerfile')
-    files bootJar.archivePath
-    buildArgs(['JAR_FILE': "${bootJar.archiveName}"])
+    files bootJar.archiveFile
+    buildArgs(['JAR_FILE': "${bootJar.archiveFile.get().asFile.name}"])
 }
 dockerPrepare.dependsOn bootJar
 
@@ -141,9 +141,7 @@ task jacocoMergedReport(type: JacocoReport) {
     classDirectories.setFrom files(subprojects.sourceSets.main.output)
     executionData.setFrom project.fileTree(dir: '.', include: '**/build/jacoco/test.exec')
     reports {
-        xml.enabled true
-        csv.enabled false
-        html.enabled false
+        xml.required
     }
 }
 

diff --git a/r/build.gradle b/r/build.gradle
@@ -50,7 +50,7 @@ build.dependsOn spotlessApply
 
 jacocoTestReport {
     reports {
-        xml.enabled true
+        xml.required
     }
     dependsOn test
 }

diff --git a/scripts/requirements.txt b/scripts/requirements.txt
@@ -13,5 +13,5 @@ requests==2.31.0
 simple-term-menu==1.6.1
 six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 tzdata==2023.3; python_version >= '2'
-urllib3==2.0.4; python_version >= '3.7'
+urllib3==2.0.7; python_version >= '3.7'
 wrapt==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'