You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2019/11/04 18:32:54 UTC

[uima-uimaj] branch rc/uimaj-3.1.1 updated (1596339 -> f9ad933)

This is an automated email from the ASF dual-hosted git repository.

schor pushed a change to branch rc/uimaj-3.1.1
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.


    from 1596339  [maven-release-plugin] rollback the release of uimaj-eclipse-update-site-3.1.1
     new 20dced7  put combine.self on target for test
     new 0920a82  move combine.self=override to config element
     new f9ad933  [maven-release-plugin] prepare release uimaj-eclipse-update-site-3.1.1

The 3 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:
 uimaj-eclipse-update-site/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


[uima-uimaj] 02/03: move combine.self=override to config element

Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

schor pushed a commit to branch rc/uimaj-3.1.1
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git

commit 0920a820a11051163835c3dee8ffc13eea26f7eb
Author: Marshall Schor <ms...@schor.com>
AuthorDate: Mon Nov 4 13:31:14 2019 -0500

    move combine.self=override to config element
---
 uimaj-eclipse-update-site/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/uimaj-eclipse-update-site/pom.xml b/uimaj-eclipse-update-site/pom.xml
index 6852f55..0b3349f 100644
--- a/uimaj-eclipse-update-site/pom.xml
+++ b/uimaj-eclipse-update-site/pom.xml
@@ -132,8 +132,8 @@
             <goals>
               <goal>run</goal>
             </goals>
-            <configuration>
-              <target combine.self="override">
+            <configuration  combine.self="override">
+              <target>
                 <taskdef classname="net.sf.antcontrib.logic.IfTask" name="if" />
 
                 <condition property="eclipse.home" value="${uima-maven-build-eclipse-home}">


[uima-uimaj] 03/03: [maven-release-plugin] prepare release uimaj-eclipse-update-site-3.1.1

Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

schor pushed a commit to branch rc/uimaj-3.1.1
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git

commit f9ad933251727aae03c27a21d7cee01084a24912
Author: Marshall Schor <ms...@schor.com>
AuthorDate: Mon Nov 4 13:32:45 2019 -0500

    [maven-release-plugin] prepare release uimaj-eclipse-update-site-3.1.1
---
 uimaj-eclipse-update-site/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/uimaj-eclipse-update-site/pom.xml b/uimaj-eclipse-update-site/pom.xml
index 0b3349f..f217eb9 100644
--- a/uimaj-eclipse-update-site/pom.xml
+++ b/uimaj-eclipse-update-site/pom.xml
@@ -28,7 +28,7 @@
   </parent>
 
   <artifactId>uimaj-eclipse-update-site</artifactId>
-  <version>3.1.1-SNAPSHOT</version>
+  <version>3.1.1</version>
   <packaging>pom</packaging>
 
   <name>Apache UIMA Eclipse: ${project.artifactId}</name>
@@ -132,7 +132,7 @@
             <goals>
               <goal>run</goal>
             </goals>
-            <configuration  combine.self="override">
+            <configuration combine.self="override">
               <target>
                 <taskdef classname="net.sf.antcontrib.logic.IfTask" name="if" />
 


[uima-uimaj] 01/03: put combine.self on target for test

Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

schor pushed a commit to branch rc/uimaj-3.1.1
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git

commit 20dced7db33b8ae9a879dbf70c038df679a6587e
Author: Marshall Schor <ms...@schor.com>
AuthorDate: Mon Nov 4 13:24:40 2019 -0500

    put combine.self on target for test
---
 uimaj-eclipse-update-site/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uimaj-eclipse-update-site/pom.xml b/uimaj-eclipse-update-site/pom.xml
index 455b9ca..6852f55 100644
--- a/uimaj-eclipse-update-site/pom.xml
+++ b/uimaj-eclipse-update-site/pom.xml
@@ -133,7 +133,7 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <target>
+              <target combine.self="override">
                 <taskdef classname="net.sf.antcontrib.logic.IfTask" name="if" />
 
                 <condition property="eclipse.home" value="${uima-maven-build-eclipse-home}">