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/01/29 12:05:30 UTC
[uima-uimafit] 01/01: Merge branch 'master-v2' into
sync-master-with-master-v2
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch sync-master-with-master-v2
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git
commit e562089e70df3ff214284005fca191f878a0f0e8
Merge: 580482d 37323a2
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Wed Jan 29 13:05:17 2020 +0100
Merge branch 'master-v2' into sync-master-with-master-v2
* master-v2:
[UIMA-6182] Update findbugs configuration
[UIMA-6179] Update to parent-pom 13
# Conflicts:
# uimafit-parent/pom.xml
uimafit-parent/pom.xml | 38 +++++++++++++++++---------------------
1 file changed, 17 insertions(+), 21 deletions(-)
diff --cc uimafit-parent/pom.xml
index f4ad881,9802a26..ca363ce
--- a/uimafit-parent/pom.xml
+++ b/uimafit-parent/pom.xml
@@@ -23,10 -4,10 +23,10 @@@
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom</artifactId>
<relativePath />
- <version>12</version>
+ <version>13</version>
</parent>
<artifactId>uimafit-parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache UIMA uimaFIT - Parent</name>
<url>${uimaWebsiteUrl}</url>