Skip to content

Commit 7f94705

Browse files
baevbaev
committed
fix build
1 parent 1f4566d commit 7f94705

5 files changed

Lines changed: 31 additions & 30 deletions

File tree

‎allure-junit-platform/build.gradle.kts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,15 @@ tasks.test {
4040
}
4141
}
4242

43-
val spiOffJar by tasks.creating(Jar::class) {
43+
val spiOffJar: Jar by tasks.creating(Jar::class) {
4444
from(sourceSets.getByName("main").output)
45-
classifier = "spi-off"
45+
archiveClassifier.set("spi-off")
4646
}
4747

48-
val spiOff by configurations.creating {
49-
extendsFrom(configurations.getByName("compile"))
48+
publishing {
49+
publications {
50+
named<MavenPublication>("maven") {
51+
artifact(spiOffJar)
52+
}
53+
}
5054
}
51-
52-
artifacts.add("archives", spiOffJar)
53-
artifacts.add("spiOff", spiOffJar)

‎allure-junit5/build.gradle.kts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,16 @@ tasks.test {
3838
}
3939
}
4040

41-
val spiOffJar by tasks.creating(Jar::class) {
41+
val spiOffJar: Jar by tasks.creating(Jar::class) {
4242
from(sourceSets.getByName("main").output)
4343
archiveClassifier.set("spi-off")
4444
}
4545

46-
val spiOff by configurations.creating {
47-
extendsFrom(configurations.getByName("compile"))
46+
publishing {
47+
publications {
48+
named<MavenPublication>("maven") {
49+
artifact(spiOffJar)
50+
}
51+
}
4852
}
4953

50-
artifacts.add("archives", spiOffJar)
51-
artifacts.add("spiOff", spiOffJar)
52-

‎allure-model/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ val agent: Configuration by configurations.creating
44

55
dependencies {
66
agent("org.aspectj:aspectjweaver")
7-
implementation("com.fasterxml.jackson.core:jackson-databind")
7+
implementation("com.fasterxml.jackson.core:jackson-databind:2.12.2")
88
testImplementation("io.github.benas:random-beans")
99
testImplementation("org.assertj:assertj-core")
1010
testImplementation("org.junit.jupiter:junit-jupiter-api")

‎allure-testng/build.gradle.kts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,15 @@ tasks.test {
3939
}
4040
}
4141

42-
val spiOffJar by tasks.creating(Jar::class) {
42+
val spiOffJar: Jar by tasks.creating(Jar::class) {
4343
from(sourceSets.getByName("main").output)
44-
classifier = "spi-off"
44+
archiveClassifier.set("spi-off")
4545
}
4646

47-
val spiOff by configurations.creating {
48-
extendsFrom(configurations.getByName("compile"))
47+
publishing {
48+
publications {
49+
named<MavenPublication>("maven") {
50+
artifact(spiOffJar)
51+
}
52+
}
4953
}
50-
51-
artifacts.add("archives", spiOffJar)
52-
artifacts.add("spiOff", spiOffJar)

‎build.gradle.kts‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import com.diffplug.gradle.spotless.SpotlessExtension
22
import io.qameta.allure.gradle.task.AllureReport
3-
import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension
43
import ru.vyarus.gradle.plugin.quality.QualityExtension
54

65
buildscript {
@@ -12,8 +11,6 @@ buildscript {
1211

1312
dependencies {
1413
classpath("com.diffplug.spotless:spotless-plugin-gradle:5.11.1")
15-
classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5")
16-
classpath("io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE")
1714
classpath("ru.vyarus:gradle-quality-plugin:4.5.0")
1815
}
1916
}
@@ -36,6 +33,7 @@ plugins {
3633
java
3734
`java-library`
3835
`maven-publish`
36+
id("io.spring.dependency-management") version "1.0.11.RELEASE"
3937
id("io.qameta.allure") version "2.8.1"
4038
}
4139

@@ -66,12 +64,12 @@ configure(subprojects) {
6664
apply(plugin = "com.diffplug.spotless")
6765
apply(plugin = "io.qameta.allure")
6866

69-
configure<DependencyManagementExtension> {
67+
dependencyManagement {
7068
imports {
71-
mavenBom("com.fasterxml.jackson:jackson-bom:2.12.2")
7269
mavenBom("org.junit:junit-bom:5.7.1")
7370
}
7471
dependencies {
72+
dependency("com.fasterxml.jackson.core:jackson-databind:2.12.2")
7573
dependency("com.github.tomakehurst:wiremock:2.27.2")
7674
dependency("com.google.inject:guice:5.0.1")
7775
dependency("com.google.testing.compile:compile-testing:0.19")
@@ -209,12 +207,12 @@ configure(subprojects) {
209207
tasks.withType(Javadoc::class) {
210208
(options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet")
211209
}
212-
210+
213211
publishing {
214212
publications {
215213
create<MavenPublication>("maven") {
216214
from(components["java"])
217-
215+
suppressAllPomMetadataWarnings()
218216
pom {
219217
name.set(project.description)
220218
description.set(project.description)
@@ -229,12 +227,12 @@ configure(subprojects) {
229227
developer {
230228
id.set("baev")
231229
name.set("Dmitry Baev")
232-
email.set("baev@qameta.io")
230+
email.set("dmitry.baev@qameta.io")
233231
}
234232
developer {
235233
id.set("eroshenkoam")
236234
name.set("Artem Eroshenko")
237-
email.set("artem@qameta.io")
235+
email.set("artem.eroshenko@qameta.io")
238236
}
239237
}
240238
scm {

0 commit comments

Comments
 (0)