Skip to content

Commit

Permalink
Merge #489 from remote-tracking branch 'origin/5.6.0-rc1'
Browse files Browse the repository at this point in the history
  • Loading branch information
dr0i committed Jun 6, 2023
2 parents 1860026 + fd66002 commit 2cec789
Show file tree
Hide file tree
Showing 26 changed files with 89 additions and 75 deletions.
14 changes: 14 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,20 @@ plugins {
id 'io.codearte.nexus-staging' version '0.11.0'
}

subprojects {
ext {
versions = [
'assertj_core': '3.11.1',
'commons_compress': '1.21',
'jackson_databind': '2.15.1',
'junit': '4.12',
'mockito': '2.5.7',
'slf4j': '1.7.36',
'wiremock_jre': '2.35.0'
]
}
}

ext.scmInfo = getScmInfo()

allprojects {
Expand Down
4 changes: 2 additions & 2 deletions metafacture-biblio/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ dependencies {
exclude group: 'xercesImpl', module: 'xercesImpl'
exclude group: 'xml-apis', module: 'xml-apis'
}
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
}
2 changes: 1 addition & 1 deletion metafacture-commons/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ ext.mavenName = 'Metafacture Commons'
description = 'Basic types, algorithms and utilities for Metafacture'

dependencies {
testImplementation 'junit:junit:4.12'
testImplementation "junit:junit:${versions.junit}"
}
6 changes: 3 additions & 3 deletions metafacture-csv/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ description = 'Modules for processing comma-separated values'

dependencies {
api project(':metafacture-framework')
implementation 'com.opencsv:opencsv:3.8'
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
implementation 'com.opencsv:opencsv:3.9'
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
}
6 changes: 3 additions & 3 deletions metafacture-elasticsearch/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ description = 'Modules for sending data to an Elasticsearch instance'

dependencies {
api project(':metafacture-framework')
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
implementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
}
10 changes: 5 additions & 5 deletions metafacture-flowcontrol/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ description = 'Modules for controlling the data flow in a Metafacture pipeline'

dependencies {
api project(':metafacture-framework')
implementation 'org.slf4j:slf4j-api:1.7.21'
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
testImplementation 'org.assertj:assertj-core:3.11.1'
testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.21'
implementation "org.slf4j:slf4j-api:${versions.slf4j}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation "org.assertj:assertj-core:${versions.assertj_core}"
testRuntimeOnly "org.slf4j:slf4j-simple:${versions.slf4j}"
}
2 changes: 1 addition & 1 deletion metafacture-flux/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ dependencies {
implementation project(':metafacture-io')
testRuntime project(':metafacture-plumbing')
antlr 'org.antlr:antlr:3.5.2'
testImplementation 'junit:junit:4.12'
testImplementation "junit:junit:${versions.junit}"
}
4 changes: 2 additions & 2 deletions metafacture-formeta/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ description = 'Modules for reading and writing data in Formeta format'
dependencies {
api project(':metafacture-framework')
implementation project(':metafacture-commons')
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
}
4 changes: 2 additions & 2 deletions metafacture-framework/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ ext.mavenName = 'Metafacture Framework'
description = 'The interfaces implemented by Metafacture modules'

dependencies {
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
}
14 changes: 7 additions & 7 deletions metafacture-html/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ description = 'Modules for processing HTML documents'
dependencies {
api project(':metafacture-framework')
implementation project(':metafacture-commons')
implementation 'org.slf4j:slf4j-api:1.7.21'
implementation 'org.apache.commons:commons-compress:1.21'
implementation 'commons-io:commons-io:2.6'
implementation 'org.jsoup:jsoup:1.12.1'
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.21'
implementation "org.slf4j:slf4j-api:${versions.slf4j}"
implementation "org.apache.commons:commons-compress:${versions.commons_compress}"
implementation 'commons-io:commons-io:2.7'
implementation 'org.jsoup:jsoup:1.15.4'
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testRuntimeOnly "org.slf4j:slf4j-simple:${versions.slf4j}"
}
10 changes: 5 additions & 5 deletions metafacture-io/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ dependencies {
api project(':metafacture-framework')
implementation project(':metafacture-commons')
implementation 'commons-io:commons-io:2.5'
implementation 'org.apache.commons:commons-compress:1.21'
implementation "org.apache.commons:commons-compress:${versions.commons_compress}"
runtimeOnly 'org.tukaani:xz:1.6'
testImplementation 'com.github.tomakehurst:wiremock-jre8:2.33.2'
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
testImplementation 'org.assertj:assertj-core:3.11.1'
testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.21'
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation "org.assertj:assertj-core:${versions.assertj_core}"
testRuntimeOnly "org.slf4j:slf4j-simple:${versions.slf4j}"
}
4 changes: 2 additions & 2 deletions metafacture-javaintegration/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ description = 'Modules for making results of Metafacture pipelines available in
dependencies {
api project(':metafacture-framework')
implementation project(':metafacture-commons')
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
}
2 changes: 1 addition & 1 deletion metafacture-jdom/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ description = 'Modules for converting JDOM documents to Metafacture streams and

dependencies {
api project(':metafacture-framework')
api 'org.jdom:jdom2:2.0.6'
api 'org.jdom:jdom2:2.0.6.1'
implementation project(':metafacture-commons')
}
16 changes: 8 additions & 8 deletions metafacture-json/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ description = 'Modules for processing JSON data in Metafacture'

dependencies {
api project(':metafacture-framework')
implementation 'com.fasterxml.jackson.core:jackson-core:2.13.0'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
implementation 'com.jayway.jsonpath:json-path:2.6.0'
implementation 'com.github.erosb:everit-json-schema:1.14.1'
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
testImplementation 'com.github.tomakehurst:wiremock-jre8:2.33.2'
testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.21'
implementation 'com.fasterxml.jackson.core:jackson-core:2.14.2'
implementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
implementation 'com.jayway.jsonpath:json-path:2.7.0'
implementation 'com.github.erosb:everit-json-schema:1.14.2'
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation "com.github.tomakehurst:wiremock-jre8:${versions.wiremock_jre}"
testRuntimeOnly "org.slf4j:slf4j-simple:${versions.slf4j}"
}
4 changes: 2 additions & 2 deletions metafacture-linkeddata/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ description = 'Modules for working with linked data formats'
dependencies {
api project(':metafacture-framework')
implementation project(':metafacture-commons')
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
}
4 changes: 2 additions & 2 deletions metafacture-mangling/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ description = 'Modules for manipulating the sequence of events in a Metafacture
dependencies {
api project(':metafacture-framework')
implementation project(':metafacture-flowcontrol')
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
}
8 changes: 4 additions & 4 deletions metafacture-monitoring/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ description = 'Modules for monitoring Metafacure streams'
dependencies {
api project(':metafacture-framework')
implementation project(':metafacture-commons')
implementation 'org.slf4j:slf4j-api:1.7.21'
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.21'
implementation "org.slf4j:slf4j-api:${versions.slf4j}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testRuntimeOnly "org.slf4j:slf4j-simple:${versions.slf4j}"
}
4 changes: 2 additions & 2 deletions metafacture-plumbing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ description = 'Modules for splitting and merging Metafacture pipelines'

dependencies {
api project(':metafacture-framework')
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
}
2 changes: 1 addition & 1 deletion metafacture-runner/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ dependencies {
// class loader which was used to load the classes of the slf4j-api. Until
// a solution is found for this problem, the binding need to be placed on the
// class path:
runtimeOnly 'org.slf4j:slf4j-log4j12:1.7.21'
runtimeOnly "org.slf4j:slf4j-log4j12:${versions.slf4j}"

// The following dependencies are placed in the "provided" scope to prevent
// them from being included in the class path but still have them available
Expand Down
4 changes: 2 additions & 2 deletions metafacture-statistics/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ description = 'Modules for computing statistics'

dependencies {
api project(':metafacture-framework')
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
}
4 changes: 2 additions & 2 deletions metafacture-strings/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ description = 'Modules for performing string operations on a Metafacture stream'

dependencies {
api project(':metafacture-framework')
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
}
4 changes: 2 additions & 2 deletions metafacture-triples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ dependencies {
api project(':metafacture-framework')
implementation project(':metafacture-commons')
implementation project(':metafacture-formeta')
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
}
10 changes: 5 additions & 5 deletions metafacture-xml/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ description = 'Modules for generic operations on XML documents'
dependencies {
api project(':metafacture-framework')
implementation project(':metafacture-commons')
implementation 'org.slf4j:slf4j-api:1.7.21'
implementation 'org.apache.commons:commons-compress:1.21'
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.21'
implementation "org.slf4j:slf4j-api:${versions.slf4j}"
implementation "org.apache.commons:commons-compress:${versions.commons_compress}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testRuntimeOnly "org.slf4j:slf4j-simple:${versions.slf4j}"
}
6 changes: 3 additions & 3 deletions metafacture-yaml/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ description = 'Modules for processing YAML data in Metafacture'

dependencies {
api project(':metafacture-framework')
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.0'
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.1'
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
}
8 changes: 4 additions & 4 deletions metamorph-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ext.mavenName = 'Metamorph Test'
description = 'A framework writing tests for Metamorph scripts in XML'

dependencies {
api 'junit:junit:4.12'
api "junit:junit:${versions.junit}"
implementation project(':metafacture-framework')
implementation project(':metafacture-commons')
implementation project(':metamorph')
Expand All @@ -28,8 +28,8 @@ dependencies {
implementation project(':metafacture-formeta')
implementation project(':metafacture-xml')
implementation project(':metafacture-javaintegration')
implementation 'org.slf4j:slf4j-api:1.7.21'
testImplementation 'org.mockito:mockito-core:2.5.5'
implementation "org.slf4j:slf4j-api:${versions.slf4j}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation project(':metafacture-formeta')
testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.21'
testRuntimeOnly "org.slf4j:slf4j-simple:${versions.slf4j}"
}
8 changes: 4 additions & 4 deletions metamorph/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ dependencies {
implementation project(':metafacture-io')
implementation project(':metafacture-mangling')
implementation project(':metafacture-javaintegration')
implementation 'org.slf4j:slf4j-api:1.7.21'
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.5.5'
testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.21'
implementation "org.slf4j:slf4j-api:${versions.slf4j}"
testRuntimeOnly "org.slf4j:slf4j-simple:${versions.slf4j}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
}

sourceSets {
Expand Down

0 comments on commit 2cec789

Please sign in to comment.