Merge #489 from remote-tracking branch 'origin/5.6.0-rc1'

dr0i · dr0i · commit 2cec78959d2c · 2023-06-06T13:42:39.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -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 {
diff --git a/metafacture-biblio/build.gradle b/metafacture-biblio/build.gradle
@@ -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}"
 }
diff --git a/metafacture-commons/build.gradle b/metafacture-commons/build.gradle
@@ -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}"
 }
diff --git a/metafacture-csv/build.gradle b/metafacture-csv/build.gradle
@@ -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}"
 }
diff --git a/metafacture-elasticsearch/build.gradle b/metafacture-elasticsearch/build.gradle
@@ -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}"
 }
diff --git a/metafacture-flowcontrol/build.gradle b/metafacture-flowcontrol/build.gradle
@@ -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}"
 }
diff --git a/metafacture-flux/build.gradle b/metafacture-flux/build.gradle
@@ -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}"
 }
diff --git a/metafacture-formeta/build.gradle b/metafacture-formeta/build.gradle
@@ -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}"
 }
diff --git a/metafacture-framework/build.gradle b/metafacture-framework/build.gradle
@@ -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}"
 }
diff --git a/metafacture-html/build.gradle b/metafacture-html/build.gradle
@@ -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}"
 }
diff --git a/metafacture-io/build.gradle b/metafacture-io/build.gradle
@@ -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}"
 }
diff --git a/metafacture-javaintegration/build.gradle b/metafacture-javaintegration/build.gradle
@@ -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}"
 }
diff --git a/metafacture-jdom/build.gradle b/metafacture-jdom/build.gradle
@@ -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')
 }
diff --git a/metafacture-json/build.gradle b/metafacture-json/build.gradle
@@ -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}"
 }
diff --git a/metafacture-linkeddata/build.gradle b/metafacture-linkeddata/build.gradle
@@ -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}"
 }
diff --git a/metafacture-mangling/build.gradle b/metafacture-mangling/build.gradle
@@ -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}"
 }
diff --git a/metafacture-monitoring/build.gradle b/metafacture-monitoring/build.gradle
@@ -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}"
 }
diff --git a/metafacture-plumbing/build.gradle b/metafacture-plumbing/build.gradle
@@ -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}"
 }
diff --git a/metafacture-runner/build.gradle b/metafacture-runner/build.gradle
@@ -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
diff --git a/metafacture-statistics/build.gradle b/metafacture-statistics/build.gradle
@@ -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}"
 }
diff --git a/metafacture-strings/build.gradle b/metafacture-strings/build.gradle
@@ -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}"
 }
diff --git a/metafacture-triples/build.gradle b/metafacture-triples/build.gradle
@@ -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}"
 }
diff --git a/metafacture-xml/build.gradle b/metafacture-xml/build.gradle
@@ -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}"
 }
diff --git a/metafacture-yaml/build.gradle b/metafacture-yaml/build.gradle
@@ -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}"
 }
diff --git a/metamorph-test/build.gradle b/metamorph-test/build.gradle
@@ -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')
@@ -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}"
 }
diff --git a/metamorph/build.gradle b/metamorph/build.gradle
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ dependencies {`
`27`	`27`	`exclude group: 'xercesImpl', module: 'xercesImpl'`
`28`	`28`	`exclude group: 'xml-apis', module: 'xml-apis'`
`29`	`29`	`}`
`30`		`- testImplementation 'junit:junit:4.12'`
`31`		`- testImplementation 'org.mockito:mockito-core:2.5.5'`
	`30`	`+ testImplementation "junit:junit:${versions.junit}"`
	`31`	`+ testImplementation "org.mockito:mockito-core:${versions.mockito}"`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@ ext.mavenName = 'Metafacture Commons'`
`18`	`18`	`description = 'Basic types, algorithms and utilities for Metafacture'`
`19`	`19`
`20`	`20`	`dependencies {`
`21`		`- testImplementation 'junit:junit:4.12'`
	`21`	`+ testImplementation "junit:junit:${versions.junit}"`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,5 @@ dependencies {`
`25`	`25`	`implementation project(':metafacture-io')`
`26`	`26`	`testRuntime project(':metafacture-plumbing')`
`27`	`27`	`antlr 'org.antlr:antlr:3.5.2'`
`28`		`- testImplementation 'junit:junit:4.12'`
	`28`	`+ testImplementation "junit:junit:${versions.junit}"`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ description = 'Modules for reading and writing data in Formeta format'`
`20`	`20`	`dependencies {`
`21`	`21`	`api project(':metafacture-framework')`
`22`	`22`	`implementation project(':metafacture-commons')`
`23`		`- testImplementation 'junit:junit:4.12'`
`24`		`- testImplementation 'org.mockito:mockito-core:2.5.5'`
	`23`	`+ testImplementation "junit:junit:${versions.junit}"`
	`24`	`+ testImplementation "org.mockito:mockito-core:${versions.mockito}"`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ ext.mavenName = 'Metafacture Framework'`
`18`	`18`	`description = 'The interfaces implemented by Metafacture modules'`
`19`	`19`
`20`	`20`	`dependencies {`
`21`		`- testImplementation 'junit:junit:4.12'`
`22`		`- testImplementation 'org.mockito:mockito-core:2.5.5'`
	`21`	`+ testImplementation "junit:junit:${versions.junit}"`
	`22`	`+ testImplementation "org.mockito:mockito-core:${versions.mockito}"`
`23`	`23`	`}`