Skip to content

Commit 4e5d20d

Browse files
baevbaev
authored
update deps (via #231)
1 parent 65a81cf commit 4e5d20d

File tree

63 files changed

+721
-364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+721
-364
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
schema
33
build
44
/*/allure-results/
5+
out
56

67
#IDEA Files
78
.idea

‎allure-assertj/build.gradle‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,34 @@ description = 'Allure AssertJ'
33
apply from: "${gradleScriptDir}/maven-publish.gradle"
44
apply from: "${gradleScriptDir}/bintray.gradle"
55
apply plugin: 'maven'
6-
apply plugin: 'org.junit.platform.gradle.plugin'
76

87
configurations {
98
agent
109
}
1110

1211
dependencies {
13-
agent 'org.aspectj:aspectjweaver'
12+
agent('org.aspectj:aspectjweaver')
1413

1514
compile project(':allure-java-commons')
16-
compile 'org.assertj:assertj-core'
15+
compile('org.assertj:assertj-core')
1716

18-
testCompile 'org.slf4j:slf4j-simple'
17+
testCompile('org.slf4j:slf4j-simple')
1918
testCompile('org.junit.jupiter:junit-jupiter-api')
2019
testRuntime('org.junit.jupiter:junit-jupiter-engine')
2120
testCompile project(':allure-junit-platform')
2221
testCompile project(':allure-java-commons-test')
2322
}
2423

25-
junitPlatform {
26-
filters {
27-
engines {
28-
include 'junit-jupiter'
29-
}
30-
includeClassNamePattern '.*Test'
24+
test {
25+
systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', 'debug'
26+
systemProperty 'allure.model.indentOutput', true
27+
28+
useJUnitPlatform {
29+
includeEngines 'junit-jupiter'
3130
}
32-
enableStandardTestTask true
33-
}
3431

35-
tasks.withType(JavaExec) {
36-
if (it.name == 'junitPlatformTest') {
37-
systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', 'debug'
38-
systemProperty 'allure.model.indentOutput', true
39-
systemProperty 'allure.results.directory', 'build/allure-results'
40-
doFirst {
41-
jvmArgs "-javaagent:${configurations.agent.singleFile}"
42-
}
32+
doFirst {
33+
jvmArgs "-javaagent:${configurations.agent.singleFile}"
4334
}
4435
}
4536

‎allure-assertj/src/test/resources/allure.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
allure.results.directory=build/allure-results

‎allure-attachments/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ apply plugin: 'maven'
77
dependencies {
88
compile project(':allure-java-commons')
99

10-
compile 'org.freemarker:freemarker'
10+
compile('org.freemarker:freemarker')
1111

12-
testCompile 'junit:junit'
13-
testCompile 'org.slf4j:slf4j-simple'
14-
testCompile 'org.assertj:assertj-core'
15-
testCompile 'org.mockito:mockito-core'
16-
testCompile 'org.apache.commons:commons-lang3'
12+
testCompile('junit:junit')
13+
testCompile('org.slf4j:slf4j-simple')
14+
testCompile('org.assertj:assertj-core')
15+
testCompile('org.mockito:mockito-core')
16+
testCompile('org.apache.commons:commons-lang3')
1717
}

allure-attachments/src/main/java/io.qameta.allure.attachment/AttachmentContent.java renamed to allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentContent.java

File renamed without changes.

allure-attachments/src/main/java/io.qameta.allure.attachment/AttachmentData.java renamed to allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentData.java

File renamed without changes.

allure-attachments/src/main/java/io.qameta.allure.attachment/AttachmentProcessor.java renamed to allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentProcessor.java

File renamed without changes.

allure-attachments/src/main/java/io.qameta.allure.attachment/AttachmentRenderException.java renamed to allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderException.java

File renamed without changes.

allure-attachments/src/main/java/io.qameta.allure.attachment/AttachmentRenderer.java renamed to allure-attachments/src/main/java/io/qameta/allure/attachment/AttachmentRenderer.java

File renamed without changes.

allure-attachments/src/main/java/io.qameta.allure.attachment/DefaultAttachmentContent.java renamed to allure-attachments/src/main/java/io/qameta/allure/attachment/DefaultAttachmentContent.java

File renamed without changes.

0 commit comments

Comments
 (0)