[uima-uimaj] branch master-v2 updated: [UIMA-6141] add combine.self="override" back to element

[schor]

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

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


The following commit(s) were added to refs/heads/master-v2 by this push:
     new 219cb69  [UIMA-6141] add combine.self="override" back to 
<configuration> element
219cb69 is described below

commit 219cb69d4d989725087d5257956bb417a7a4f7fb
Author: Marshall Schor <m...@schor.com>
AuthorDate: Mon Nov 4 13:46:50 2019 -0500

    [UIMA-6141] add combine.self="override" back to <configuration> element
---
 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 599b8cf..a9ddf28 100644
--- a/uimaj-eclipse-update-site/pom.xml
+++ b/uimaj-eclipse-update-site/pom.xml
@@ -131,7 +131,7 @@
             <goals>
               <goal>run</goal>
             </goals>
-            <configuration>
+            <configuration combine.self="override">
               <target>
                 <taskdef classname="net.sf.antcontrib.logic.IfTask" name="if" 
/>