diff --git a/extensions/database/pom.xml b/extensions/database/pom.xml index 653c22559..fe1ca7919 100644 --- a/extensions/database/pom.xml +++ b/extensions/database/pom.xml @@ -24,72 +24,23 @@ tests/src module/MOD-INF/classes - - org.codehaus.mojo - build-helper-maven-plugin - 3.2.0 - - - generate-sources - - add-source - - - - src - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - ${java.minversion} - ${java.minversion} - UTF-8 - false - - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - UTF-8 - - org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + ${surefire.version} tests/conf/tests.xml - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - - module/MOD-INF/lib - - - - org.apache.maven.plugins maven-dependency-plugin - 3.2.0 + ${maven-dependency-plugin.version} compile @@ -116,8 +67,8 @@ javax.servlet - servlet-api - 2.5 + javax.servlet-api + ${servlet-api.version} provided @@ -128,7 +79,7 @@ org.apache.httpcomponents httpclient - 4.5.13 + ${httpclient.version} com.google.http-client @@ -143,7 +94,7 @@ org.jasypt jasypt - 1.9.3 + ${jasypt.version} org.mariadb.jdbc @@ -169,27 +120,26 @@ org.apache.commons commons-lang3 - 3.12.0 + ${commons-lang3.version} - - org.owasp.encoder - encoder - 1.2.3 - - + org.owasp.encoder + encoder + ${owasp-encoder.version} + + org.testng testng - 7.4.0 + ${testng.version} test org.mockito mockito-core - 4.1.0 + ${mockito.version} test diff --git a/extensions/gdata/pom.xml b/extensions/gdata/pom.xml index 61fc95614..d457b6a23 100644 --- a/extensions/gdata/pom.xml +++ b/extensions/gdata/pom.xml @@ -24,43 +24,6 @@ tests/src module/MOD-INF/classes - - org.codehaus.mojo - build-helper-maven-plugin - 3.2.0 - - - generate-sources - - add-source - - - - src - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - ${java.minversion} - ${java.minversion} - UTF-8 - false - - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - UTF-8 - - org.apache.maven.plugins maven-surefire-plugin @@ -71,25 +34,13 @@ - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - - module/MOD-INF/lib - - - - org.apache.maven.plugins maven-dependency-plugin - 3.2.0 + ${maven-dependency-plugin.version} compile @@ -117,14 +68,14 @@ javax.servlet - servlet-api - 2.5 + javax.servlet-api + ${servlet-api.version} provided org.apache.httpcomponents httpclient - 4.5.13 + ${httpclient.version} com.google.apis @@ -142,16 +93,19 @@ ${jackson.version} provided + + + org.testng testng - 7.4.0 + ${testng.version} test org.mockito mockito-core - 4.1.0 + ${mockito.version} test diff --git a/extensions/jython/pom.xml b/extensions/jython/pom.xml index b1e8e3f06..39726bf39 100644 --- a/extensions/jython/pom.xml +++ b/extensions/jython/pom.xml @@ -26,43 +26,6 @@ tests/src module/MOD-INF/classes - - org.codehaus.mojo - build-helper-maven-plugin - 3.2.0 - - - generate-sources - - add-source - - - - src - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - ${java.minversion} - ${java.minversion} - UTF-8 - false - - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - UTF-8 - - org.apache.maven.plugins maven-surefire-plugin @@ -76,7 +39,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.2.0 + ${maven-dependency-plugin.version} compile @@ -90,18 +53,6 @@ - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - - module/MOD-INF/lib - - - - @@ -114,8 +65,8 @@ javax.servlet - servlet-api - 2.5 + javax.servlet-api + ${servlet-api.version} provided @@ -124,10 +75,12 @@ 2.7.2 + + org.testng testng - 7.4.0 + ${testng.version} test diff --git a/extensions/pc-axis/pom.xml b/extensions/pc-axis/pom.xml index 47545ff0d..e4dedfb2f 100644 --- a/extensions/pc-axis/pom.xml +++ b/extensions/pc-axis/pom.xml @@ -24,43 +24,6 @@ tests/src module/MOD-INF/classes - - org.codehaus.mojo - build-helper-maven-plugin - 3.2.0 - - - generate-sources - - add-source - - - - src - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - ${java.minversion} - ${java.minversion} - UTF-8 - false - - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - UTF-8 - - org.apache.maven.plugins maven-surefire-plugin @@ -72,7 +35,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.2.0 + ${maven-dependency-plugin.version} compile @@ -86,18 +49,6 @@ - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - - module/MOD-INF/lib - - - - @@ -110,15 +61,15 @@ javax.servlet - servlet-api - 2.5 + javax.servlet-api + ${servlet-api.version} provided org.testng testng - 7.4.0 + ${testng.version} test diff --git a/extensions/phonetic/pom.xml b/extensions/phonetic/pom.xml index b7adeca3b..bcfdcfa52 100644 --- a/extensions/phonetic/pom.xml +++ b/extensions/phonetic/pom.xml @@ -26,43 +26,6 @@ tests/src module/MOD-INF/classes - - org.codehaus.mojo - build-helper-maven-plugin - 3.2.0 - - - generate-sources - - add-source - - - - src - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - ${java.minversion} - ${java.minversion} - UTF-8 - false - - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - UTF-8 - - org.apache.maven.plugins maven-surefire-plugin @@ -76,7 +39,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.2.0 + ${maven-dependency-plugin.version} compile @@ -90,18 +53,6 @@ - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - - module/MOD-INF/lib - - - - @@ -114,8 +65,8 @@ javax.servlet - servlet-api - 2.5 + javax.servlet-api + ${servlet-api.version} provided @@ -124,7 +75,7 @@ org.testng testng - 7.4.0 + ${testng.version} test diff --git a/extensions/pom.xml b/extensions/pom.xml index aa0f43dc8..6afdd2f3e 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -29,6 +29,24 @@ + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper-maven-plugin.version} + + + generate-sources + + add-source + + + + src + + + + + org.jacoco jacoco-maven-plugin @@ -57,6 +75,18 @@ + + org.apache.maven.plugins + maven-clean-plugin + ${maven-clean-plugin.version} + + + + module/MOD-INF/lib + + + + diff --git a/extensions/sample/pom.xml b/extensions/sample/pom.xml index 8e497de95..78b26cfa7 100644 --- a/extensions/sample/pom.xml +++ b/extensions/sample/pom.xml @@ -13,7 +13,7 @@ org.openrefine extensions - 3.0-SNAPSHOT + 3.6-SNAPSHOT @@ -25,47 +25,10 @@ module/MOD-INF/classes - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - generate-sources - - add-source - - - - src - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - ${java.minversion} - ${java.minversion} - UTF-8 - false - - - - org.apache.maven.plugins - maven-resources-plugin - 2.6 - - UTF-8 - - org.apache.maven.plugins maven-dependency-plugin - 3.1.1 + ${maven-dependency-plugin.version} compile @@ -79,18 +42,6 @@ - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - - module/MOD-INF/lib - - - - @@ -103,8 +54,8 @@ javax.servlet - servlet-api - 2.5 + javax.servlet-api + ${servlet-api.version} provided @@ -113,7 +64,7 @@ org.testng testng - 6.9.10 + ${testng.version} test diff --git a/extensions/wikidata/pom.xml b/extensions/wikidata/pom.xml index 93ca92521..df6875ed1 100644 --- a/extensions/wikidata/pom.xml +++ b/extensions/wikidata/pom.xml @@ -34,43 +34,6 @@ module/MOD-INF/classes - - org.codehaus.mojo - build-helper-maven-plugin - 3.2.0 - - - generate-sources - - add-source - - - - src - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - ${java.minversion} - ${java.minversion} - UTF-8 - false - - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - UTF-8 - - org.apache.maven.plugins maven-surefire-plugin @@ -84,7 +47,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.2.0 + ${maven-dependency-plugin.version} compile @@ -98,18 +61,6 @@ - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - - module/MOD-INF/lib - - - - @@ -122,8 +73,8 @@ javax.servlet - servlet-api - 2.5 + javax.servlet-api + ${servlet-api.version} provided @@ -149,7 +100,7 @@ org.slf4j slf4j-api - 1.7.32 + ${slf4j.version} provided @@ -166,7 +117,7 @@ org.testng testng - 7.4.0 + ${testng.version} test diff --git a/main/pom.xml b/main/pom.xml index 67f86f299..82397c79a 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -18,9 +18,6 @@ / 3333 /tmp/refine - 2.0.9 - 4.2.0 - 5.1.0 @@ -46,7 +43,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.2.0 + ${build-helper-maven-plugin.version} generate-sources @@ -61,24 +58,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - - UTF-8 - false - - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - UTF-8 - - org.apache.maven.plugins maven-surefire-plugin @@ -92,7 +71,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.2.0 + ${maven-dependency-plugin.version} compile @@ -109,7 +88,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + ${maven-jar-plugin.version} @@ -121,7 +100,7 @@ org.apache.maven.plugins maven-clean-plugin - 3.1.0 + ${maven-clean-plugin.version} @@ -133,7 +112,7 @@ pl.project13.maven git-commit-id-plugin - 4.9.10 + ${git-commit-id-plugin.version} get-the-git-infos @@ -200,52 +179,52 @@ org.apache.commons commons-lang3 - 3.12.0 + ${commons-lang3.version} commons-fileupload commons-fileupload - 1.4 + ${commons-fileupload.version} commons-collections commons-collections - 3.2.2 + ${commons-collections.version} org.apache.commons commons-text - 1.9 + ${commons-text.version} commons-validator commons-validator - 1.7 + ${commons-validator.version} velocity velocity - 1.5 + ${velocity.version} org.marc4j marc4j - 2.9.2 + ${marc4j.version} org.apache.commons commons-compress - 1.21 + ${commons-compress.version} org.jsoup jsoup - 1.14.2 + ${jsoup.version} org.openrefine.dependencies opencsv-multichar - 2.4 + ${opencsv-multichar.version} org.apache.poi @@ -260,7 +239,7 @@ org.odftoolkit odfdom-java - 0.10.0 + ${odfdom-java.version} @@ -320,31 +299,30 @@ jena-core ${jena.version} - commons-codec commons-codec - 1.15 + ${commons-codec.version} commons-io commons-io - 2.11.0 + ${commons-io.version} com.google.guava guava - 31.0.1-jre + ${guava.version} javax.xml.bind jaxb-api - 2.3.1 + ${jaxb-api.version} com.github.albfernandez juniversalchardet - 2.4.0 + ${juniversalchardet.version} org.eclipse.jetty @@ -357,7 +335,7 @@ org.testng testng - 7.4.0 + ${testng.version} test @@ -381,7 +359,7 @@ org.apache.httpcomponents httpmime - 4.5.13 + ${httpmime.version} test diff --git a/pom.xml b/pom.xml index 12c737851..7d3cf9ed4 100644 --- a/pom.xml +++ b/pom.xml @@ -59,15 +59,61 @@ / 3333 /tmp/refine - 2.22.2 UTF-8 + + 2.13.0 4.0.1 1.2.0 1.7.32 9.4.41.v20210516 4.9.3 + 4.2.0 + 5.1.0 + 2.0.9 + 3.12.0 + 1.4 + 3.2.2 + 1.9 + 1.7 + + 1.15 + 1.21 + 1.5 + 2.9.2 + 1.14.2 + 0.10.0 + 1.2 + 2.1.1 + 1.10.3 + 4.5.13 + 5.1.2 + 4.4.14 + 2.4 + 3.1.9 + 2.11.0 + 31.0.1-jre + 2.3.1 + 2.4.0 + 7.4.0 + 4.5.13 + 1.2.3 + 1.9.3 + 4.1.0 + + + 3.2.0 + 3.8.1 + 3.2.0 + 3.0.0 + 3.2.0 + 0.8.7 + 4.3.0 + 2.22.2 + 3.2.0 + 3.1.0 + 4.9.10 @@ -82,7 +128,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.2.0 + ${build-helper-maven-plugin.version} generate-sources @@ -100,7 +146,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + ${maven-compiler-plugin.version} ${java.minversion} ${java.minversion} @@ -111,7 +157,7 @@ org.apache.maven.plugins maven-resources-plugin - 3.2.0 + ${maven-resources-plugin.version} UTF-8 @@ -119,7 +165,7 @@ org.codehaus.mojo exec-maven-plugin - 3.0.0 + ${exec-maven-plugin.version} true none @@ -128,7 +174,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.2.0 + ${maven-dependency-plugin.version} org.apache.maven.plugins @@ -144,7 +190,7 @@ org.jacoco jacoco-maven-plugin - 0.8.7 + ${jacoco-maven-plugin.version} prepare-agent @@ -196,7 +242,7 @@ org.eluder.coveralls coveralls-maven-plugin - 4.3.0 + ${coveralls-maven-plugin.version} javax.xml.bind diff --git a/server/pom.xml b/server/pom.xml index b62649a54..841a9215b 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -37,7 +37,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.2.0 + ${build-helper-maven-plugin.version} generate-sources @@ -55,7 +55,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + ${maven-compiler-plugin.version} ${java.minversion} ${java.minversion} @@ -66,7 +66,7 @@ org.apache.maven.plugins maven-resources-plugin - 3.2.0 + ${maven-resources-plugin.version} UTF-8 @@ -74,7 +74,7 @@ org.codehaus.mojo exec-maven-plugin - 3.0.0 + ${exec-maven-plugin.version} com.google.refine.Refine -Drefine.headless=true -Drefine.autoreload=true -Dbutterfly.autoreload=true -Drefine.memory=1400M -Drefine.port=3333 -Drefine.host=127.0.0.1 @@ -84,7 +84,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.0 + ${surefire.version} true @@ -95,7 +95,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.2.0 + ${maven-dendency-plugin.version} runtime