From 9620a5a9ffa7e516053268e236c4982dac473410 Mon Sep 17 00:00:00 2001 From: qameta-ci Date: Tue, 9 Jul 2024 09:40:46 +0000 Subject: [PATCH 1/8] set next development version 2.29 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ff0fe585..1bdb57a6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=2.28.0 +version=2.29-SNAPSHOT org.gradle.daemon=true org.gradle.parallel=true From faa5d9b834fa7721c479f27bfed91b0e5a7e091d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 11:20:39 +0100 Subject: [PATCH 2/8] bump org.assertj:assertj-core from 3.26.0 to 3.26.3 (via #1097) --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index d4b5d1fd..72078aed 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -164,7 +164,7 @@ configure(libs) { dependency("org.apache.httpcomponents.client5:httpclient5:5.3.1") dependency("org.aspectj:aspectjrt:${assertJVersion}") dependency("org.aspectj:aspectjweaver:${assertJVersion}") - dependency("org.assertj:assertj-core:3.26.0") + dependency("org.assertj:assertj-core:3.26.3") dependency("org.freemarker:freemarker:2.3.33") dependency("org.grpcmock:grpcmock-junit5:0.8.0") dependency("org.hamcrest:hamcrest:2.2") From 8f8cde929b1d554be59029ef2b9a36cbb85eb590 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 17:00:07 +0100 Subject: [PATCH 3/8] bump org.apache.commons:commons-lang3 from 3.14.0 to 3.15.0 (via #1102) --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 72078aed..2fb93b6c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -159,7 +159,7 @@ configure(libs) { dependency("io.github.glytching:junit-extensions:2.6.0") dependency("javax.annotation:javax.annotation-api:1.3.2") dependency("net.sourceforge.pmd:pmd-java:7.3.0") - dependency("org.apache.commons:commons-lang3:3.14.0") + dependency("org.apache.commons:commons-lang3:3.15.0") dependency("org.apache.httpcomponents:httpclient:4.5.14") dependency("org.apache.httpcomponents.client5:httpclient5:5.3.1") dependency("org.aspectj:aspectjrt:${assertJVersion}") From 558373ccb8dc3209c2b7a23e5b00d260df4abcd3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 17:00:29 +0100 Subject: [PATCH 4/8] bump com.github.spotbugs from 6.0.18 to 6.0.19 (via #1099) --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 4bc95c3d..063c8ebc 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -57,7 +57,7 @@ pluginManagement { id("io.qameta.allure-report") version "2.11.2" id("io.spring.dependency-management") version "1.1.6" id("com.google.protobuf") version "0.9.4" - id("com.github.spotbugs") version "6.0.18" + id("com.github.spotbugs") version "6.0.19" kotlin("jvm") version "2.0.0" } } From 7948193cf7316a4b8a0884c6ee46fc55b3701f75 Mon Sep 17 00:00:00 2001 From: Dmitry Baev Date: Wed, 31 Jul 2024 13:00:18 +0100 Subject: [PATCH 5/8] fix(allure-scalatest): cross-build for scala 2.12 and 2.13 (via #1107) --- allure-scalatest/build.gradle.kts | 115 +++++++++----------- build.gradle.kts | 16 +-- gradle/quality-configs/spotbugs/exclude.xml | 3 + 3 files changed, 63 insertions(+), 71 deletions(-) diff --git a/allure-scalatest/build.gradle.kts b/allure-scalatest/build.gradle.kts index 2aa0f8d3..039f8bb3 100644 --- a/allure-scalatest/build.gradle.kts +++ b/allure-scalatest/build.gradle.kts @@ -2,84 +2,78 @@ import org.gradle.jvm.tasks.Jar description = "Allure ScalaTest Integration" -apply(plugin = "scala") +plugins { + scala + id("com.github.prokod.gradle-crossbuild") version "0.16.0" +} -val availableScalaVersions = listOf("2.12", "2.13") -val defaultScala212Version = "2.12.19" -val defaultScala213Version = "2.13.14" +val scala212 = "2.12" +val scala213 = "2.13" -var selectedScalaVersion = defaultScala213Version +project.base.archivesName.set("allure-scalatest") -if (hasProperty("scalaVersion")) { - val scalaVersion: String by project - selectedScalaVersion = when (scalaVersion) { - "2.12" -> defaultScala212Version - "2.13" -> defaultScala213Version - else -> scalaVersion +crossBuild { + scalaVersionsCatalog = mapOf( + scala212 to "2.12.19", + scala213 to "2.13.14" + ) + builds { + register("scala") { + scalaVersions = setOf(scala212, scala213) + } } } -val baseScalaVersion = selectedScalaVersion.substring(0, selectedScalaVersion.lastIndexOf(".")) -project.base.archivesName.set("allure-scalatest_$baseScalaVersion") - -for (sv in availableScalaVersions) { - val taskSuffix = sv.replace('.', '_') +val crossBuildScala_212Jar by tasks.getting +val crossBuildScala_213Jar by tasks.getting - tasks.create("jarScala_$taskSuffix", GradleBuild::class) { - startParameter = project.gradle.startParameter.newInstance() - startParameter.projectProperties["scalaVersion"] = sv - tasks = listOf("jar") - } +val scaladocJar by tasks.creating(Jar::class) { + from(tasks.getByName("scaladoc")) + archiveClassifier.set("scaladoc") +} - tasks.create("testScala_$taskSuffix", GradleBuild::class) { - startParameter = project.gradle.startParameter.newInstance() - startParameter.projectProperties["scalaVersion"] = sv - tasks = listOf("test") +tasks.withType().configureEach { + val predicate = provider { + publication != publishing.publications["maven"] } - - tasks.create("sourceJarScala_$taskSuffix", GradleBuild::class) { - startParameter = project.gradle.startParameter.newInstance() - startParameter.projectProperties["scalaVersion"] = sv - tasks = listOf("sourceJar") + onlyIf("disable default maven publication") { + predicate.get() } +} - tasks.create("scaladocJarScala_$taskSuffix", GradleBuild::class) { - startParameter = project.gradle.startParameter.newInstance() - startParameter.projectProperties["scalaVersion"] = sv - tasks = listOf("scaladocJar") +tasks.withType().configureEach { + val predicate = provider { + publication != publishing.publications["maven"] } - - tasks.create("installScala_$taskSuffix", GradleBuild::class) { - startParameter = project.gradle.startParameter.newInstance() - startParameter.projectProperties["scalaVersion"] = sv - tasks = listOf("install") + onlyIf("disable default maven publication") { + predicate.get() } } -val jarAll by tasks.creating { - dependsOn(availableScalaVersions.map { "jarScala_${it.replace('.', '_')}" }) -} - -val testAll by tasks.creating { - dependsOn(availableScalaVersions.map { "testScala_${it.replace('.', '_')}" }) -} - -val sourceJarAll by tasks.creating { - dependsOn(availableScalaVersions.map { "sourceJarScala_${it.replace('.', '_')}" }) -} - -val scaladocJarAll by tasks.creating { - dependsOn(availableScalaVersions.map { "scaladocJarScala_${it.replace('.', '_')}" }) +publishing { + publications { + create("crossBuildScala_212") { + from(components["crossBuildScala_212"]) + artifact(scaladocJar) + artifact(tasks.sourcesJar) + } + create("crossBuildScala_213") { + from(components["crossBuildScala_213"]) + artifact(scaladocJar) + artifact(tasks.sourcesJar) + } + } } -val installAll by tasks.creating { - dependsOn(availableScalaVersions.map { "installScala_${it.replace('.', '_')}" }) +signing { + sign(publishing.publications["crossBuildScala_212"]) + sign(publishing.publications["crossBuildScala_213"]) } dependencies { api(project(":allure-java-commons")) - implementation("org.scalatest:scalatest_$baseScalaVersion:3.2.19") - implementation("org.scala-lang.modules:scala-collection-compat_$baseScalaVersion:2.12.0") + implementation("org.scalatest:scalatest_$scala213:3.2.19") + implementation("org.scala-lang.modules:scala-collection-compat_$scala213:2.12.0") testAnnotationProcessor(project(":allure-descriptions-javadoc")) testImplementation("io.github.glytching:junit-extensions") testImplementation("org.assertj:assertj-core") @@ -92,13 +86,6 @@ dependencies { testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } -val scaladocJar by tasks.creating(Jar::class) { - from(tasks.getByName("scaladoc")) - archiveClassifier.set("scaladoc") -} - -artifacts.add("archives", scaladocJar) - tasks.jar { manifest { attributes(mapOf( diff --git a/build.gradle.kts b/build.gradle.kts index 2fb93b6c..ce3370c8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -56,13 +56,7 @@ configure(subprojects) { publishing { publications { - create("maven") { - suppressAllPomMetadataWarnings() - versionMapping { - allVariants { - fromResolutionResult() - } - } + withType().configureEach { pom { name.set(project.name) description.set("Module ${project.name} of Allure Framework.") @@ -106,6 +100,14 @@ configure(subprojects) { } } } + create("maven") { + suppressAllPomMetadataWarnings() + versionMapping { + allVariants { + fromResolutionResult() + } + } + } } } diff --git a/gradle/quality-configs/spotbugs/exclude.xml b/gradle/quality-configs/spotbugs/exclude.xml index 0b8a2de8..f942c310 100644 --- a/gradle/quality-configs/spotbugs/exclude.xml +++ b/gradle/quality-configs/spotbugs/exclude.xml @@ -6,6 +6,9 @@ + + + From 9de28ad45f774dffdf01ae50f1f4cd5ad64ebb6e Mon Sep 17 00:00:00 2001 From: Dmitry Baev Date: Wed, 31 Jul 2024 18:46:16 +0100 Subject: [PATCH 6/8] fix(scalatest): resolve issues with crossbuild signing (via #1111) --- allure-scalatest/build.gradle.kts | 77 ++++++++++++++++++------------- 1 file changed, 45 insertions(+), 32 deletions(-) diff --git a/allure-scalatest/build.gradle.kts b/allure-scalatest/build.gradle.kts index 039f8bb3..6de0e41c 100644 --- a/allure-scalatest/build.gradle.kts +++ b/allure-scalatest/build.gradle.kts @@ -1,5 +1,3 @@ -import org.gradle.jvm.tasks.Jar - description = "Allure ScalaTest Integration" plugins { @@ -24,50 +22,63 @@ crossBuild { } } -val crossBuildScala_212Jar by tasks.getting -val crossBuildScala_213Jar by tasks.getting - -val scaladocJar by tasks.creating(Jar::class) { - from(tasks.getByName("scaladoc")) - archiveClassifier.set("scaladoc") +tasks.publishMavenPublicationToMavenLocal { + enabled = false } - -tasks.withType().configureEach { - val predicate = provider { - publication != publishing.publications["maven"] - } - onlyIf("disable default maven publication") { - predicate.get() - } +tasks.publishMavenPublicationToSonatypeRepository { + enabled = false } - -tasks.withType().configureEach { - val predicate = provider { - publication != publishing.publications["maven"] - } - onlyIf("disable default maven publication") { - predicate.get() - } +tasks.signMavenPublication { + enabled = false +} +tasks.sourcesJar { + enabled = false } publishing { publications { create("crossBuildScala_212") { from(components["crossBuildScala_212"]) - artifact(scaladocJar) - artifact(tasks.sourcesJar) + + val crossBuildScala_212SourcesJar by tasks.creating(Jar::class) { + from(sourceSets["crossBuildScala_212"].allSource) + archiveBaseName.set("allure-scalatest_$scala212") + archiveClassifier.set("sources") + } + artifact(crossBuildScala_212SourcesJar) + + val crossBuildScala_212ScaladocJar by tasks.creating(Jar::class) { + from(tasks.scaladoc) + archiveBaseName.set("allure-scalatest_$scala212") + archiveClassifier.set("scaladoc") + } + artifact(crossBuildScala_212ScaladocJar) } create("crossBuildScala_213") { from(components["crossBuildScala_213"]) - artifact(scaladocJar) - artifact(tasks.sourcesJar) + + val crossBuildScala_213SourcesJar by tasks.creating(Jar::class) { + from(sourceSets["crossBuildScala_213"].allSource) + archiveBaseName.set("allure-scalatest_$scala213") + archiveClassifier.set("sources") + } + artifact(crossBuildScala_213SourcesJar) + + val crossBuildScala_213ScaladocJar by tasks.creating(Jar::class) { + from(tasks.scaladoc) + archiveBaseName.set("allure-scalatest_$scala213") + archiveClassifier.set("scaladoc") + } + artifact(crossBuildScala_213ScaladocJar) } } } signing { - sign(publishing.publications["crossBuildScala_212"]) - sign(publishing.publications["crossBuildScala_213"]) + sign( + publishing.publications["crossBuildScala_212"], + publishing.publications["crossBuildScala_213"] + ) } dependencies { @@ -88,9 +99,11 @@ dependencies { tasks.jar { manifest { - attributes(mapOf( + attributes( + mapOf( "Automatic-Module-Name" to "io.qameta.allure.scalatest" - )) + ) + ) } } From b40acffa5d4de4257f7420152b050b60c5e15828 Mon Sep 17 00:00:00 2001 From: Dmitry Baev Date: Wed, 31 Jul 2024 19:16:33 +0100 Subject: [PATCH 7/8] fix(allure-scalatest): rename scaladoc to javadoc --- allure-scalatest/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/allure-scalatest/build.gradle.kts b/allure-scalatest/build.gradle.kts index 6de0e41c..aae6abbc 100644 --- a/allure-scalatest/build.gradle.kts +++ b/allure-scalatest/build.gradle.kts @@ -50,7 +50,7 @@ publishing { val crossBuildScala_212ScaladocJar by tasks.creating(Jar::class) { from(tasks.scaladoc) archiveBaseName.set("allure-scalatest_$scala212") - archiveClassifier.set("scaladoc") + archiveClassifier.set("javadoc") } artifact(crossBuildScala_212ScaladocJar) } @@ -67,7 +67,7 @@ publishing { val crossBuildScala_213ScaladocJar by tasks.creating(Jar::class) { from(tasks.scaladoc) archiveBaseName.set("allure-scalatest_$scala213") - archiveClassifier.set("scaladoc") + archiveClassifier.set("javadoc") } artifact(crossBuildScala_213ScaladocJar) } From 8f7278f93da98e6e07527621e607f4bcd605fd02 Mon Sep 17 00:00:00 2001 From: qameta-ci Date: Wed, 31 Jul 2024 18:17:16 +0000 Subject: [PATCH 8/8] release 2.28.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1bdb57a6..23a27d98 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=2.29-SNAPSHOT +version=2.28.1 org.gradle.daemon=true org.gradle.parallel=true