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/04/19 14:45:33 UTC
[uima-uimafit] branch release/3.1.0 updated (3ecb52a -> 53843df)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch release/3.1.0
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git.
from 3ecb52a Merge branch 'release/2.5.0' into release/3.1.0
add 04e4767 [NO JIRA] Update Eclipse metadata files
add 0770272 [NO JIRA] Reduce console output during build by commenting out println statements in test code and trying to suppress stack traces of expected exceptions
add 6613cee [UIMA-6223] Groovy plugin causes warning during build
add 7ff0da7 [UIMA-6223] Groovy plugin causes warning during build
add 5e296a1 Merge pull request #101 from apache/bugfix/UIMA-6223-UIMA-Groovy-plugin-causes-warning-during-build
add b464133 [UIMA-6222] XML-related unit test fails on Java 9+
add aa4cdea Merge pull request #100 from apache/bugfix/UIMA-6222-XML-related-unit-test-fails-on-Java-9
add c1cae24 [UIMA-6224] uimaFIT does not build on Java 14
add 6a6865a Merge pull request #102 from apache/bugfix/UIMA-6224-uimaFIT-does-not-build-on-Java-14
add 923b5cd Merge branch 'master-v2' into release/2.5.0
add d2b8df3 [NO JIRA] Fixed another HTML tag in the JavaDoc on which Java 14 may choke (depending on vendor)
new 53843df Merge branch 'release/2.5.0' into release/3.1.0
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
uimafit-core/.settings/org.eclipse.jdt.core.prefs | 1 +
.../org/apache/uima/fit/factory/package-info.java | 2 +-
.../org/apache/uima/fit/util/package-info.java | 6 +-
.../uima/fit/component/CasMultiplierTest.java | 14 ++---
.../fit/component/ViewCreatorAnnotatorTest.java | 62 +++++++++++++++----
.../fit/component/ViewTextCopierAnnotatorTest.java | 26 +++++++-
.../AnalysisEngineFactoryExternalResourceTest.java | 71 +++++++++++-----------
.../fit/factory/testRes/TestExternalResource.java | 2 +-
.../factory/testRes/TestSharedResourceObject.java | 3 +-
.../java/org/apache/uima/fit/util/CasUtilTest.java | 10 +--
.../org/apache/uima/fit/util/JCasUtilTest.java | 65 ++++++++++----------
uimafit-cpe/.settings/org.eclipse.jdt.core.prefs | 1 +
.../org/apache/uima/fit/cpe/CasMultiplierTest.java | 15 ++---
.../uima/fit/cpe/ExternalResourceFactoryTest.java | 14 +++--
.../.settings/org.eclipse.jdt.core.prefs | 1 +
.../.settings/org.eclipse.jdt.core.prefs | 1 +
uimafit-parent/pom.xml | 21 +++++++
.../.settings/org.eclipse.jdt.core.prefs | 1 +
18 files changed, 203 insertions(+), 113 deletions(-)
[uima-uimafit] 01/01: Merge branch 'release/2.5.0' into
release/3.1.0
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch release/3.1.0
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git
commit 53843dfdf963f45fae54a0ad7be6a9b50403a2bc
Merge: 3ecb52a d2b8df3
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Sun Apr 19 16:45:16 2020 +0200
Merge branch 'release/2.5.0' into release/3.1.0
* release/2.5.0:
[NO JIRA] Fixed another HTML tag in the JavaDoc on which Java 14 may choke (depending on vendor)
[UIMA-6224] uimaFIT does not build on Java 14
[NO JIRA] Reduce console output during build by commenting out println statements in test code and trying to suppress stack traces of expected exceptions
[UIMA-6223] Groovy plugin causes warning during build
[UIMA-6223] Groovy plugin causes warning during build
[NO JIRA] Update Eclipse metadata files
[UIMA-6222] XML-related unit test fails on Java 9+
% Conflicts:
% uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/converter/AnnotationLiteral.java
% uimafit-legacy-support/src/test/java/org/apache/uima/fit/component/ViewCreatorAnnotatorTest.java
% uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java
% uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testRes/TestExternalResource.java
% uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/testRes/TestSharedResourceObject.java
% uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/CasUtilTest.java
% uimafit-legacy-support/src/test/java/org/apache/uima/fit/util/JCasUtilTest.java
% uimafit-parent/pom.xml
uimafit-core/.settings/org.eclipse.jdt.core.prefs | 1 +
.../org/apache/uima/fit/factory/package-info.java | 2 +-
.../org/apache/uima/fit/util/package-info.java | 6 +-
.../uima/fit/component/CasMultiplierTest.java | 14 ++---
.../fit/component/ViewCreatorAnnotatorTest.java | 62 +++++++++++++++----
.../fit/component/ViewTextCopierAnnotatorTest.java | 26 +++++++-
.../AnalysisEngineFactoryExternalResourceTest.java | 71 +++++++++++-----------
.../fit/factory/testRes/TestExternalResource.java | 2 +-
.../factory/testRes/TestSharedResourceObject.java | 3 +-
.../java/org/apache/uima/fit/util/CasUtilTest.java | 10 +--
.../org/apache/uima/fit/util/JCasUtilTest.java | 65 ++++++++++----------
uimafit-cpe/.settings/org.eclipse.jdt.core.prefs | 1 +
.../org/apache/uima/fit/cpe/CasMultiplierTest.java | 15 ++---
.../uima/fit/cpe/ExternalResourceFactoryTest.java | 14 +++--
.../.settings/org.eclipse.jdt.core.prefs | 1 +
.../.settings/org.eclipse.jdt.core.prefs | 1 +
uimafit-parent/pom.xml | 21 +++++++
.../.settings/org.eclipse.jdt.core.prefs | 1 +
18 files changed, 203 insertions(+), 113 deletions(-)
diff --cc uimafit-cpe/src/test/java/org/apache/uima/fit/cpe/ExternalResourceFactoryTest.java
index bfcc0f5,06826f0..cb08362
--- a/uimafit-cpe/src/test/java/org/apache/uima/fit/cpe/ExternalResourceFactoryTest.java
+++ b/uimafit-cpe/src/test/java/org/apache/uima/fit/cpe/ExternalResourceFactoryTest.java
@@@ -74,10 -74,11 +74,11 @@@ public class ExternalResourceFactoryTes
/**
* Test resource list.
*/
+ @SuppressWarnings("javadoc")
@Test
public void testMultiValue() throws Exception {
- ExternalResourceDescription extDesc1 = createExternalResourceDescription(ResourceWithAssert.class);
- ExternalResourceDescription extDesc2 = createExternalResourceDescription(ResourceWithAssert.class);
+ ExternalResourceDescription extDesc1 = createResourceDescription(ResourceWithAssert.class);
+ ExternalResourceDescription extDesc2 = createResourceDescription(ResourceWithAssert.class);
AnalysisEngineDescription aed = createEngineDescription(MultiValuedResourceAE.class,
MultiValuedResourceAE.RES_RESOURCE_ARRAY, asList(extDesc1, extDesc2));
@@@ -134,15 -137,16 +137,16 @@@
/**
* Test nested resource lists.
*/
+ @SuppressWarnings("javadoc")
@Test
public void testMultiValue4() throws Exception {
- ExternalResourceDescription extDesc1 = createExternalResourceDescription(ResourceWithAssert.class);
- ExternalResourceDescription extDesc2 = createExternalResourceDescription(ResourceWithAssert.class);
+ ExternalResourceDescription extDesc1 = createResourceDescription(ResourceWithAssert.class);
+ ExternalResourceDescription extDesc2 = createResourceDescription(ResourceWithAssert.class);
- ExternalResourceDescription extDesc3 = createExternalResourceDescription(ResourceWithAssert.class);
- ExternalResourceDescription extDesc4 = createExternalResourceDescription(ResourceWithAssert.class);
+ ExternalResourceDescription extDesc3 = createResourceDescription(ResourceWithAssert.class);
+ ExternalResourceDescription extDesc4 = createResourceDescription(ResourceWithAssert.class);
- ExternalResourceDescription mv1 = createExternalResourceDescription(MultiValuedResource.class,
+ ExternalResourceDescription mv1 = createResourceDescription(MultiValuedResource.class,
MultiValuedResource.RES_RESOURCE_LIST, new ExternalResourceDescription[] { extDesc1,
extDesc2 });
diff --cc uimafit-parent/pom.xml
index 7ed2679,47ee364..ba82a57
--- a/uimafit-parent/pom.xml
+++ b/uimafit-parent/pom.xml
@@@ -401,11 -378,12 +421,12 @@@
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
+ <version>0.14.3</version>
<configuration>
- <parameter combine.children="append">
- <breakBuildBasedOnSemanticVersioning>true</breakBuildBasedOnSemanticVersioning>
- <reportOnlyFilename>true</reportOnlyFilename>
- <postAnalysisScript>${project.basedir}/../uimafit-parent/src/main/groovy/api-report.groovy</postAnalysisScript>
+ <parameter>
+ <onlyModified>true</onlyModified>
+ <!-- filter out classes with impl in their package or class name -->
+ <postAnalysisScript>${japicmp.postAnalysisScript}</postAnalysisScript>
</parameter>
</configuration>
</plugin>