From 44a47c9863b8d1ed38e71ca7bec290c9c678b02a Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Mon, 23 Sep 2024 14:58:40 +0200 Subject: [PATCH] Issue #390: Merge uimaFIT modules into UIMAJ repository - Consolidate dependencies and test logging --- aggregate-uimaj/pom.xml | 1 - uimafit-assertj/pom.xml | 17 +- uimafit-benchmark/pom.xml | 21 +- .../test/resources/simplelogger.properties | 17 ++ uimafit-core/pom.xml | 15 +- .../test/resources/simplelogger.properties | 17 ++ uimafit-cpe/pom.xml | 10 +- .../test/resources/simplelogger.properties | 17 ++ uimafit-documentation/pom.xml | 5 +- uimafit-examples/pom.xml | 15 +- uimafit-junit/pom.xml | 9 +- uimafit-maven-plugin/pom.xml | 23 +- uimafit-parent/pom.xml | 113 +------- uimafit-spring/pom.xml | 20 +- .../test/resources/simplelogger.properties | 17 ++ uimaj-adapter-vinci/pom.xml | 91 ++++--- uimaj-document-annotation/pom.xml | 7 +- .../test/resources/simplelogger.properties | 18 ++ uimaj-eclipse-feature-runtime/pom.xml | 2 +- uimaj-examples/pom.xml | 35 ++- uimaj-json/pom.xml | 17 +- .../test/resources/simplelogger.properties | 18 ++ uimaj-parent/pom.xml | 244 +++++++++++++++--- uimaj-test-util/pom.xml | 8 - uimaj-tools/pom.xml | 10 +- .../test/resources/simplelogger.properties | 18 ++ uimaj-v3migration-jcas/pom.xml | 25 +- 27 files changed, 540 insertions(+), 270 deletions(-) create mode 100644 uimaj-document-annotation/src/test/resources/simplelogger.properties create mode 100644 uimaj-json/src/test/resources/simplelogger.properties create mode 100644 uimaj-tools/src/test/resources/simplelogger.properties diff --git a/aggregate-uimaj/pom.xml b/aggregate-uimaj/pom.xml index 078fffdedb..ef5f19a184 100644 --- a/aggregate-uimaj/pom.xml +++ b/aggregate-uimaj/pom.xml @@ -59,7 +59,6 @@ ../uimafit-documentation ../uimafit-cpe ../uimafit-benchmark - ../uimafit-parent 4.0.0 - - org.apache.uima - uimafit-parent - 3.6.0-SNAPSHOT - ../uimafit-parent - + + + org.apache.uima + uimaj-parent + 3.6.0-SNAPSHOT + ../uimaj-parent/pom.xml + uimafit-assertj bundle @@ -35,12 +36,14 @@ org.apache.uima uimafit-core - 3.6.0-SNAPSHOT + ${project.version} org.apache.uima uimaj-core + ${project.version} + org.assertj assertj-core diff --git a/uimafit-benchmark/pom.xml b/uimafit-benchmark/pom.xml index 5fed54150e..e0f3ba25c3 100644 --- a/uimafit-benchmark/pom.xml +++ b/uimafit-benchmark/pom.xml @@ -19,17 +19,20 @@ --> 4.0.0 + + + org.apache.uima + uimaj-parent + 3.6.0-SNAPSHOT + ../uimaj-parent/pom.xml + + uimafit-benchmark jar Apache UIMA uimaFIT - Benchmark Factories, Injection, and Testing library for UIMA ${uimaWebsiteUrl} - - org.apache.uima - uimafit-parent - 3.6.0-SNAPSHOT - ../uimafit-parent - + Apache License, Version 2.0 @@ -37,24 +40,26 @@ repo + true + org.apache.uima uimafit-core - 3.6.0-SNAPSHOT + ${project.version} org.apache.uima uimaj-core + ${project.version} org.apache.commons commons-math3 - 3.6.1 org.apache.commons diff --git a/uimafit-benchmark/src/test/resources/simplelogger.properties b/uimafit-benchmark/src/test/resources/simplelogger.properties index cd90c2acb8..1507469b02 100644 --- a/uimafit-benchmark/src/test/resources/simplelogger.properties +++ b/uimafit-benchmark/src/test/resources/simplelogger.properties @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.slf4j.simpleLogger.defaultLogLevel=warn diff --git a/uimafit-core/pom.xml b/uimafit-core/pom.xml index 4ef1df506d..14b81e59c8 100644 --- a/uimafit-core/pom.xml +++ b/uimafit-core/pom.xml @@ -22,9 +22,9 @@ org.apache.uima - uimafit-parent + uimaj-parent 3.6.0-SNAPSHOT - ../uimafit-parent + ../uimaj-parent/pom.xml uimafit-core @@ -41,7 +41,14 @@ repo + + + org.apache.uima + uimaj-core + ${project.version} + + org.apache.commons commons-lang3 @@ -50,10 +57,6 @@ commons-io commons-io - - org.apache.uima - uimaj-core - org.springframework spring-core diff --git a/uimafit-core/src/test/resources/simplelogger.properties b/uimafit-core/src/test/resources/simplelogger.properties index cd90c2acb8..1507469b02 100644 --- a/uimafit-core/src/test/resources/simplelogger.properties +++ b/uimafit-core/src/test/resources/simplelogger.properties @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.slf4j.simpleLogger.defaultLogLevel=warn diff --git a/uimafit-cpe/pom.xml b/uimafit-cpe/pom.xml index 69d1ee19fa..97774e9da4 100644 --- a/uimafit-cpe/pom.xml +++ b/uimafit-cpe/pom.xml @@ -19,11 +19,12 @@ --> 4.0.0 + org.apache.uima - uimafit-parent + uimaj-parent 3.6.0-SNAPSHOT - ../uimafit-parent + ../uimaj-parent/pom.xml uimafit-cpe @@ -35,16 +36,17 @@ org.apache.uima uimafit-core - 3.6.0-SNAPSHOT + ${project.version} - org.apache.uima uimaj-cpe + ${project.version} org.apache.uima uimaj-core + ${project.version} diff --git a/uimafit-cpe/src/test/resources/simplelogger.properties b/uimafit-cpe/src/test/resources/simplelogger.properties index cd90c2acb8..1507469b02 100644 --- a/uimafit-cpe/src/test/resources/simplelogger.properties +++ b/uimafit-cpe/src/test/resources/simplelogger.properties @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.slf4j.simpleLogger.defaultLogLevel=warn diff --git a/uimafit-documentation/pom.xml b/uimafit-documentation/pom.xml index 6611bac157..57c0793f78 100644 --- a/uimafit-documentation/pom.xml +++ b/uimafit-documentation/pom.xml @@ -19,11 +19,12 @@ --> 4.0.0 + org.apache.uima - uimafit-parent + uimaj-parent 3.6.0-SNAPSHOT - ../uimafit-parent + ../uimaj-parent/pom.xml uimafit-documentation diff --git a/uimafit-examples/pom.xml b/uimafit-examples/pom.xml index 4344186675..561a8eb353 100644 --- a/uimafit-examples/pom.xml +++ b/uimafit-examples/pom.xml @@ -18,27 +18,32 @@ under the License. --> + 4.0.0 + org.apache.uima - uimafit-parent + uimaj-parent 3.6.0-SNAPSHOT - ../uimafit-parent + ../uimaj-parent/pom.xml - 4.0.0 + uimafit-examples Apache UIMA uimaFIT - Examples Factories, Injection, and Testing library for UIMA ${uimaWebsiteUrl} + org.apache.uima uimafit-core - 3.6.0-SNAPSHOT + ${project.version} org.apache.uima uimaj-core + ${project.version} + commons-io commons-io @@ -48,6 +53,7 @@ slf4j-simple + Apache License, Version 2.0 @@ -55,6 +61,7 @@ repo + diff --git a/uimafit-junit/pom.xml b/uimafit-junit/pom.xml index 6e758ea5c4..95466a2a5c 100644 --- a/uimafit-junit/pom.xml +++ b/uimafit-junit/pom.xml @@ -19,11 +19,12 @@ --> 4.0.0 + org.apache.uima - uimafit-parent + uimaj-parent 3.6.0-SNAPSHOT - ../uimafit-parent + ../uimaj-parent/pom.xml uimafit-junit @@ -35,12 +36,14 @@ org.apache.uima uimafit-core - 3.6.0-SNAPSHOT + ${project.version} org.apache.uima uimaj-core + ${project.version} + org.junit.jupiter junit-jupiter-api diff --git a/uimafit-maven-plugin/pom.xml b/uimafit-maven-plugin/pom.xml index f1e1fb62ae..7ba41704d4 100644 --- a/uimafit-maven-plugin/pom.xml +++ b/uimafit-maven-plugin/pom.xml @@ -19,11 +19,12 @@ --> 4.0.0 + org.apache.uima - uimafit-parent + uimaj-parent 3.6.0-SNAPSHOT - ../uimafit-parent + ../uimaj-parent/pom.xml uimafit-maven-plugin @@ -42,23 +43,25 @@ - - commons-io - commons-io - - - org.apache.commons - commons-lang3 - org.apache.uima uimaj-core + ${project.version} org.apache.uima uimafit-core ${project.version} + + + commons-io + commons-io + + + org.apache.commons + commons-lang3 + org.javassist javassist diff --git a/uimafit-parent/pom.xml b/uimafit-parent/pom.xml index 5c586ea983..7e25348e71 100644 --- a/uimafit-parent/pom.xml +++ b/uimafit-parent/pom.xml @@ -19,11 +19,12 @@ --> 4.0.0 + org.apache.uima parent-pom - 17 + uimafit-parent @@ -33,95 +34,11 @@ Apache UIMA uimaFIT - Parent ${uimaWebsiteUrl} 2012 - - - Github - https://github.com/apache/uima-uimafit/issues - - - uimafit-3.5.0 - scm:git:https://github.com/apache/uima-uimafit/ - scm:git:https://github.com/apache/uima-uimafit/ - https://github.com/apache/uima-uimafit/ - - - - - - - 5.3.30 - 3.5.0 - 1.7.36 - 3.8.1 - - 5.10.1 - 1.10.1 - 3.24.2 - 5.7.0 - 1.3.0 - 2.9.1 - - 2.15.0 - 3.13.0 - 2.2.4 - 2.5.10 - 2.3.9 - - 17 - 17 - 17 - JavaSE-17 - - 3.4.0 - - - uima-uimafit - main - 3.4.0 - - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.assertj - assertj-core - test - - - org.slf4j - slf4j-simple - test - - - @@ -138,8 +55,17 @@ org.assertj - assertj-core + assertj-bom ${assertj-version} + pom + import + + + org.mockito + mockito-bom + ${mockito-version} + pom + import org.xmlunit @@ -151,13 +77,6 @@ xmlunit-assertj3 ${xmlunit-version} - - org.mockito - mockito-bom - ${mockito-version} - pom - import - org.apache.commons commons-lang3 @@ -243,14 +162,6 @@ - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - diff --git a/uimafit-spring/pom.xml b/uimafit-spring/pom.xml index 460102ba1a..9849589c7c 100644 --- a/uimafit-spring/pom.xml +++ b/uimafit-spring/pom.xml @@ -19,17 +19,20 @@ --> 4.0.0 + + + org.apache.uima + uimaj-parent + 3.6.0-SNAPSHOT + ../uimaj-parent/pom.xml + + uimafit-spring jar Apache UIMA uimaFIT - Spring integration Factories, Injection, and Testing library for UIMA ${uimaWebsiteUrl} - - org.apache.uima - uimafit-parent - 3.6.0-SNAPSHOT - ../uimafit-parent - + Apache License, Version 2.0 @@ -37,6 +40,7 @@ repo + org.springframework @@ -49,11 +53,13 @@ org.apache.uima uimaj-core + ${project.version} + org.apache.uima uimafit-core - 3.6.0-SNAPSHOT + ${project.version} test diff --git a/uimafit-spring/src/test/resources/simplelogger.properties b/uimafit-spring/src/test/resources/simplelogger.properties index cd90c2acb8..1507469b02 100644 --- a/uimafit-spring/src/test/resources/simplelogger.properties +++ b/uimafit-spring/src/test/resources/simplelogger.properties @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + org.slf4j.simpleLogger.defaultLogLevel=warn diff --git a/uimaj-adapter-vinci/pom.xml b/uimaj-adapter-vinci/pom.xml index fa7666723d..067b0a9a16 100644 --- a/uimaj-adapter-vinci/pom.xml +++ b/uimaj-adapter-vinci/pom.xml @@ -17,7 +17,9 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 @@ -29,7 +31,7 @@ uimaj-adapter-vinci bundle - + Apache UIMA Base: ${project.artifactId}: Vinci Adapter Provides the capability to connect to a remote analysis engine, using the Vinci protocol @@ -63,39 +65,68 @@ assertj-core test + + + + + org.slf4j - slf4j-jdk14 + slf4j-simple test - + - - - org.apache.felix - maven-bundle-plugin - - - ${execution.environment} - <_dsannotations>* - <_metatypeannotations>* - - !org.apache.uima.adapter.vinci, - !org.apache.uima.adapter.vinci.*, - !com.apple.eio, - org.slf4j.impl;resolution:=optional, - org.apache.logging.log4j.*;resolution:=optional, - org.apache.logging.slf4j.*;resolution:=optional, - * - - - org.apache.uima.adapter.vinci, - org.apache.uima.adapter.vinci.* - - - - - + + + org.apache.felix + maven-bundle-plugin + + + ${execution.environment} + <_dsannotations>* + <_metatypeannotations>* + + !org.apache.uima.adapter.vinci, + !org.apache.uima.adapter.vinci.*, + !com.apple.eio, + org.slf4j.impl;resolution:=optional, + org.apache.logging.log4j.*;resolution:=optional, + org.apache.logging.slf4j.*;resolution:=optional, + * + + + org.apache.uima.adapter.vinci, + org.apache.uima.adapter.vinci.* + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + default + verify + + analyze-only + + + + + true + + org.slf4j:slf4j-jdk14 + + + + + \ No newline at end of file diff --git a/uimaj-document-annotation/pom.xml b/uimaj-document-annotation/pom.xml index 91b9078bc3..a08d44eebd 100644 --- a/uimaj-document-annotation/pom.xml +++ b/uimaj-document-annotation/pom.xml @@ -43,18 +43,13 @@ org.apache.uima uimaj-core ${project.parent.version} - compile + org.apache.uima uimaj-test-util ${project.parent.version} test - - org.slf4j - slf4j-jdk14 - test - \ No newline at end of file diff --git a/uimaj-document-annotation/src/test/resources/simplelogger.properties b/uimaj-document-annotation/src/test/resources/simplelogger.properties new file mode 100644 index 0000000000..1507469b02 --- /dev/null +++ b/uimaj-document-annotation/src/test/resources/simplelogger.properties @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +org.slf4j.simpleLogger.defaultLogLevel=warn diff --git a/uimaj-eclipse-feature-runtime/pom.xml b/uimaj-eclipse-feature-runtime/pom.xml index 45aa7978db..28a9019948 100644 --- a/uimaj-eclipse-feature-runtime/pom.xml +++ b/uimaj-eclipse-feature-runtime/pom.xml @@ -43,7 +43,7 @@ 3.6.0-SNAPSHOT - + apache-release diff --git a/uimaj-examples/pom.xml b/uimaj-examples/pom.xml index 424ecbc631..83ab1c5db8 100644 --- a/uimaj-examples/pom.xml +++ b/uimaj-examples/pom.xml @@ -43,31 +43,26 @@ org.apache.uima uimaj-core ${project.parent.version} - compile org.apache.uima uimaj-cpe ${project.parent.version} - compile - - - org.apache.uima - uimaj-document-annotation - ${project.parent.version} - compile + + + + + org.apache.uima uimaj-tools ${project.parent.version} - compile org.apache.uima uimaj-v3migration-jcas ${project.parent.version} - compile @@ -89,6 +84,7 @@ provided + @@ -112,6 +108,25 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + default + verify + + analyze-only + + + + + true + + org.apache.uima:uimaj-v3migration-jcas + + + diff --git a/uimaj-json/pom.xml b/uimaj-json/pom.xml index 743ba747bc..78273630b9 100644 --- a/uimaj-json/pom.xml +++ b/uimaj-json/pom.xml @@ -49,9 +49,24 @@ test + + + + + + + + + + org.slf4j - slf4j-jdk14 + slf4j-simple + test + + + org.xmlunit + xmlunit-assertj3 test diff --git a/uimaj-json/src/test/resources/simplelogger.properties b/uimaj-json/src/test/resources/simplelogger.properties new file mode 100644 index 0000000000..1507469b02 --- /dev/null +++ b/uimaj-json/src/test/resources/simplelogger.properties @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +org.slf4j.simpleLogger.defaultLogLevel=warn diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml index dac85acd8e..471f44cf8f 100644 --- a/uimaj-parent/pom.xml +++ b/uimaj-parent/pom.xml @@ -1,21 +1,21 @@ - + 4.0.0 @@ -36,8 +36,9 @@ uimaj-parent - pom 3.6.0-SNAPSHOT + pom + Apache UIMA Java SDK: ${project.artifactId} The common parent pom for the UIMA Java SDK ${uimaWebsiteUrl} @@ -133,49 +134,75 @@ - 4.0.3 + 4.0.9 - 1.7.36 + 17 + 17 + 17 + JavaSE-17 + 3.8.1 - 2.20.0 - 2.13.0 + 2.2.4 + 2.5.10 + 2.3.9 + 3.24.2 1.10.0 + 2.15.0 3.13.0 + 3.6.1 2.15.2 - 5.10.0 + 5.10.1 + 1.10.1 4.13.2 - 5.4.0 - 3.24.2 + 2.20.0 + 5.7.0 + 1.3.0 + 1.7.36 + 5.3.30 2.9.1 - 2.2.4 - 2.5.10 - 2.3.9 - - 17 - 17 - 17 - JavaSE-17 - org.eclipse.p2.202209 - 3.4.1 + 3.5.0 src/main/assembly/src.xml uima-uimaj main - 3.4.1 + 3.5.0 + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.assertj + assertj-core + test + + + org.slf4j + slf4j-simple + test + + + @@ -185,6 +212,11 @@ pom import + + org.opentest4j + opentest4j + ${opentest4j-version} + junit junit @@ -214,7 +246,6 @@ xmlunit-assertj3 ${xmlunit-version} - org.slf4j slf4j-jdk14 @@ -239,6 +270,11 @@ import + + org.apache.commons + commons-csv + ${commons-csv-version} + commons-io commons-io @@ -251,19 +287,54 @@ org.apache.commons - commons-csv - ${commons-csv-version} + commons-math3 + ${commons-math3-version} + + + org.springframework + spring-core + ${spring-version} + + + org.springframework + spring-beans + ${spring-version} + + + org.springframework + spring-context + ${spring-version} + + + org.springframework + spring-test + ${spring-version} org.sonatype.plexus plexus-build-api 0.0.7 + + org.codehaus.plexus + plexus-utils + 3.4.1 + org.apache.maven.plugin-testing maven-plugin-testing-harness 3.3.0 + + org.apache.maven + maven-artifact + ${maven.version} + + + org.apache.maven + maven-model + ${maven.version} + org.apache.maven maven-plugin-api @@ -279,6 +350,11 @@ maven-compat ${maven.version} + + org.javassist + javassist + 3.29.2-GA + ${eclipseP2RepoId} @@ -462,6 +538,11 @@ + + org.apache.uima + jcasgen-maven-plugin + ${project.version} + @@ -469,7 +550,7 @@ org.openntf.maven p2-layout-resolver - 1.7.0 + 1.9.0 true @@ -516,7 +597,31 @@ - + + org.codehaus.gmaven + groovy-maven-plugin + + + + read-notice + generate-sources + + execute + + + + + + + com.github.siom79.japicmp @@ -607,7 +712,51 @@ - + + + dependency-check + + + !disable-dependency-check + + + marker-file-enabling-dependency-check + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + default + verify + + analyze-only + + + + + true + + org.assertj:assertj-core + org.slf4j:slf4j-simple + org.junit.jupiter:junit-jupiter-api + org.junit.jupiter:junit-jupiter-engine + org.junit.vintage:junit-vintage-engine + junit:junit + + org.slf4j:slf4j-simple + + + + + + + m2e @@ -647,7 +796,20 @@ - + + + org.codehaus.gmaven + groovy-maven-plugin + [1.4,) + + execute + + + + + + + diff --git a/uimaj-test-util/pom.xml b/uimaj-test-util/pom.xml index 1fc2b4409b..fd99f3ae40 100644 --- a/uimaj-test-util/pom.xml +++ b/uimaj-test-util/pom.xml @@ -48,14 +48,6 @@ junit-vintage-engine compile - - org.xmlunit - xmlunit-core - - - org.xmlunit - xmlunit-assertj3 - org.slf4j slf4j-api diff --git a/uimaj-tools/pom.xml b/uimaj-tools/pom.xml index 09a6b67962..e94e0c3ff5 100644 --- a/uimaj-tools/pom.xml +++ b/uimaj-tools/pom.xml @@ -43,27 +43,21 @@ org.apache.uima uimaj-core ${project.parent.version} - compile org.apache.uima uimaj-cpe ${project.parent.version} - compile + org.apache.uima uimaj-test-util ${project.parent.version} test - - org.slf4j - slf4j-jdk14 - test - - + diff --git a/uimaj-tools/src/test/resources/simplelogger.properties b/uimaj-tools/src/test/resources/simplelogger.properties new file mode 100644 index 0000000000..1507469b02 --- /dev/null +++ b/uimaj-tools/src/test/resources/simplelogger.properties @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +org.slf4j.simpleLogger.defaultLogLevel=warn diff --git a/uimaj-v3migration-jcas/pom.xml b/uimaj-v3migration-jcas/pom.xml index 1a4d310ef3..68081566d4 100644 --- a/uimaj-v3migration-jcas/pom.xml +++ b/uimaj-v3migration-jcas/pom.xml @@ -38,14 +38,15 @@ org.apache.uima uimaj-core ${project.parent.version} - compile - - - org.apache.uima - uimaj-test-util - ${project.parent.version} - test + + + + + + + + com.github.javaparser javaparser-core @@ -62,10 +63,10 @@ - - org.bitbucket.mstrobel - procyon-core - 0.5.32 - + + + + + \ No newline at end of file