Skip to content

Commit 76a6717

Browse files
baevbaev
authored
bump build deps (via allure-framework#837)
1 parent ada0b68 commit 76a6717

14 files changed

Lines changed: 93 additions & 67 deletions

File tree

‎allure-awaitility/src/main/java/io/qameta/allure/awaitility/AllureAwaitilityListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
* <code>
4646
* Awaitility.await()
4747
* .conditionEvaluationListener(new AllureAwaitilityListener())
48-
* .until(() -> somethingHappen());
48+
* .until(() -&gt; somethingHappen());
4949
* </code>
5050
* </pre>
5151
* </p>

‎allure-java-commons/src/main/java/io/qameta/allure/Allure.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ public interface StepContext {
562562
* @param <T> the type of value.
563563
* @return the value.
564564
*/
565-
default <T> T parameter(String name, T value, Boolean excluded) {
565+
default <T> T parameter(final String name, final T value, final Boolean excluded) {
566566
throw new UnsupportedOperationException("method is not implemented");
567567
}
568568

@@ -575,7 +575,7 @@ default <T> T parameter(String name, T value, Boolean excluded) {
575575
* @param <T> the type of value.
576576
* @return the value.
577577
*/
578-
default <T> T parameter(String name, T value, Parameter.Mode mode) {
578+
default <T> T parameter(final String name, final T value, final Parameter.Mode mode) {
579579
throw new UnsupportedOperationException("method is not implemented");
580580
}
581581

@@ -589,7 +589,8 @@ default <T> T parameter(String name, T value, Parameter.Mode mode) {
589589
* @param <T> the type of value.
590590
* @return the value.
591591
*/
592-
default <T> T parameter(String name, T value, Boolean excluded, Parameter.Mode mode) {
592+
default <T> T parameter(final String name, final T value,
593+
final Boolean excluded, final Parameter.Mode mode) {
593594
throw new UnsupportedOperationException("method is not implemented");
594595
}
595596

‎allure-java-commons/src/main/java/io/qameta/allure/listener/ContainerLifecycleListener.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,35 +24,35 @@
2424
*/
2525
public interface ContainerLifecycleListener extends LifecycleListener {
2626

27-
default void beforeContainerStart(TestResultContainer container) {
27+
default void beforeContainerStart(final TestResultContainer container) {
2828
//do nothing
2929
}
3030

31-
default void afterContainerStart(TestResultContainer container) {
31+
default void afterContainerStart(final TestResultContainer container) {
3232
//do nothing
3333
}
3434

35-
default void beforeContainerUpdate(TestResultContainer container) {
35+
default void beforeContainerUpdate(final TestResultContainer container) {
3636
//do nothing
3737
}
3838

39-
default void afterContainerUpdate(TestResultContainer container) {
39+
default void afterContainerUpdate(final TestResultContainer container) {
4040
//do nothing
4141
}
4242

43-
default void beforeContainerStop(TestResultContainer container) {
43+
default void beforeContainerStop(final TestResultContainer container) {
4444
//do nothing
4545
}
4646

47-
default void afterContainerStop(TestResultContainer container) {
47+
default void afterContainerStop(final TestResultContainer container) {
4848
//do nothing
4949
}
5050

51-
default void beforeContainerWrite(TestResultContainer container) {
51+
default void beforeContainerWrite(final TestResultContainer container) {
5252
//do nothing
5353
}
5454

55-
default void afterContainerWrite(TestResultContainer container) {
55+
default void afterContainerWrite(final TestResultContainer container) {
5656
//do nothing
5757
}
5858

‎allure-java-commons/src/main/java/io/qameta/allure/listener/FixtureLifecycleListener.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,27 @@
2424
*/
2525
public interface FixtureLifecycleListener extends LifecycleListener {
2626

27-
default void beforeFixtureStart(FixtureResult result) {
27+
default void beforeFixtureStart(final FixtureResult result) {
2828
//do nothing
2929
}
3030

31-
default void afterFixtureStart(FixtureResult result) {
31+
default void afterFixtureStart(final FixtureResult result) {
3232
//do nothing
3333
}
3434

35-
default void beforeFixtureUpdate(FixtureResult result) {
35+
default void beforeFixtureUpdate(final FixtureResult result) {
3636
//do nothing
3737
}
3838

39-
default void afterFixtureUpdate(FixtureResult result) {
39+
default void afterFixtureUpdate(final FixtureResult result) {
4040
//do nothing
4141
}
4242

43-
default void beforeFixtureStop(FixtureResult result) {
43+
default void beforeFixtureStop(final FixtureResult result) {
4444
//do nothing
4545
}
4646

47-
default void afterFixtureStop(FixtureResult result) {
47+
default void afterFixtureStop(final FixtureResult result) {
4848
//do nothing
4949
}
5050

‎allure-java-commons/src/main/java/io/qameta/allure/listener/StepLifecycleListener.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,27 @@
2424
*/
2525
public interface StepLifecycleListener extends LifecycleListener {
2626

27-
default void beforeStepStart(StepResult result) {
27+
default void beforeStepStart(final StepResult result) {
2828
//do nothing
2929
}
3030

31-
default void afterStepStart(StepResult result) {
31+
default void afterStepStart(final StepResult result) {
3232
//do nothing
3333
}
3434

35-
default void beforeStepUpdate(StepResult result) {
35+
default void beforeStepUpdate(final StepResult result) {
3636
//do nothing
3737
}
3838

39-
default void afterStepUpdate(StepResult result) {
39+
default void afterStepUpdate(final StepResult result) {
4040
//do nothing
4141
}
4242

43-
default void beforeStepStop(StepResult result) {
43+
default void beforeStepStop(final StepResult result) {
4444
//do nothing
4545
}
4646

47-
default void afterStepStop(StepResult result) {
47+
default void afterStepStop(final StepResult result) {
4848
//do nothing
4949
}
5050

‎allure-java-commons/src/main/java/io/qameta/allure/listener/TestLifecycleListener.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,43 +24,43 @@
2424
*/
2525
public interface TestLifecycleListener extends LifecycleListener {
2626

27-
default void beforeTestSchedule(TestResult result) {
27+
default void beforeTestSchedule(final TestResult result) {
2828
//do nothing
2929
}
3030

31-
default void afterTestSchedule(TestResult result) {
31+
default void afterTestSchedule(final TestResult result) {
3232
//do nothing
3333
}
3434

35-
default void beforeTestUpdate(TestResult result) {
35+
default void beforeTestUpdate(final TestResult result) {
3636
//do nothing
3737
}
3838

39-
default void afterTestUpdate(TestResult result) {
39+
default void afterTestUpdate(final TestResult result) {
4040
//do nothing
4141
}
4242

43-
default void beforeTestStart(TestResult result) {
43+
default void beforeTestStart(final TestResult result) {
4444
//do nothing
4545
}
4646

47-
default void afterTestStart(TestResult result) {
47+
default void afterTestStart(final TestResult result) {
4848
//do nothing
4949
}
5050

51-
default void beforeTestStop(TestResult result) {
51+
default void beforeTestStop(final TestResult result) {
5252
//do nothing
5353
}
5454

55-
default void afterTestStop(TestResult result) {
55+
default void afterTestStop(final TestResult result) {
5656
//do nothing
5757
}
5858

59-
default void beforeTestWrite(TestResult result) {
59+
default void beforeTestWrite(final TestResult result) {
6060
//do nothing
6161
}
6262

63-
default void afterTestWrite(TestResult result) {
63+
default void afterTestWrite(final TestResult result) {
6464
//do nothing
6565
}
6666

‎allure-java-migration/src/main/java/io/qameta/allure/aspects/Allure1Annotations.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void updateTitle(final TestResult result) {
6565
if (type.isAnnotationPresent(Title.class)) {
6666
final Title title = type.getAnnotation(Title.class);
6767
final List<Label> labels = result.getLabels().stream()
68-
.filter(label -> !label.getName().equals(SUITE_LABEL))
68+
.filter(label -> !SUITE_LABEL.equals(label.getName()))
6969
.collect(Collectors.toList());
7070
labels.add(new Label().setName(SUITE_LABEL).setValue(title.value()));
7171
result.setLabels(labels);

‎allure-spock/build.gradle.kts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ description = "Allure Spock Framework Integration"
33
apply(plugin = "groovy")
44

55
val spockFrameworkVersion = "1.3-groovy-2.5"
6+
val groovyVersion = "2.5.19"
67

78
dependencies {
89
api(project(":allure-java-commons"))
910
implementation("org.spockframework:spock-core:$spockFrameworkVersion")
1011
testImplementation("org.assertj:assertj-core")
11-
testImplementation("org.codehaus.groovy:groovy-all")
12+
testImplementation("org.codehaus.groovy:groovy-all:${groovyVersion}")
1213
testImplementation("org.junit.jupiter:junit-jupiter-api")
1314
testImplementation("org.mockito:mockito-core")
1415
testImplementation("org.slf4j:slf4j-simple")

‎build.gradle.kts‎

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ val spotlessDtr by extra("$qualityConfigsDir/spotless")
1111
val libs = subprojects.filterNot { it.name in "allure-bom" }
1212

1313
tasks.withType(Wrapper::class) {
14-
gradleVersion = "7.1.1"
14+
gradleVersion = "7.5.1"
1515
}
1616

1717
plugins {
@@ -128,37 +128,40 @@ configure(libs) {
128128
apply(plugin = "java-library")
129129
apply(plugin = "ru.vyarus.quality")
130130

131+
val orgSlf4jVersion = "1.7.36"
132+
val assertJVersion = "1.9.9.1"
133+
131134
dependencyManagement {
132135
imports {
133136
mavenBom("com.fasterxml.jackson:jackson-bom:2.13.3")
134137
mavenBom("org.junit:junit-bom:5.8.2")
135138
}
136139
dependencies {
140+
dependency("com.github.spotbugs:spotbugs:4.7.3")
137141
dependency("com.github.tomakehurst:wiremock:2.27.2")
138142
dependency("com.google.inject:guice:5.1.0")
139143
dependency("com.google.testing.compile:compile-testing:0.19")
144+
dependency("com.puppycrawl.tools:checkstyle:9.3")
140145
dependency("com.squareup.retrofit2:retrofit:2.9.0")
141146
dependency("commons-io:commons-io:2.11.0")
142147
dependency("io.github.benas:random-beans:3.9.0")
143148
dependency("io.github.glytching:junit-extensions:2.5.0")
144-
dependency("org.hamcrest:hamcrest:2.2")
149+
dependency("javax.annotation:javax.annotation-api:1.3.2")
150+
dependency("net.sourceforge.pmd:pmd-java:6.46.0")
145151
dependency("org.apache.commons:commons-lang3:3.12.0")
146152
dependency("org.apache.httpcomponents:httpclient:4.5.13")
147-
dependency("org.aspectj:aspectjrt:1.9.9.1")
148-
dependency("org.aspectj:aspectjweaver:1.9.9.1")
153+
dependency("org.aspectj:aspectjrt:${assertJVersion}")
154+
dependency("org.aspectj:aspectjweaver:${assertJVersion}")
149155
dependency("org.assertj:assertj-core:3.22.0")
150-
dependency("org.codehaus.groovy:groovy-all:2.5.13")
151-
dependency("org.grpcmock:grpcmock-junit5:0.8.0")
152156
dependency("org.freemarker:freemarker:2.3.31")
157+
dependency("org.grpcmock:grpcmock-junit5:0.8.0")
158+
dependency("org.hamcrest:hamcrest:2.2")
153159
dependency("org.jboss.resteasy:resteasy-client:6.1.0.Final")
154160
dependency("org.mock-server:mockserver-netty:5.13.2")
155161
dependency("org.mockito:mockito-core:4.6.1")
156-
dependency("javax.annotation:javax.annotation-api:1.3.2")
157-
dependencySet("org.slf4j:1.7.30") {
158-
entry("slf4j-api")
159-
entry("slf4j-nop")
160-
entry("slf4j-simple")
161-
}
162+
dependency("org.slf4j:slf4j-api:${orgSlf4jVersion}")
163+
dependency("org.slf4j:slf4j-nop:${orgSlf4jVersion}")
164+
dependency("org.slf4j:slf4j-simple:${orgSlf4jVersion}")
162165
}
163166
generatedPomCustomization {
164167
enabled(false)
@@ -221,26 +224,33 @@ configure(libs) {
221224
adapter {
222225
autoconfigure.set(false)
223226
aspectjWeaver.set(true)
224-
aspectjVersion.set("1.9.7")
227+
aspectjVersion.set(dependencyManagement.managedVersions["org.aspectj:aspectjweaver"])
225228

226229
// in order to disable dependencySubstitution (spi-off classifier)
227230
autoconfigureListeners.set(true)
231+
232+
afterEvaluate {
233+
frameworks.forEach { adapter -> adapter.enabled.set(false) }
234+
}
228235
}
229236
}
230237

231238
quality {
232239
configDir = qualityConfigsDir
233-
checkstyleVersion = "8.36.1"
234-
pmdVersion = "6.27.0"
235-
spotbugsVersion = "4.1.2"
236-
codenarcVersion = "1.6"
240+
checkstyleVersion = dependencyManagement.managedVersions["com.puppycrawl.tools:checkstyle"]
241+
pmdVersion = dependencyManagement.managedVersions["net.sourceforge.pmd:pmd-java"]
242+
spotbugsVersion = dependencyManagement.managedVersions["com.github.spotbugs:spotbugs"]
243+
spotbugs = true
244+
pmd = true
245+
checkstyle = true
246+
htmlReports = false
237247
enabled = !project.hasProperty("disableQuality")
238248
afterEvaluate {
239249
val spotbugs = configurations.findByName("spotbugs")
240250
if (spotbugs != null) {
241251
dependencies {
242252
spotbugs("org.slf4j:slf4j-simple")
243-
spotbugs("com.github.spotbugs:spotbugs:4.2.3")
253+
spotbugs("com.github.spotbugs:spotbugs")
244254
}
245255
}
246256
}
@@ -304,7 +314,7 @@ configure(libs) {
304314
}
305315

306316
allure {
307-
version.set("2.16.0")
317+
version.set("2.19.0")
308318
}
309319

310320
repositories {

‎gradle/quality-configs/checkstyle/checkstyle.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<module name="EmptyBlock"/>
4545
<module name="EmptyCatchBlock"/>
4646
<module name="LeftCurly"/>
47-
<module name="NeedBraces"/>
47+
<!-- <module name="NeedBraces"/>-->
4848
<module name="RightCurly"/>
4949

5050

@@ -152,10 +152,10 @@
152152

153153
<!-- Metrics (http://checkstyle.sourceforge.net/config_metrics.html) -->
154154
<module name="BooleanExpressionComplexity"/>
155-
<module name="ClassDataAbstractionCoupling"/>
156-
<module name="ClassFanOutComplexity"/>
155+
<!-- <module name="ClassDataAbstractionCoupling"/>-->
156+
<!-- <module name="ClassFanOutComplexity"/>-->
157157
<module name="CyclomaticComplexity"/>
158-
<module name="JavaNCSS"/>
158+
<!-- <module name="JavaNCSS"/>-->
159159
<module name="NPathComplexity"/>
160160

161161

@@ -211,7 +211,7 @@
211211

212212
<!-- Size Violations (http://checkstyle.sourceforge.net/config_sizes.html) -->
213213
<module name="AnonInnerLength"/>
214-
<module name="ExecutableStatementCount"/>
214+
<!-- <module name="ExecutableStatementCount"/>-->
215215
<module name="MethodCount"/>
216216
<module name="MethodLength"/>
217217
<module name="OuterTypeNumber"/>

0 commit comments

Comments
 (0)