You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2020/09/16 13:53:41 UTC
[uima-uimafit] 01/01: Merge branch 'master' into
UIMA-6263-CAS-validation-support-v3
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch UIMA-6263-CAS-validation-support-v3
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git
commit 697ec0eb5c9d5c8c4005d9848cc0375c557ac16e
Merge: b24643d e4043e7
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Wed Sep 16 15:53:08 2020 +0200
Merge branch 'master' into UIMA-6263-CAS-validation-support-v3
* master: (129 commits)
[UIMA-6264] Switch from DocBook to Asciidoc
[UIMA-6257] Jenkinsfile for uimaFIT
[UIMA-6257] Jenkinsfile for uimaFIT
[UIMA-6257] Jenkinsfile for uimaFIT
[UIMA-6257] Jenkinsfile for uimaFIT
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release uimafit-3.1.0
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release uimafit-3.1.0
[NO JIRA] Adjust UIMA version in the NOTICE file of the binary distribution
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release uimafit-3.1.0
[NO JIRA] Update documentation to changed API in ExternalResourceFactory and removed a spurious character
[NO JIRA] Adjusted comparison version for API change report
[NO JIRA] Updated README file for release.
[NO JIRA] Updated README file for release.
[UIMA-6214] Method signature class in ExternalResourceFactory
Update an Eclipse metadata file.
[UIMA-5847] Remove UV3 bug workarounds in FSCollectionFactory
[UIMA-6216] Upgrade to UIMA Core 3.1.1
...
# Conflicts:
# README
# pom.xml
# uimafit-parent/pom.xml
CONTRIBUTING.md | 3 +-
README | 36 +-
api-change-report.html | 13 +-
pom.xml | 56 +-
src/main/assembly/bin.xml | 28 +-
src/main/dist-bin/LICENSE | 2 +-
src/main/dist-bin/NOTICE | 16 +-
uimafit-assertj/pom.xml | 4 +-
uimafit-benchmark/pom.xml | 23 +-
.../org/apache/uima/fit/benchmark/Benchmark.java | 2 +-
.../uima/fit/benchmark/RunnableWithExceptions.java | 4 +-
.../uima/fit/benchmark/CasUtilBenchmark.java | 33 ++
.../uima/fit/benchmark/JCasUtilBenchmark.java | 27 +
.../src/test/resources/simplelogger.properties | 1 +
uimafit-core/NOTICE | 4 +
uimafit-core/pom.xml | 56 +-
.../uima/fit/component/CasAnnotator_ImplBase.java | 15 -
.../component/CasCollectionReader_ImplBase.java | 12 +-
.../uima/fit/component/CasConsumer_ImplBase.java | 15 -
.../fit/component/CasFlowController_ImplBase.java | 15 -
.../uima/fit/component/CasMultiplier_ImplBase.java | 15 -
.../uima/fit/component/ExternalResourceAware.java | 8 +-
.../uima/fit/component/JCasAnnotator_ImplBase.java | 15 -
.../component/JCasCollectionReader_ImplBase.java | 13 +-
.../uima/fit/component/JCasConsumer_ImplBase.java | 15 -
.../fit/component/JCasFlowController_ImplBase.java | 15 -
.../fit/component/JCasMultiplier_ImplBase.java | 15 -
.../uima/fit/component/Resource_ImplBase.java | 14 +-
.../uima/fit/factory/AnalysisEngineFactory.java | 10 +-
.../org/apache/uima/fit/factory/CasFactory.java | 34 +-
.../uima/fit/factory/CollectionReaderFactory.java | 50 +-
.../fit/factory/ConfigurationParameterFactory.java | 13 +-
.../uima/fit/factory/ExternalResourceFactory.java | 371 ++++++++----
.../uima/fit/factory/FlowControllerFactory.java | 10 +-
.../apache/uima/fit/factory/FsIndexFactory.java | 10 +-
.../org/apache/uima/fit/factory/JCasFactory.java | 49 +-
.../uima/fit/factory/TypePrioritiesFactory.java | 19 +-
.../fit/factory/TypeSystemDescriptionFactory.java | 11 +-
.../apache/uima/fit/internal/ExtendedLogger.java | 450 ---------------
.../org/apache/uima/fit/internal/MetaDataUtil.java | 2 +-
.../uima/fit/internal/ResourceManagerFactory.java | 75 ++-
.../apache/uima/fit/pipeline/SimplePipeline.java | 47 +-
.../uima/fit/testing/factory/TokenBuilder.java | 1 -
.../java/org/apache/uima/fit/util/CasUtil.java | 75 ++-
.../apache/uima/fit/util/FSCollectionFactory.java | 322 +++++++----
.../main/java/org/apache/uima/fit/util/FSUtil.java | 53 +-
.../java/org/apache/uima/fit/util/JCasUtil.java | 15 +-
.../AnalysisEngineFactoryExternalResourceTest.java | 61 +-
...ollectionReaderFactoryExternalResourceTest.java | 7 +-
.../factory/ExternalResourceConfiguratorTest.java | 4 +-
.../fit/factory/ExternalResourceFactoryTest.java | 173 ++++--
.../FlowControllerFactoryExternalResourceTest.java | 5 +-
.../org/apache/uima/fit/factory/LoggingTest.java | 375 -------------
.../fit/factory/TypePrioritiesFactoryTest.java | 30 +-
.../apache/uima/fit/pipeline/JCasIterableTest.java | 10 +-
.../uima/fit/pipeline/SimplePipelineTest.java | 6 +-
.../uima/fit/util/FSCollectionFactoryTest.java | 76 ++-
.../java/org/apache/uima/fit/util/FSUtilTest.java | 27 +-
.../org/apache/uima/fit/util/JCasUtilTest.java | 17 +-
.../{JCasUtilTest.java => JCasUtilv3Test.java} | 385 +++++++------
.../resources/data/reference/JCasBuilderTest.dump | 22 +-
.../test/resources/data/reference/test.xmi.dump | 28 +-
uimafit-core/src/test/resources/log4j.properties | 5 -
.../src/test/resources/simplelogger.properties | 1 +
.../.settings/org.eclipse.core.resources.prefs | 1 +
uimafit-cpe/pom.xml | 82 +--
.../java/org/apache/uima/fit/cpe/CpePipeline.java | 27 +-
.../uima/fit/cpe/ExternalResourceFactoryTest.java | 30 +-
.../src/test/resources/simplelogger.properties | 1 +
uimafit-doc/pom.xml | 2 +-
.../asciidoc/tools.uimafit.externalresources.adoc | 2 +-
.../src/main/asciidoc/tools.uimafit.migration.adoc | 154 ++---
{uimafit-junit => uimafit-docbook}/pom.xml | 31 +-
.../tools.uimafit.configurationparameters.xml | 185 ++++++
.../docbook/tools.uimafit.externalresources.xml | 321 +++++++++++
.../src/docbook/tools.uimafit.migration.xml | 273 +++++++++
uimafit-examples/NOTICE | 3 +
uimafit-examples/pom.xml | 267 ++++-----
.../examples/resource/ExternalResourceExample.java | 7 +-
.../resource/ExternalResourceExample2.java | 7 +-
.../resource/ExternalResourceExample3.java | 6 +-
.../examples/tutorial/ex2/RoomNumberAnnotator.java | 3 +-
.../tutorial/ex6/UimaAcronymAnnotator.java | 8 +-
.../tutorial/ex6/UimaMeetingAnnotator.java | 8 +-
.../src/main/resources/simplelogger.properties | 1 +
.../fit/examples/tutorial/ex6/Example6Test.java | 8 +-
uimafit-junit/pom.xml | 4 +-
.../.settings/org.eclipse.jdt.core.prefs | 288 ----------
.../.settings/org.eclipse.jdt.ui.prefs | 3 -
uimafit-legacy-support/NOTICE | 8 -
...marker-file-identifying-api-compatibility-check | 1 -
uimafit-legacy-support/pom.xml | 144 -----
.../uima/fit/legacy/AnnotationConverter.java | 44 --
.../uima/fit/legacy/LegacySupportPluginImpl.java | 158 ------
.../fit/legacy/converter/AnnotationLiteral.java | 277 ---------
.../converter/ConfigurationParameterConverter.java | 98 ----
.../ContextlessAnnotationConverterBase.java | 41 --
.../converter/ExternalResourceConverter.java | 92 ---
.../converter/FsIndexCollectionConverter.java | 67 ---
.../fit/legacy/converter/FsIndexConverter.java | 92 ---
.../fit/legacy/converter/FsIndexKeyConverter.java | 63 ---
.../legacy/converter/NoConversionConverter.java | 59 --
.../converter/OperationalPropertiesConverter.java | 67 ---
.../legacy/converter/SofaCapabilityConverter.java | 75 ---
.../legacy/converter/TypeCapabilityConverter.java | 75 ---
.../org/apache/uima/fit/ComponentTestBase.java | 89 ---
.../uima/fit/component/CasDumpWriterTest.java | 61 --
.../JCasCollectionReader_ImplBaseTest.java | 88 ---
.../fit/component/ViewCreatorAnnotatorTest.java | 182 ------
.../fit/component/ViewTextCopierAnnotatorTest.java | 92 ---
.../ConfigurationParameterInitializerTest.java | 472 ----------------
.../apache/uima/fit/data/CreateSampleXCASFile.java | 59 --
.../apache/uima/fit/data/CreateSampleXMIFile.java | 54 --
.../uima/fit/descriptor/TypeCapabilityTest.java | 57 --
.../uima/fit/factory/AggregateBuilderTest.java | 209 -------
.../uima/fit/factory/AggregateWithReaderTest.java | 198 -------
.../AnalysisEngineFactoryExternalResourceTest.java | 404 --------------
.../fit/factory/AnalysisEngineFactoryTest.java | 467 ----------------
.../uima/fit/factory/AnnotationFactoryTest.java | 45 --
...ollectionReaderFactoryExternalResourceTest.java | 91 ---
.../fit/factory/CollectionReaderFactoryTest.java | 127 -----
.../factory/ConfigurationParameterFactoryTest.java | 221 --------
.../factory/ExternalResourceConfiguratorTest.java | 82 ---
.../fit/factory/ExternalResourceFactoryTest.java | 411 --------------
.../FlowControllerFactoryExternalResourceTest.java | 93 ---
.../uima/fit/factory/FsIndexFactoryTest.java | 132 -----
.../apache/uima/fit/factory/JCasBuilderTest.java | 73 ---
.../apache/uima/fit/factory/JCasFactoryTest.java | 71 ---
.../org/apache/uima/fit/factory/LoggingTest.java | 311 -----------
.../ResourceCreationSpecifierFactoryTest.java | 56 --
.../uima/fit/factory/SofaMappingFactoryTest.java | 40 --
.../fit/factory/TypePrioritiesFactoryTest.java | 47 --
.../factory/TypeSystemDescriptionFactoryTest.java | 48 --
.../uima/fit/factory/UimaContextFactoryTest.java | 70 ---
.../initializable/InitializableFactoryTest.java | 123 ----
.../uima/fit/factory/testAes/Annotator1.java | 50 --
.../uima/fit/factory/testAes/Annotator2.java | 63 ---
.../uima/fit/factory/testAes/Annotator3.java | 57 --
.../uima/fit/factory/testAes/Annotator4.java | 45 --
.../apache/uima/fit/factory/testAes/FlowAE1.java | 38 --
.../apache/uima/fit/factory/testAes/FlowAE2.java | 45 --
.../apache/uima/fit/factory/testAes/FlowAE3.java | 48 --
.../uima/fit/factory/testAes/ParameterizedAE.java | 409 --------------
.../uima/fit/factory/testAes/ParameterizedAE2.java | 56 --
.../testAes/ReversableTestFlowController.java | 88 ---
.../apache/uima/fit/factory/testAes/ViewNames.java | 38 --
.../fit/factory/testCrs/SingleFileXReader.java | 127 -----
.../fit/factory/testCrs/SingleFileXReaderTest.java | 117 ----
.../fit/factory/testRes/TestExternalResource.java | 41 --
.../factory/testRes/TestSharedResourceObject.java | 48 --
.../uima/fit/testing/factory/TokenBuilderTest.java | 242 --------
.../java/org/apache/uima/fit/util/CasUtilTest.java | 188 -------
.../apache/uima/fit/util/ContainmentIndexTest.java | 69 ---
.../apache/uima/fit/util/DisableLoggingTest.java | 106 ----
.../uima/fit/util/FSCollectionFactoryTest.java | 211 -------
.../org/apache/uima/fit/util/HideOutputTest.java | 72 ---
.../org/apache/uima/fit/util/JCasIterableTest.java | 43 --
.../org/apache/uima/fit/util/JCasUtilTest.java | 621 ---------------------
.../org/apache/uima/fit/util/LocaleUtilTest.java | 64 ---
.../apache/uima/fit/util/SimplePipelineTest.java | 48 --
.../org/apache/uima/fit/util/TypeSystemUtil.java | 46 --
.../resources/META-INF/org.uimafit/fsindexes.txt | 1 -
.../test/resources/META-INF/org.uimafit/types.txt | 1 -
.../resources/data/descriptor/DefaultValueAE1.xml | 36 --
.../resources/data/descriptor/DefaultValueAE2.xml | 36 --
.../src/test/resources/data/descriptor/README | 3 -
.../src/test/resources/data/docs/bad.xcas | 1 -
.../src/test/resources/data/docs/test.xcas | 1 -
.../src/test/resources/data/docs/test.xmi | 1 -
.../test/resources/data/docs/unix-newlines.txt.bin | 8 -
.../resources/data/docs/windows-newlines.txt.bin | 9 -
.../resources/data/reference/JCasBuilderTest.dump | 69 ---
.../test/resources/data/reference/test.xmi.dump | 92 ---
.../apache/uima/fit/component/NoOpAnnotator.xml | 48 --
.../uima/fit/factory/testCrs/SingleFileXReader.xml | 60 --
.../apache/uima/fit/index/AutoImportableIndex.xml | 38 --
.../org/apache/uima/fit/type/AnalyzedText.xml | 39 --
.../org/apache/uima/fit/type/Sentence.xml | 32 --
.../resources/org/apache/uima/fit/type/Token.xml | 44 --
uimafit-maven-plugin/pom.xml | 324 +++++------
uimafit-maven-plugin/src/it/default/pom.xml | 110 ++--
.../org/apache/uima/fit/maven/EnhanceMojo.java | 7 +-
.../uima/fit/maven/GenerateDescriptorsMojo.java | 2 +-
.../java/org/apache/uima/fit/maven/util/Util.java | 2 +-
uimafit-parent/pom.xml | 135 ++---
uimafit-spring/NOTICE | 3 +
uimafit-spring/pom.xml | 111 ++--
.../spring/SpringContextResourceManagerTest.java | 4 +-
.../src/test/resources/simplelogger.properties | 1 +
189 files changed, 2913 insertions(+), 12165 deletions(-)
diff --cc README
index 59e67fb,6683e3c..ed5b172
--- a/README
+++ b/README
@@@ -95,14 -94,6 +94,9 @@@ uimafit-core - the main uimaF
uimafit-cpe - support for the Collection Processing Engine (multi-threaded pipelines)
uimafit-maven - a Maven plugin to automatically enhance UIMA components with uimaFIT
metadata and to generate XML descriptors for uimaFIT-enabled components.
+uimafit-junit - convenience code facilitating the implementation of UIMA/uimaFIT tests
+ in JUnit tests
+uimafit-assertj - adds assertions for UIMA/uimaFIT types via the AssertJ framework
- uimafit-legacy-support - allows uimaFIT 2.x.0 to use uimaFIT 1.4.x meta data like Java annotations
- and META-INF/org.uimafit/types.txt files. Pipelines mixing uimaFIT 1.4.x
- and 2.x components MUST be created using the 2.x factories, because the
- 1.4.x factories will NOT understand how to handle uimaFIT 2.x components
- or auto-configuration.
uimafit-spring - an experimental module serving as a proof-of-concept for the integration of
UIMA with the Spring Framework. It is currently not considered finished and
uses invasive reflection in order to patch the UIMA framework such that it
diff --cc pom.xml
index d098714,b2f723e..a00e3d6
--- a/pom.xml
+++ b/pom.xml
@@@ -56,23 -56,8 +56,18 @@@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-cpe</artifactId>
- <version>2.5.1-SNAPSHOT</version>
+ <version>3.1.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimafit-junit</artifactId>
- <version>2.5.1-SNAPSHOT</version>
++ <version>3.1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimafit-assertj</artifactId>
- <version>2.5.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimafit-legacy-support</artifactId>
- <version>2.5.1-SNAPSHOT</version>
++ <version>3.1.1-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --cc uimafit-assertj/pom.xml
index eab3ac3,0000000..61d4e60
mode 100644,000000..100644
--- a/uimafit-assertj/pom.xml
+++ b/uimafit-assertj/pom.xml
@@@ -1,47 -1,0 +1,47 @@@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimafit-parent</artifactId>
- <version>2.5.1-SNAPSHOT</version>
++ <version>3.1.1-SNAPSHOT</version>
+ <relativePath>../uimafit-parent</relativePath>
+ </parent>
+ <artifactId>uimafit-assertj</artifactId>
+ <name>Apache UIMA uimaFIT - AssertJ support</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimafit-core</artifactId>
- <version>2.5.1-SNAPSHOT</version>
++ <version>3.1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ </dependency>
+ </dependencies>
+</project>
diff --cc uimafit-junit/pom.xml
index 6ff4d41,0000000..dead426
mode 100644,000000..100644
--- a/uimafit-junit/pom.xml
+++ b/uimafit-junit/pom.xml
@@@ -1,47 -1,0 +1,47 @@@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimafit-parent</artifactId>
- <version>2.5.1-SNAPSHOT</version>
++ <version>3.1.1-SNAPSHOT</version>
+ <relativePath>../uimafit-parent</relativePath>
+ </parent>
+ <artifactId>uimafit-junit</artifactId>
+ <name>Apache UIMA uimaFIT - JUnit support</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimafit-core</artifactId>
- <version>2.5.1-SNAPSHOT</version>
++ <version>3.1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+</project>
diff --cc uimafit-parent/pom.xml
index db55969,54355fb..0dc5850
--- a/uimafit-parent/pom.xml
+++ b/uimafit-parent/pom.xml
@@@ -173,8 -194,11 +194,12 @@@
</executions>
<configuration>
<failOnWarning>true</failOnWarning>
- <ignoredDependencies>
+ <ignoredDependencies combine.children="append">
+ <!--
+ - Logging is used via reflection and cannot be detected by Maven
+ -->
+ <ignoredDependency>junit:junit</ignoredDependency>
+ <ignoredDependency>org.slf4j:slf4j-simple</ignoredDependency>
</ignoredDependencies>
</configuration>
</plugin>