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/26 20:27:12 UTC
[uima-uimafit] branch sync-master-v2-to-master created (now 384af43)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch sync-master-v2-to-master
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git.
at 384af43 Merge branch 'master-v2' into sync-master-v2-to-master
This branch includes the following new commits:
new 384af43 Merge branch 'master-v2' into sync-master-v2-to-master
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.
[uima-uimafit] 01/01: Merge branch 'master-v2' into
sync-master-v2-to-master
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch sync-master-v2-to-master
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git
commit 384af4348ef75ca036352231d8ba4fcb8b841e1e
Merge: bee0cbf a6bd86f
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Sun Apr 26 22:27:03 2020 +0200
Merge branch 'master-v2' into sync-master-v2-to-master
* master-v2:
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release uimafit-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
[UIMA-6223] Groovy plugin causes warning during build
[UIMA-6223] Groovy plugin causes warning during build
[UIMA-6222] XML-related unit test fails on Java 9+
[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+
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release uimafit-2.5.0
[NO JIRA] Move the japicmp section from plugins management to plugins otherwise it seems the proper location of the post-analysis script is not picked up
[NO JIRA] Updated README file for release.
[NO JIRA] Updated README file for release.
[NO JIRA] Updated README file for release.
[UIMA-6181]b Fix complaints about maven-plugin-plugin in Eclipse
% Conflicts:
% README
% pom.xml
% uimafit-benchmark/pom.xml
% uimafit-core/pom.xml
% uimafit-cpe/pom.xml
% uimafit-docbook/pom.xml
% uimafit-examples/pom.xml
% uimafit-legacy-support/pom.xml
% 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-maven-plugin/pom.xml
% uimafit-parent/pom.xml
% uimafit-spring/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/AnalysisEngineFactoryTest.java | 3 +-
.../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 | 43 +++++++++++--
.../.settings/org.eclipse.jdt.core.prefs | 1 +
19 files changed, 223 insertions(+), 118 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 2f03db4,47ee364..ff73e06
--- a/uimafit-parent/pom.xml
+++ b/uimafit-parent/pom.xml
@@@ -224,15 -201,15 +228,23 @@@
</configuration>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>3.0.3</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <!--
+ Normally this only gets executed during releases, but we want licenses to be checked on
+ every build to make sure the licenses are included in the PRs.
+ -->
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@@ -389,11 -378,12 +421,14 @@@
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
+ <version>0.14.3</version>
<configuration>
- <parameter>
+ <parameter combine.children="append">
+ <onlyModified>true</onlyModified>
+ <breakBuildBasedOnSemanticVersioning>true</breakBuildBasedOnSemanticVersioning>
+ <reportOnlyFilename>true</reportOnlyFilename>
- <postAnalysisScript>${project.basedir}/../uimafit-parent/src/main/groovy/api-report.groovy</postAnalysisScript>
+ <!-- filter out classes with impl in their package or class name -->
+ <postAnalysisScript>${japicmp.postAnalysisScript}</postAnalysisScript>
</parameter>
</configuration>
</plugin>