[uima-ruta] branch feature/UIMA-6359-Ruta-parameter-to-add-debug-annotations-to-indexes created (now 8ff9af3)

[pkluegl]

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

pkluegl pushed a change to branch 
feature/UIMA-6359-Ruta-parameter-to-add-debug-annotations-to-indexes
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


  at 8ff9af3  no jira - update uimaj version

No new revisions were added by this update.

[uima-ruta] branch feature/UIMA-6359-Ruta-parameter-to-add-debug-annotations-to-indexes updated (8ff9af3 -> ee6c431)

[pkluegl]

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

pkluegl pushed a change to branch 
feature/UIMA-6359-Ruta-parameter-to-add-debug-annotations-to-indexes
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 8ff9af3  no jira - update uimaj version
 add ee6c431  [UIMA-6359] Ruta: parameter to add debug annotations to 
indexes

No new revisions were added by this update.

Summary of changes:
 .../java/org/apache/uima/ruta/engine/Ruta.java | 13 +++---
 .../org/apache/uima/ruta/engine/RutaEngine.java| 11 -
 .../expression/feature/FeatureMatchExpression.java |  2 +-
 .../feature/SimpleFeatureExpression.java   |  4 +-
 .../uima/ruta/resource/MultiTreeWordList.java  |  1 -
 .../apache/uima/ruta/resource/TreeWordList.java|  1 -
 .../uima/ruta/rule/RutaAnnotationTypeMatcher.java  | 14 +++---
 .../java/org/apache/uima/ruta/utils/UIMAUtils.java |  8 ++--
 .../ruta/visitor/DebugInfoCollectorVisitor.java| 17 +++
 .../apache/uima/ruta/visitor/DebugInfoFactory.java | 52 +++---
 .../apache/uima/ruta/engine/RulesParamTest.java| 12 ++---
 .../java/org/apache/uima/ruta/engine/RutaTest.java |  7 +--
 .../AnnotationAddressExpressionTest.java   | 17 ---
 .../AnnotationFeatureExpressionTest.java   | 13 +++---
 .../annotation/AnnotationLabelExpressionTest.java  |  8 ++--
 .../AnnotationVariableExpressionTest.java  |  4 +-
 .../expression/feature/FeatureStructureTest.java   |  3 +-
 .../DebugAddToIndexesTest.java}| 41 +
 .../ruta/visitor/InlinedRulesExplanationTest.java  | 16 ---
 ruta-docbook/src/docbook/tools.ruta.overview.xml   | 14 ++
 20 files changed, 138 insertions(+), 120 deletions(-)
 copy ruta-core/src/test/java/org/apache/uima/ruta/{action/ConfigureTest.java 
=> visitor/DebugAddToIndexesTest.java} (53%)

[uima-ruta] branch main updated (8ff9af3 -> db0996d)

[pkluegl]

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

pkluegl pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 8ff9af3  no jira - update uimaj version
 add ee6c431  [UIMA-6359] Ruta: parameter to add debug annotations to 
indexes
 new db0996d  Merge pull request #52 from 
apache/feature/UIMA-6359-Ruta-parameter-to-add-debug-annotations-to-indexes

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:
 .../java/org/apache/uima/ruta/engine/Ruta.java | 13 +++---
 .../org/apache/uima/ruta/engine/RutaEngine.java| 11 -
 .../expression/feature/FeatureMatchExpression.java |  2 +-
 .../feature/SimpleFeatureExpression.java   |  4 +-
 .../uima/ruta/resource/MultiTreeWordList.java  |  1 -
 .../apache/uima/ruta/resource/TreeWordList.java|  1 -
 .../uima/ruta/rule/RutaAnnotationTypeMatcher.java  | 14 +++---
 .../java/org/apache/uima/ruta/utils/UIMAUtils.java |  8 ++--
 .../ruta/visitor/DebugInfoCollectorVisitor.java| 17 +++
 .../apache/uima/ruta/visitor/DebugInfoFactory.java | 52 +++---
 .../apache/uima/ruta/engine/RulesParamTest.java| 12 ++---
 .../java/org/apache/uima/ruta/engine/RutaTest.java |  7 +--
 .../AnnotationAddressExpressionTest.java   | 17 ---
 .../AnnotationFeatureExpressionTest.java   | 13 +++---
 .../annotation/AnnotationLabelExpressionTest.java  |  8 ++--
 .../AnnotationVariableExpressionTest.java  |  4 +-
 .../expression/feature/FeatureStructureTest.java   |  3 +-
 .../DebugAddToIndexesTest.java}| 41 +
 .../ruta/visitor/InlinedRulesExplanationTest.java  | 16 ---
 ruta-docbook/src/docbook/tools.ruta.overview.xml   | 14 ++
 20 files changed, 138 insertions(+), 120 deletions(-)
 copy ruta-core/src/test/java/org/apache/uima/ruta/{action/ConfigureTest.java 
=> visitor/DebugAddToIndexesTest.java} (53%)

[uima-ruta] 01/01: Merge pull request #52 from apache/feature/UIMA-6359-Ruta-parameter-to-add-debug-annotations-to-indexes

[pkluegl]

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

pkluegl pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git

commit db0996dae760a0a6446cb7ee8a5b80bbcd6adc86
Merge: 8ff9af3 ee6c431
Author: pkluegl 
AuthorDate: Wed May 5 21:48:24 2021 +0200

Merge pull request #52 from 
apache/feature/UIMA-6359-Ruta-parameter-to-add-debug-annotations-to-indexes

[UIMA-6359] Ruta: parameter to add debug annotations to indexes

 .../java/org/apache/uima/ruta/engine/Ruta.java | 13 ++---
 .../org/apache/uima/ruta/engine/RutaEngine.java| 11 +++-
 .../expression/feature/FeatureMatchExpression.java |  2 +-
 .../feature/SimpleFeatureExpression.java   |  4 +-
 .../uima/ruta/resource/MultiTreeWordList.java  |  1 -
 .../apache/uima/ruta/resource/TreeWordList.java|  1 -
 .../uima/ruta/rule/RutaAnnotationTypeMatcher.java  | 14 +++--
 .../java/org/apache/uima/ruta/utils/UIMAUtils.java |  8 +--
 .../ruta/visitor/DebugInfoCollectorVisitor.java| 17 +++---
 .../apache/uima/ruta/visitor/DebugInfoFactory.java | 52 +-
 .../apache/uima/ruta/engine/RulesParamTest.java| 12 ++---
 .../java/org/apache/uima/ruta/engine/RutaTest.java |  7 +--
 .../AnnotationAddressExpressionTest.java   | 17 +++---
 .../AnnotationFeatureExpressionTest.java   | 13 +++--
 .../annotation/AnnotationLabelExpressionTest.java  |  8 +--
 .../AnnotationVariableExpressionTest.java  |  4 +-
 .../expression/feature/FeatureStructureTest.java   |  3 +-
 .../uima/ruta/visitor/DebugAddToIndexesTest.java   | 63 ++
 .../ruta/visitor/InlinedRulesExplanationTest.java  | 16 +++---
 ruta-docbook/src/docbook/tools.ruta.overview.xml   | 14 +
 20 files changed, 178 insertions(+), 102 deletions(-)

[uima-ruta] branch main updated: no jira - add param to descriptor

[pkluegl]

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

pkluegl pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git


The following commit(s) were added to refs/heads/main by this push:
 new 87b1a32  no jira - add param to descriptor
87b1a32 is described below

commit 87b1a32755c8817177e07e658b5801dbaf84282c
Author: Peter Klügl 
AuthorDate: Wed May 5 21:59:33 2021 +0200

no jira - add param to descriptor
---
 .../src/main/resources/org/apache/uima/ruta/engine/BasicEngine.xml  | 6 ++
 1 file changed, 6 insertions(+)

diff --git 
a/ruta-core/src/main/resources/org/apache/uima/ruta/engine/BasicEngine.xml 
b/ruta-core/src/main/resources/org/apache/uima/ruta/engine/BasicEngine.xml
index 487c3b4..b789b81 100644
--- a/ruta-core/src/main/resources/org/apache/uima/ruta/engine/BasicEngine.xml
+++ b/ruta-core/src/main/resources/org/apache/uima/ruta/engine/BasicEngine.xml
@@ -58,6 +58,12 @@
 false
   
   
+debugAddToIndexes
+Boolean
+false
+false
+  
+  
 statistics
 Boolean
 false

[uima-ruta] branch main-v2 updated: [UIMA-6347] Ruta: Inconsistency TOTALCOUNT syntax

[pkluegl]

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

pkluegl pushed a commit to branch main-v2
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git


The following commit(s) were added to refs/heads/main-v2 by this push:
 new 7064b4e  [UIMA-6347] Ruta: Inconsistency TOTALCOUNT syntax
7064b4e is described below

commit 7064b4e3cd9dd45a9f4e62ee3035c7f4619b9e69
Author: Peter Klügl 
AuthorDate: Fri May 7 12:10:37 2021 +0200

[UIMA-6347] Ruta: Inconsistency TOTALCOUNT syntax
---
 ruta-docbook/src/docbook/tools.ruta.language.conditions.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruta-docbook/src/docbook/tools.ruta.language.conditions.xml 
b/ruta-docbook/src/docbook/tools.ruta.language.conditions.xml
index 0083747..7203419 100644
--- a/ruta-docbook/src/docbook/tools.ruta.language.conditions.xml
+++ b/ruta-docbook/src/docbook/tools.ruta.language.conditions.xml
@@ -892,7 +892,7 @@ n:NUM{PARSE(n.ct,var,"de")};]]>
 Definition:
   
   
-

+

   
 
 

[uima-ruta] branch main updated: [UIMA-6347] Ruta: Inconsistency TOTALCOUNT syntax

[pkluegl]

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

pkluegl pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git


The following commit(s) were added to refs/heads/main by this push:
 new 2dc46ce  [UIMA-6347] Ruta: Inconsistency TOTALCOUNT syntax
2dc46ce is described below

commit 2dc46ce46eeb1b6a7ca74f98a68036297d8bdfc0
Author: Peter Klügl 
AuthorDate: Fri May 7 12:11:30 2021 +0200

[UIMA-6347] Ruta: Inconsistency TOTALCOUNT syntax
---
 ruta-docbook/src/docbook/tools.ruta.language.conditions.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruta-docbook/src/docbook/tools.ruta.language.conditions.xml 
b/ruta-docbook/src/docbook/tools.ruta.language.conditions.xml
index 0083747..7203419 100644
--- a/ruta-docbook/src/docbook/tools.ruta.language.conditions.xml
+++ b/ruta-docbook/src/docbook/tools.ruta.language.conditions.xml
@@ -892,7 +892,7 @@ n:NUM{PARSE(n.ct,var,"de")};]]>
 Definition:
   
   
-

+

   
 
 

[uima-ruta] branch bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing created (now d4e5fa5)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


  at d4e5fa5  [UIMA-6346] Ruta Action ADD case FLOAT missing

This branch includes the following new commits:

 new d4e5fa5  [UIMA-6346] Ruta Action ADD case FLOAT missing

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-ruta] 01/01: [UIMA-6346] Ruta Action ADD case FLOAT missing

[pkluegl]

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

pkluegl pushed a commit to branch 
bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git

commit d4e5fa5f95002843b0a18559a5096a78862b9450
Author: Peter Klügl 
AuthorDate: Fri May 7 12:23:00 2021 +0200

[UIMA-6346] Ruta Action ADD case FLOAT missing

- add case
---
 .../java/org/apache/uima/ruta/action/AddAction.java|  4 +++-
 .../test/java/org/apache/uima/ruta/action/AddTest.java | 18 ++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ruta-core/src/main/java/org/apache/uima/ruta/action/AddAction.java 
b/ruta-core/src/main/java/org/apache/uima/ruta/action/AddAction.java
index 78a9c1a..ae455c2 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/action/AddAction.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/action/AddAction.java
@@ -73,13 +73,15 @@ public class AddAction extends AbstractRutaAction {
 list.add(((INumberExpression) each).getIntegerValue(context, stream));
   } else if (vgtype.equals(Double.class) && each instanceof 
INumberExpression) {
 list.add(((INumberExpression) each).getDoubleValue(context, stream));
+  } else if (vgtype.equals(Float.class) && each instanceof 
INumberExpression) {
+list.add(((INumberExpression) each).getFloatValue(context, stream));
   } else if (vgtype.equals(Type.class) && each instanceof ITypeExpression) 
{
 list.add(((ITypeExpression) each).getType(context, stream));
   } else if (vgtype.equals(String.class) && each instanceof 
IStringExpression) {
 list.add(((IStringExpression) each).getStringValue(context, stream));
   } else if (vgtype.equals(AnnotationFS.class) && each instanceof 
IAnnotationExpression) {
 AnnotationFS annotation = ((IAnnotationExpression) 
each).getAnnotation(context, stream);
-if(annotation != null) {
+if (annotation != null) {
   list.add(annotation);
 }
   } else if (each instanceof ListExpression) {
diff --git a/ruta-core/src/test/java/org/apache/uima/ruta/action/AddTest.java 
b/ruta-core/src/test/java/org/apache/uima/ruta/action/AddTest.java
index faa55c6..7e882b2 100644
--- a/ruta-core/src/test/java/org/apache/uima/ruta/action/AddTest.java
+++ b/ruta-core/src/test/java/org/apache/uima/ruta/action/AddTest.java
@@ -47,6 +47,24 @@ public class AddTest {
   }
 
   @Test
+  public void testFloat() throws Exception {
+String document = "Some text.";
+String script = "";
+script += "FLOATLIST fs;";
+script += "CW{-> ADD(fs,3)};";
+script += "Document{SIZE(fs,1,1)->T1};";
+script += "SW{-> ADD(fs,4)};";
+script += "Document{SIZE(fs,2,2)->T2};";
+
+CAS cas = RutaTestUtils.getCAS(document);
+Ruta.apply(cas, script);
+
+RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Some text.");
+RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "Some text.");
+RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "Some");
+  }
+
+  @Test
   public void testVariable() throws Exception {
 String document = "This is a test.";
 

[uima-ruta] branch bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing updated (d4e5fa5 -> dee9abe)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from d4e5fa5  [UIMA-6346] Ruta Action ADD case FLOAT missing
 add dee9abe  [UIMA-6346] Ruta Action ADD case FLOAT missing

No new revisions were added by this update.

Summary of changes:
 ruta-core/src/test/java/org/apache/uima/ruta/action/AddTest.java | 1 -
 1 file changed, 1 deletion(-)

[uima-ruta] branch bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing updated (dee9abe -> ee35c98)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from dee9abe  [UIMA-6346] Ruta Action ADD case FLOAT missing
 add ee35c98  [UIMA-6346] Ruta Action ADD case FLOAT missing

No new revisions were added by this update.

Summary of changes:
 .../src/main/java/org/apache/uima/ruta/action/RemoveAction.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

[uima-ruta] branch main-v2 updated (7064b4e -> 69dbd3b)

[pkluegl]

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

pkluegl pushed a change to branch main-v2
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 7064b4e  [UIMA-6347] Ruta: Inconsistency TOTALCOUNT syntax
 add d4e5fa5  [UIMA-6346] Ruta Action ADD case FLOAT missing
 add dee9abe  [UIMA-6346] Ruta Action ADD case FLOAT missing
 add ee35c98  [UIMA-6346] Ruta Action ADD case FLOAT missing
 new 69dbd3b  Merge pull request #53 from 
apache/bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing

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:
 .../java/org/apache/uima/ruta/action/AddAction.java |  4 +++-
 .../java/org/apache/uima/ruta/action/RemoveAction.java  |  6 +-
 .../test/java/org/apache/uima/ruta/action/AddTest.java  | 17 +
 3 files changed, 25 insertions(+), 2 deletions(-)

[uima-ruta] 01/01: Merge pull request #53 from apache/bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing

[pkluegl]

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

pkluegl pushed a commit to branch main-v2
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git

commit 69dbd3ba4970275b93eaba2df6ab0858e171a92d
Merge: 7064b4e ee35c98
Author: pkluegl 
AuthorDate: Fri May 7 13:55:25 2021 +0200

Merge pull request #53 from 
apache/bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing

[UIMA-6346] Ruta Action ADD case FLOAT missing

 .../java/org/apache/uima/ruta/action/AddAction.java |  4 +++-
 .../java/org/apache/uima/ruta/action/RemoveAction.java  |  6 +-
 .../test/java/org/apache/uima/ruta/action/AddTest.java  | 17 +
 3 files changed, 25 insertions(+), 2 deletions(-)

[uima-ruta] 01/01: Merge branch 'main' into bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing

[pkluegl]

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

pkluegl pushed a commit to branch 
bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git

commit 87da060c8b451c9c92a22f9d09310f4396eaaf98
Merge: ee35c98 2dc46ce
Author: Peter Klügl 
AuthorDate: Fri May 7 13:56:15 2021 +0200

Merge branch 'main' into bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing

 README |   5 +-
 RELEASE_NOTES.html |  25 ++-
 .../ruta-ep-example-extensions/.gitignore  |   2 +-
 .../ruta-ep-example-extensions/pom.xml |   3 +-
 example-projects/ruta-maven-example/pom.xml|   2 +-
 pom.xml|  10 +-
 ruta-basic-type/pom.xml|   2 +-
 .../java/org/apache/uima/ruta/type/RutaBasic.java  |  85 +--
 .../org/apache/uima/ruta/type/RutaBasic_Type.java  | 107 -
 ruta-core-ext/pom.xml  |   2 +-
 ruta-core/pom.xml  |   3 +-
 .../java/org/apache/uima/ruta/FilterManager.java   |   7 +-
 .../java/org/apache/uima/ruta/RutaEnvironment.java |   1 -
 .../main/java/org/apache/uima/ruta/RutaStream.java | 113 ++
 .../apache/uima/ruta/condition/NearCondition.java  |   2 +-
 .../java/org/apache/uima/ruta/engine/Ruta.java |  13 +-
 .../org/apache/uima/ruta/engine/RutaEngine.java|  11 +-
 .../expression/feature/FeatureMatchExpression.java |   2 +-
 .../feature/SimpleFeatureExpression.java   |   4 +-
 .../uima/ruta/resource/MultiTreeWordList.java  |   3 +-
 .../apache/uima/ruta/resource/TreeWordList.java|   3 +-
 .../uima/ruta/rule/AnnotationListFSIterator.java   |  94 
 .../uima/ruta/rule/RutaAnnotationTypeMatcher.java  | 246 -
 .../apache/uima/ruta/rule/WildCardRuleElement.java |  32 ++-
 .../java/org/apache/uima/ruta/utils/UIMAUtils.java |   8 +-
 .../ruta/visitor/DebugInfoCollectorVisitor.java|  17 +-
 .../apache/uima/ruta/visitor/DebugInfoFactory.java |  52 ++---
 .../org/apache/uima/ruta/engine/BasicEngine.xml|   6 +
 .../apache/uima/ruta/ReindexUpdateModeTest.java|   2 +
 .../uima/ruta/engine/MultipleSeedersTest.java  | 100 -
 .../apache/uima/ruta/engine/RulesParamTest.java|  12 +-
 .../java/org/apache/uima/ruta/engine/RutaTest.java |   7 +-
 .../AnnotationAddressExpressionTest.java   |  17 +-
 .../AnnotationFeatureExpressionTest.java   |  13 +-
 .../annotation/AnnotationLabelExpressionTest.java  |   8 +-
 .../AnnotationVariableExpressionTest.java  |   4 +-
 .../expression/feature/FeatureStructureTest.java   |   3 +-
 .../apache/uima/ruta/resource/CSVTableTest.java| 150 ++---
 .../org/apache/uima/ruta/rule/WildCard2Test.java   |  17 +-
 .../uima/ruta/visitor/DebugAddToIndexesTest.java   |  63 ++
 .../ruta/visitor/InlinedRulesExplanationTest.java  |  16 +-
 ruta-docbook/pom.xml   |   3 +-
 ruta-docbook/src/docbook/tools.ruta.howtos.xml |   8 +-
 .../tools.ruta.language.internal_indexing.xml  |  52 ++---
 ruta-docbook/src/docbook/tools.ruta.overview.xml   |  14 ++
 ruta-eclipse-feature/pom.xml   |   2 +-
 ruta-eclipse-update-site/category.xml  |   2 +-
 ruta-eclipse-update-site/pom.xml   |  22 +-
 ruta-ep-addons/pom.xml |   2 +-
 .../uima/ruta/cde/ui/ConstraintSelectView.java |   3 +-
 .../org/apache/uima/ruta/cde/ui/DocumentView.java  |   3 +-
 .../org/apache/uima/ruta/cde/ui/ResultView.java|   2 +-
 .../uima/ruta/check/AnnotationCheckView.java   |   2 +-
 .../apache/uima/ruta/explain/apply/ApplyView.java  |   2 +-
 .../uima/ruta/explain/createdBy/CreatedByView.java |   4 +-
 .../uima/ruta/explain/element/ElementView.java |   2 +-
 .../uima/ruta/explain/failed/FailedView.java   |   2 +-
 .../uima/ruta/explain/inlined/InlinedView.java |   2 +-
 .../uima/ruta/explain/matched/MatchedView.java |   2 +-
 .../uima/ruta/explain/rulelist/RuleListView.java   |   2 +-
 .../explain/selection/ExplainSelectionView.java|   2 +-
 .../apache/uima/ruta/explain/tree/ExplainTree.java |   6 +-
 .../ruta/explain/tree/RuleElementMatchNode.java|   7 +-
 .../org/apache/uima/ruta/query/ui/QueryView.java   |   6 +-
 .../uima/ruta/statistics/StatisticsView.java   |   5 +-
 .../ruta/testing/ui/views/TestPageBookView.java|   5 +-
 .../testing/ui/views/fn/FalseNegativeView.java |   3 +-
 .../testing/ui/views/fp/FalsePositiveView.java |   3 +-
 .../ruta/testing/ui/views/tp/TruePositiveView.java |   5 +-
 ruta-ep-caseditor/.gitignore   |   2 +-
 ruta-ep-caseditor/pom.xml  |   2 +-
 .../view/browser/AnnotationBrowserView.java|   2 -
 .../uima/ruta/caseditor/view/html/HtmlView.java|  47 ++--
 .../caseditor/view

[uima-ruta] branch bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing updated (ee35c98 -> 87da060)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from ee35c98  [UIMA-6346] Ruta Action ADD case FLOAT missing
 add 3c8c8d3  no jira - prepare ruta v3 for testing uimaj-core rc
 add 9d7c340  no jira - prepare ruta v3 for testing uimaj-core rc
 add 7063210  no jira - remove test type system
 add b70cb79  no jira - avoid compile errors with workarounds
 add dbc9ccf  no jira - uima v3 SNAPSHOT
 add 8773566  no jira - update to released uimaj v3 beta
 add 62a5374  no jira - update cover class
 add 5bc2227  no jira - make it compatible to latest uimaFIT, updated 
uimaj-core version
 add 7702db9  no jira - update readme/notes
 add 35f4bd6  no jira - merge ruta v2 to ruta v3
 add 9193a36  no jira - cleanup usage of commons-lang
 add 640be17  UIMA-6024: apply cleanup of 2.7.0
 add 05a03e5  UIMA-6024: apply changes of v2
 add 3841fec  UIMA-6024: clean up
 add bc4c066  no jira- update urls, update versions
 add 5d0b0f8  no jira- update urls
 add 513abbe  UIMA-5997: skip japicmp
 add 0c6acc1  UIMA-6093: update parent version
 add caa4e84  UIMA-6118: uima version
 add aed53d7  UIMA-6024: manual merge with ruta 2.8.0 rc1
 add 1bec99e  UIMA-6024: fixed merge errors
 add 0235ca2  UIMA-6024: clean up in failing test
 add 8a1da3f  UIMA-6024: fixed test
 add 2a90a51  UIMA-6024: fixed generics
 add 27b4d9f  UIMA-6024: manual merge with v2
 add 59aa3b3  UIMA-4676: fixed imports broken by manual merge
 add 4c1175c  no jira - fixed layout in docs
 add b5009d9  UIMA-6150: fix right to left match in window by simplifying 
code, avoid using subiterators in uima v3
 add 09b7f2f  UIMA-6150: fixed tests, added missing emptyIsInvisible check
 add c19a8f2  UIMA-6150: avoid using subiterators in filter
 add bbaf75e  UIMA-6154: fixed move on check
 add faffea5  [maven-release-plugin] prepare release ruta-3.0.0
 add 74a6825  [maven-release-plugin] prepare for next development iteration
 add e485640  no jira - manual rollback
 add 1183353  no jira - remove permgen mention
 add c281e2f  no jira - update some example v2 versions, fixed some typos
 add 865129c  no jira - fixed scm urls
 add 2801832  [maven-release-plugin] prepare release ruta-3.0.0
 add f31f835  [maven-release-plugin] prepare for next development iteration
 add 3a208f6  no jira - manual rollback
 add acecd9e  [maven-release-plugin] prepare release ruta-3.0.0
 add e1631ed  [maven-release-plugin] prepare for next development iteration
 add d7c7907  no jira - manual rollback
 add 74257dc  [maven-release-plugin] prepare release ruta-3.0.0
 add ed79ca4  [maven-release-plugin] prepare for next development iteration
 add 0d961d8  no jira - manual rollback
 add 6d06e5a  no jira - fix eclispe update site link to v3
 add 32de728  no jira - avoid problems in jenkins job
 add ca1ccb3  [maven-release-plugin] prepare release ruta-3.0.0
 add 7ac7501  [maven-release-plugin] prepare for next development iteration
 add 7417f02  no jira - manual rollback
 add dd29013  no jira fix jira version, improve readme/release-notes
 add 9dd61c8  no jira - improve release-notes
 add 1d7e2b2  no jira - improve release-notes
 add d69e99d  [maven-release-plugin] prepare release ruta-3.0.0
 add f24224c  [maven-release-plugin] prepare for next development iteration
 add f2262f6  no jira - fix readme/release-notes according rc review
 add 01d2a40  UIMA-6183: fix NPE and visibility problems of literal string 
matches in v3, behavior adapted in order to avoid unexpected matching within 
tokens
 add e2de91f  no jira - preparations fro next release - updated versions - 
updated jira version - updated release notes
 add 1d9cce9  no jira - update updatesite version
 add 92b35ed  merged v2: UIMA-6195, UIMA-6194, UIMA-6193, UIMA-6192, 
UIMA-6191, UIMA-6183, UIMA-6171
 add f5fb57b  [maven-release-plugin] prepare release ruta-3.0.1
 add fdc9355  [maven-release-plugin] prepare for next development iteration
 add 7d8eeec  no jira - manual rollback
 add 0fe2c34  UIMA-6194: merge v2 changes
 add ab7d1f0  [maven-release-plugin] prepare release ruta-3.0.1
 add 2c049ed  [maven-release-plugin] prepare for next development iteration
 add ecde41d  [NO JIRA] Copying v3 code to a branch under the v2 spot so it 
gets included in the GitHub mirror.
 add ed91636  [UIMA-6231] Reducing memory pressure generated by UIMA Ruta
 add 723d532  [UIMA-6231] Reducing memory pressure generated by UIMA Ruta
 add 2f835d3  Merge branch 'master' into 
UIMA-6233-Failing-unit-tests-depending-on-test-execution-order
 add 22085e1  Merge pull request #3 from 
apache/UIMA-6233-Failing-

[uima-ruta] branch main updated (2dc46ce -> 87da060)

[pkluegl]

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

pkluegl pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 2dc46ce  [UIMA-6347] Ruta: Inconsistency TOTALCOUNT syntax
 add 9df9606  Merge pull request #49 from 
apache/bugfix/UIMA-6345-RutaBasicUtils-should-not-require-RutaBasic-type
 add 7064b4e  [UIMA-6347] Ruta: Inconsistency TOTALCOUNT syntax
 add d4e5fa5  [UIMA-6346] Ruta Action ADD case FLOAT missing
 add dee9abe  [UIMA-6346] Ruta Action ADD case FLOAT missing
 add ee35c98  [UIMA-6346] Ruta Action ADD case FLOAT missing
 add 87da060  Merge branch 'main' into 
bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing

No new revisions were added by this update.

Summary of changes:
 .../java/org/apache/uima/ruta/action/AddAction.java |  4 +++-
 .../java/org/apache/uima/ruta/action/RemoveAction.java  |  6 +-
 .../test/java/org/apache/uima/ruta/action/AddTest.java  | 17 +
 3 files changed, 25 insertions(+), 2 deletions(-)

[uima-ruta] branch feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0 updated (accfec3 -> c1af638)

[pkluegl]

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

pkluegl pushed a change to branch 
feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from accfec3  Merge branch 'main' into 
feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0
 add 3943512  Merge pull request #35 from 
apache/feature/UIMA-6341-Try-out-p2-layout-resolver-v2
 add ef22099  UIMA-6343: Ruta should provide config parameters to ease type 
disambiguation
 add fcd5344  UIMA-6343: Ruta should provide config parameters to ease type 
disambiguation
 add 910f065  Merge pull request #37 from 
apache/feature/UIMA-6343-Ruta-should-provide-config-parameters-to-ease-type-disambiguation
 add 2ff9175  [UIMA-6344] Ruta: ConjunctRules fires without justification
 add 8a78b08  Merge pull request #39 from 
apache/bugfix/UIMA-6344-Ruta-ConjunctRules-fires-without-justification
 add 16ebbea  [UIMA-6255] Ruta: font and syntax coloring in dark mode in 
Ruta Workbench
 add b27b8f1  Merge pull request #40 from 
apache/feature/UIMA-6255-Ruta-font-and-syntax-coloring-in-dark-mode
 add bf7b081  [UIMA-6213] Ruta: LayerInstantiationException in 
LaunchDelegate using newer Java versions
 add e36684c  Merge pull request #42 from 
apache/bugfix/UIMA-6213-Ruta-LayerInstantiationException
 add 94494d2  [UIMA-6247] Ruta: not able to check label expression on null 
as implicit condition
 add dc1a402  Merge pull request #44 from 
apache/bugfix/UIMA-6247-Ruta-not-able-to-check-label-expression-on-null-as-implicit-condition
 add 9b0bd51  [UIMA-6309] Ruta: fallback in failed wildcard lookahead
 add 0a303ee  Merge pull request #46 from 
apache/bugfix/UIMA-6309-Ruta-fallback-in-failed-wildcard-lookahead
 add d49c0c4  [UIMA-6345] RutaBasicUtils should not require RutaBasic type
 add 9df9606  Merge pull request #49 from 
apache/bugfix/UIMA-6345-RutaBasicUtils-should-not-require-RutaBasic-type
 add 7064b4e  [UIMA-6347] Ruta: Inconsistency TOTALCOUNT syntax
 add d4e5fa5  [UIMA-6346] Ruta Action ADD case FLOAT missing
 add dee9abe  [UIMA-6346] Ruta Action ADD case FLOAT missing
 add ee35c98  [UIMA-6346] Ruta Action ADD case FLOAT missing
 add 80a1fcb  Merge branch 'main' into 
feature/UIMA-6343-Ruta-should-provide-config-parameters-to-ease-type-disambiguation
 add bef7112  Merge pull request #38 from 
apache/feature/UIMA-6343-Ruta-should-provide-config-parameters-to-ease-type-disambiguation
 add 9e67426  Merge branch 'main' into 
bugfix/UIMA-6344-Ruta-ConjunctRules-fires-without-justification
 add 9e2880a  Merge pull request #41 from 
apache/bugfix/UIMA-6344-Ruta-ConjunctRules-fires-without-justification
 add 987d01d  no jira -  adapt version to next minor release
 add 0a0edc8  Merge branch 'main' into 
feature/UIMA-6255-Ruta-font-and-syntax-coloring-in-dark-mode
 add 2dc79f1  Merge pull request #43 from 
apache/feature/UIMA-6255-Ruta-font-and-syntax-coloring-in-dark-mode
 add c8bba8f  Merge branch 'main' into 
bugfix/UIMA-6213-Ruta-LayerInstantiationException
 add 1e8b42a  Merge pull request #45 from 
apache/bugfix/UIMA-6213-Ruta-LayerInstantiationException
 add 0287dee  Merge branch 'main' into 
bugfix/UIMA-6247-Ruta-not-able-to-check-label-expression-on-null-as-implicit-condition
 add ad19310  Merge pull request #47 from 
apache/bugfix/UIMA-6247-Ruta-not-able-to-check-label-expression-on-null-as-implicit-condition
 add 15c9167  Merge branch 'main' into 
bugfix/UIMA-6309-Ruta-fallback-in-failed-wildcard-lookahead
 add 8784d50  Merge pull request #48 from 
apache/bugfix/UIMA-6309-Ruta-fallback-in-failed-wildcard-lookahead
 add 13ff863  Merge branch 'main' into 
bugfix/UIMA-6345-RutaBasicUtils-should-not-require-RutaBasic-type
 add d27aee0  Merge pull request #50 from 
apache/bugfix/UIMA-6345-RutaBasicUtils-should-not-require-RutaBasic-type
 add 6de2911  [UIMA-6356] Ruta: option to indentify groups of eval 
annotations
 add d73d9ee  Merge pull request #51 from 
apache/UIMA-6356-Ruta-option-to-indentify-groups-of-eval-annotations
 add 8ff9af3  no jira - update uimaj version
 add ee6c431  [UIMA-6359] Ruta: parameter to add debug annotations to 
indexes
 add db0996d  Merge pull request #52 from 
apache/feature/UIMA-6359-Ruta-parameter-to-add-debug-annotations-to-indexes
 add 87b1a32  no jira - add param to descriptor
 add 2dc46ce  [UIMA-6347] Ruta: Inconsistency TOTALCOUNT syntax
 add 87da060  Merge branch 'main' into 
bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing
 add c1af638  Merge branch 'main' into 
feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0

No new revisions were added by this update.

Summary of changes:
 .../ruta-ep-example-extensions/pom.xml |  2 +-
 example-project

[uima-ruta] 01/01: [UIMA-6219] Logger errors when running Ruta script

[pkluegl]

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

pkluegl pushed a commit to branch 
bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git

commit 2eff6e4f93e6a6966b84ec8b2d64d883d65467c4
Author: Peter Klügl 
AuthorDate: Fri May 7 14:14:36 2021 +0200

[UIMA-6219] Logger errors when running Ruta script

- update bundle imports
---
 ruta-ep-engine/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruta-ep-engine/pom.xml b/ruta-ep-engine/pom.xml
index 8177277..c8d0d39 100644
--- a/ruta-ep-engine/pom.xml
+++ b/ruta-ep-engine/pom.xml
@@ -236,6 +236,7 @@
   org.apache.uima.ruta.condition,
   org.apache.uima.ruta.constraint,
   org.apache.uima.ruta.descriptor,
+  org.apache.uima.ruta.cache,
   org.apache.uima.ruta.engine,
   org.apache.uima.ruta.expression,
   org.apache.uima.ruta.expression.annotation,
@@ -275,7 +276,7 @@
 
 
 
-  
+  org.slf4j*,
   org.apache.uima.*,
   !bsh, !com.sun.net.httpserver,
   !edu.emory.mathcs.backport.java.util.concurrent,

[uima-ruta] branch bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script created (now 2eff6e4)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


  at 2eff6e4  [UIMA-6219] Logger errors when running Ruta script

This branch includes the following new commits:

 new 2eff6e4  [UIMA-6219] Logger errors when running Ruta script

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-ruta] 01/01: [UIMA-6241] Ruta maven plugin does not fail the build when it fails

[pkluegl]

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

pkluegl pushed a commit to branch 
bugfix/UIMA-6241-Ruta-maven-plugin-does-not-fail-the-build-when-it-fails
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git

commit 79989c78180b43f6eb985df36eea5a2f7e3f21a1
Author: Peter Klügl 
AuthorDate: Fri May 7 15:05:15 2021 +0200

[UIMA-6241] Ruta maven plugin does not fail the build when it fails

- adding failOnError with default true
---
 .../ruta/maven/RutaGenerateDescriptorMojo.java | 40 ++-
 .../uima/ruta/maven/RutaGenerateMTWLMojo.java  | 45 +++---
 .../uima/ruta/maven/RutaGenerateTWLMojo.java   | 42 +---
 3 files changed, 91 insertions(+), 36 deletions(-)

diff --git 
a/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java
 
b/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java
index 8c39071..7165b50 100644
--- 
a/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java
+++ 
b/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java
@@ -198,6 +198,12 @@ public class RutaGenerateDescriptorMojo extends 
AbstractMojo {
   @Parameter(required = false)
   private String[] buildPaths;
 
+  /**
+   * Fail on error.
+   */
+  @Parameter(defaultValue = "true", required = true)
+  private boolean failOnError;
+
   @Override
   public void execute() throws MojoExecutionException, MojoFailureException {
 
@@ -267,14 +273,14 @@ public class RutaGenerateDescriptorMojo extends 
AbstractMojo {
   try {
 factory.setDefaultTypeSystem(typeSystemTemplate.toURI().toURL());
   } catch (MalformedURLException e) {
-getLog().warn("Failed to get URL of " + typeSystemTemplate, e);
+handleError("Failed to get URL of " + analysisEngineTemplate, e);
   }
 }
 if (analysisEngineTemplate != null) {
   try {
 factory.setDefaultEngine(analysisEngineTemplate.toURI().toURL());
   } catch (MalformedURLException e) {
-getLog().warn("Failed to get URL of " + analysisEngineTemplate, e);
+handleError("Failed to get URL of " + analysisEngineTemplate, e);
   }
 }
 
@@ -303,9 +309,9 @@ public class RutaGenerateDescriptorMojo extends 
AbstractMojo {
 options);
 toBuild.add(descriptorInformation);
   } catch (RecognitionException re) {
-getLog().warn("Failed to parse UIMA Ruta script file: " + 
file.getAbsolutePath(), re);
+handleError("Failed to parse UIMA Ruta script file: " + 
file.getAbsolutePath(), re);
   } catch (IOException ioe) {
-getLog().warn("Failed to load UIMA Ruta script file: " + 
file.getAbsolutePath(), ioe);
+handleError("Failed to load UIMA Ruta script file: " + 
file.getAbsolutePath(), ioe);
   }
 }
 
@@ -335,7 +341,7 @@ public class RutaGenerateDescriptorMojo extends 
AbstractMojo {
 
 for (RutaDescriptorInformation eachFailed : toBuild) {
   String scriptName = eachFailed.getScriptName();
-  getLog().warn("Failed to build UIMA Ruta script: " + scriptName);
+  handleError("Failed to build UIMA Ruta script: " + scriptName);
 }
 
   }
@@ -498,7 +504,7 @@ public class RutaGenerateDescriptorMojo extends 
AbstractMojo {
 RutaGenerateDescriptorMojo.class.getClassLoader());
   }
 
-  private void addRutaNature() {
+  private void addRutaNature() throws MojoExecutionException {
 
 File projectDir = project.getFile().getParentFile();
 File projectFile = new File(projectDir, ".project");
@@ -534,14 +540,14 @@ public class RutaGenerateDescriptorMojo extends 
AbstractMojo {
 try {
   FileUtils.fileWrite(projectFile, encoding, string);
 } catch (IOException e) {
-  getLog().warn("Failed to write .project file", e);
+  handleError("Failed to write .project file", e);
 }
   }
   buildContext.refresh(projectFile);
 }
   }
 
-  private void addRutaBuildPath() {
+  private void addRutaBuildPath() throws MojoExecutionException {
 File projectDir = project.getFile().getParentFile();
 
 if (buildPaths == null || buildPaths.length == 0) {
@@ -575,7 +581,7 @@ public class RutaGenerateDescriptorMojo extends 
AbstractMojo {
   try {
 FileUtils.fileWrite(buildpathFile, encoding, string);
   } catch (IOException e) {
-getLog().warn("Failed to write .buildpath file", e);
+handleError("Failed to write .buildpath file", e);
   }
 }
 buildContext.refresh(buildpathFile);
@@ -611,4 +617,20 @@ public class RutaGenerateDescriptorMojo extends 
AbstractMojo {
 attributes.addChild(attribute);
 buildpathNode.addChild(buildpathentry);
   }
+
+  p

[uima-ruta] branch bugfix/UIMA-6241-Ruta-maven-plugin-does-not-fail-the-build-when-it-fails created (now 79989c7)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6241-Ruta-maven-plugin-does-not-fail-the-build-when-it-fails
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


  at 79989c7  [UIMA-6241] Ruta maven plugin does not fail the build when it 
fails

This branch includes the following new commits:

 new 79989c7  [UIMA-6241] Ruta maven plugin does not fail the build when it 
fails

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-ruta] branch main updated (87da060 -> 3fe408b)

[pkluegl]

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

pkluegl pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 87da060  Merge branch 'main' into 
bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing
 add 73f3eea  [UIMA-6337] Upgrade Ruta to UIMA 3.2.0 and uimaFIT 3.2.0
 add d538e7c  [UIMA-6337] Upgrade Ruta to UIMA 3.2.0 and uimaFIT 3.2.0
 add 56b791c  [UIMA-6337] Upgrade Ruta to UIMA 3.2.0 and uimaFIT 3.2.0
 add ad32207  [UIMA-6337] Upgrade Ruta to UIMA 3.2.0 and uimaFIT 3.2.0
 add e929139  [UIMA-6325] Update to UIMA Parent POM 14
 add cf1d0ff  [UIMA-6337] Upgrade Ruta to UIMA 3.2.0 and uimaFIT 3.2.0
 add accfec3  Merge branch 'main' into 
feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0
 add c1af638  Merge branch 'main' into 
feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0
 new 3fe408b  Merge pull request #29 from 
apache/feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.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:
 .../apache/uima/ruta/rule/WildCardRuleElement.java |  1 +
 .../uima/ruta/rule/WildCardInWindowTest.java   | 26 --
 ruta-parent/pom.xml| 14 +++-
 3 files changed, 34 insertions(+), 7 deletions(-)

[uima-ruta] 01/01: Merge pull request #29 from apache/feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0

[pkluegl]

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

pkluegl pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git

commit 3fe408bf346315972f57f08dea8789777e38f38d
Merge: 87da060 c1af638
Author: pkluegl 
AuthorDate: Fri May 7 15:06:18 2021 +0200

Merge pull request #29 from 
apache/feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0

[UIMA-6337] Upgrade Ruta to UIMA 3.2.0 and uimaFIT 3.2.0

 .../apache/uima/ruta/rule/WildCardRuleElement.java |  1 +
 .../uima/ruta/rule/WildCardInWindowTest.java   | 26 --
 ruta-parent/pom.xml| 14 +++-
 3 files changed, 34 insertions(+), 7 deletions(-)

[uima-ruta] branch bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script updated (2eff6e4 -> 3976a71)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 2eff6e4  [UIMA-6219] Logger errors when running Ruta script
 add 73f3eea  [UIMA-6337] Upgrade Ruta to UIMA 3.2.0 and uimaFIT 3.2.0
 add d538e7c  [UIMA-6337] Upgrade Ruta to UIMA 3.2.0 and uimaFIT 3.2.0
 add 56b791c  [UIMA-6337] Upgrade Ruta to UIMA 3.2.0 and uimaFIT 3.2.0
 add ad32207  [UIMA-6337] Upgrade Ruta to UIMA 3.2.0 and uimaFIT 3.2.0
 add e929139  [UIMA-6325] Update to UIMA Parent POM 14
 add cf1d0ff  [UIMA-6337] Upgrade Ruta to UIMA 3.2.0 and uimaFIT 3.2.0
 add accfec3  Merge branch 'main' into 
feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0
 add c1af638  Merge branch 'main' into 
feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0
 add 3fe408b  Merge pull request #29 from 
apache/feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0
 add 3976a71  Merge branch 'main' into 
bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script

No new revisions were added by this update.

Summary of changes:
 .../apache/uima/ruta/rule/WildCardRuleElement.java |  1 +
 .../uima/ruta/rule/WildCardInWindowTest.java   | 26 --
 ruta-parent/pom.xml| 14 +++-
 3 files changed, 34 insertions(+), 7 deletions(-)

[uima-ruta] branch main-v2 updated (69dbd3b -> ced7af9)

[pkluegl]

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

pkluegl pushed a change to branch main-v2
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 69dbd3b  Merge pull request #53 from 
apache/bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing
 add 79989c7  [UIMA-6241] Ruta maven plugin does not fail the build when it 
fails
 new ced7af9  Merge pull request #55 from 
apache/bugfix/UIMA-6241-Ruta-maven-plugin-does-not-fail-the-build-when-it-fails

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:
 .../ruta/maven/RutaGenerateDescriptorMojo.java | 40 ++-
 .../uima/ruta/maven/RutaGenerateMTWLMojo.java  | 45 +++---
 .../uima/ruta/maven/RutaGenerateTWLMojo.java   | 42 +---
 3 files changed, 91 insertions(+), 36 deletions(-)

[uima-ruta] 01/01: Merge pull request #55 from apache/bugfix/UIMA-6241-Ruta-maven-plugin-does-not-fail-the-build-when-it-fails

[pkluegl]

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

pkluegl pushed a commit to branch main-v2
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git

commit ced7af91dac772f7d4c425c4314a07d3e782243c
Merge: 69dbd3b 79989c7
Author: pkluegl 
AuthorDate: Fri May 7 15:28:24 2021 +0200

Merge pull request #55 from 
apache/bugfix/UIMA-6241-Ruta-maven-plugin-does-not-fail-the-build-when-it-fails

[UIMA-6241] Ruta maven plugin does not fail the build when it fails

 .../ruta/maven/RutaGenerateDescriptorMojo.java | 40 ++-
 .../uima/ruta/maven/RutaGenerateMTWLMojo.java  | 45 +++---
 .../uima/ruta/maven/RutaGenerateTWLMojo.java   | 42 +---
 3 files changed, 91 insertions(+), 36 deletions(-)

[uima-ruta] 01/01: Merge branch 'main' into bugfix/UIMA-6241-Ruta-maven-plugin-does-not-fail-the-build-when-it-fails

[pkluegl]

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

pkluegl pushed a commit to branch 
bugfix/UIMA-6241-Ruta-maven-plugin-does-not-fail-the-build-when-it-fails
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git

commit 5ea4fd78cd29e28ae5f3fc8c3d49d9607b082bc2
Merge: 79989c7 3fe408b
Author: Peter Klügl 
AuthorDate: Fri May 7 15:32:10 2021 +0200

Merge branch 'main' into 
bugfix/UIMA-6241-Ruta-maven-plugin-does-not-fail-the-build-when-it-fails

 README |   5 +-
 RELEASE_NOTES.html |  25 ++-
 .../ruta-ep-example-extensions/.gitignore  |   2 +-
 .../ruta-ep-example-extensions/pom.xml |   3 +-
 example-projects/ruta-maven-example/pom.xml|   2 +-
 pom.xml|  10 +-
 ruta-basic-type/pom.xml|   2 +-
 .../java/org/apache/uima/ruta/type/RutaBasic.java  |  85 +--
 .../org/apache/uima/ruta/type/RutaBasic_Type.java  | 107 -
 ruta-core-ext/pom.xml  |   2 +-
 ruta-core/pom.xml  |   3 +-
 .../java/org/apache/uima/ruta/FilterManager.java   |   7 +-
 .../java/org/apache/uima/ruta/RutaEnvironment.java |   1 -
 .../main/java/org/apache/uima/ruta/RutaStream.java | 113 ++
 .../apache/uima/ruta/condition/NearCondition.java  |   2 +-
 .../java/org/apache/uima/ruta/engine/Ruta.java |  13 +-
 .../org/apache/uima/ruta/engine/RutaEngine.java|  11 +-
 .../expression/feature/FeatureMatchExpression.java |   2 +-
 .../feature/SimpleFeatureExpression.java   |   4 +-
 .../uima/ruta/resource/MultiTreeWordList.java  |   3 +-
 .../apache/uima/ruta/resource/TreeWordList.java|   3 +-
 .../uima/ruta/rule/AnnotationListFSIterator.java   |  94 
 .../uima/ruta/rule/RutaAnnotationTypeMatcher.java  | 246 -
 .../apache/uima/ruta/rule/WildCardRuleElement.java |  33 ++-
 .../java/org/apache/uima/ruta/utils/UIMAUtils.java |   8 +-
 .../ruta/visitor/DebugInfoCollectorVisitor.java|  17 +-
 .../apache/uima/ruta/visitor/DebugInfoFactory.java |  52 ++---
 .../org/apache/uima/ruta/engine/BasicEngine.xml|   6 +
 .../apache/uima/ruta/ReindexUpdateModeTest.java|   2 +
 .../uima/ruta/engine/MultipleSeedersTest.java  | 100 -
 .../apache/uima/ruta/engine/RulesParamTest.java|  12 +-
 .../java/org/apache/uima/ruta/engine/RutaTest.java |   7 +-
 .../AnnotationAddressExpressionTest.java   |  17 +-
 .../AnnotationFeatureExpressionTest.java   |  13 +-
 .../annotation/AnnotationLabelExpressionTest.java  |   8 +-
 .../AnnotationVariableExpressionTest.java  |   4 +-
 .../expression/feature/FeatureStructureTest.java   |   3 +-
 .../apache/uima/ruta/resource/CSVTableTest.java| 150 ++---
 .../org/apache/uima/ruta/rule/WildCard2Test.java   |  17 +-
 .../uima/ruta/rule/WildCardInWindowTest.java   |  26 ++-
 .../uima/ruta/visitor/DebugAddToIndexesTest.java   |  63 ++
 .../ruta/visitor/InlinedRulesExplanationTest.java  |  16 +-
 ruta-docbook/pom.xml   |   3 +-
 ruta-docbook/src/docbook/tools.ruta.howtos.xml |   8 +-
 .../tools.ruta.language.internal_indexing.xml  |  52 ++---
 ruta-docbook/src/docbook/tools.ruta.overview.xml   |  14 ++
 ruta-eclipse-feature/pom.xml   |   2 +-
 ruta-eclipse-update-site/category.xml  |   2 +-
 ruta-eclipse-update-site/pom.xml   |  22 +-
 ruta-ep-addons/pom.xml |   2 +-
 .../uima/ruta/cde/ui/ConstraintSelectView.java |   3 +-
 .../org/apache/uima/ruta/cde/ui/DocumentView.java  |   3 +-
 .../org/apache/uima/ruta/cde/ui/ResultView.java|   2 +-
 .../uima/ruta/check/AnnotationCheckView.java   |   2 +-
 .../apache/uima/ruta/explain/apply/ApplyView.java  |   2 +-
 .../uima/ruta/explain/createdBy/CreatedByView.java |   4 +-
 .../uima/ruta/explain/element/ElementView.java |   2 +-
 .../uima/ruta/explain/failed/FailedView.java   |   2 +-
 .../uima/ruta/explain/inlined/InlinedView.java |   2 +-
 .../uima/ruta/explain/matched/MatchedView.java |   2 +-
 .../uima/ruta/explain/rulelist/RuleListView.java   |   2 +-
 .../explain/selection/ExplainSelectionView.java|   2 +-
 .../apache/uima/ruta/explain/tree/ExplainTree.java |   6 +-
 .../ruta/explain/tree/RuleElementMatchNode.java|   7 +-
 .../org/apache/uima/ruta/query/ui/QueryView.java   |   6 +-
 .../uima/ruta/statistics/StatisticsView.java   |   5 +-
 .../ruta/testing/ui/views/TestPageBookView.java|   5 +-
 .../testing/ui/views/fn/FalseNegativeView.java |   3 +-
 .../testing/ui/views/fp/FalsePositiveView.java |   3 +-
 .../ruta/testing/ui/views/tp/TruePositiveView.java |   5 +-
 ruta-ep-caseditor/.gitignore   |   2 +-
 ruta-ep-caseditor/pom.xml  |   2 +-
 .../view/browser/AnnotationBrowse

[uima-ruta] branch bugfix/UIMA-6241-Ruta-maven-plugin-does-not-fail-the-build-when-it-fails updated (79989c7 -> 5ea4fd7)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6241-Ruta-maven-plugin-does-not-fail-the-build-when-it-fails
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 79989c7  [UIMA-6241] Ruta maven plugin does not fail the build when it 
fails
 add 3c8c8d3  no jira - prepare ruta v3 for testing uimaj-core rc
 add 9d7c340  no jira - prepare ruta v3 for testing uimaj-core rc
 add 7063210  no jira - remove test type system
 add b70cb79  no jira - avoid compile errors with workarounds
 add dbc9ccf  no jira - uima v3 SNAPSHOT
 add 8773566  no jira - update to released uimaj v3 beta
 add 62a5374  no jira - update cover class
 add 5bc2227  no jira - make it compatible to latest uimaFIT, updated 
uimaj-core version
 add 7702db9  no jira - update readme/notes
 add 35f4bd6  no jira - merge ruta v2 to ruta v3
 add 9193a36  no jira - cleanup usage of commons-lang
 add 640be17  UIMA-6024: apply cleanup of 2.7.0
 add 05a03e5  UIMA-6024: apply changes of v2
 add 3841fec  UIMA-6024: clean up
 add bc4c066  no jira- update urls, update versions
 add 5d0b0f8  no jira- update urls
 add 513abbe  UIMA-5997: skip japicmp
 add 0c6acc1  UIMA-6093: update parent version
 add caa4e84  UIMA-6118: uima version
 add aed53d7  UIMA-6024: manual merge with ruta 2.8.0 rc1
 add 1bec99e  UIMA-6024: fixed merge errors
 add 0235ca2  UIMA-6024: clean up in failing test
 add 8a1da3f  UIMA-6024: fixed test
 add 2a90a51  UIMA-6024: fixed generics
 add 27b4d9f  UIMA-6024: manual merge with v2
 add 59aa3b3  UIMA-4676: fixed imports broken by manual merge
 add 4c1175c  no jira - fixed layout in docs
 add b5009d9  UIMA-6150: fix right to left match in window by simplifying 
code, avoid using subiterators in uima v3
 add 09b7f2f  UIMA-6150: fixed tests, added missing emptyIsInvisible check
 add c19a8f2  UIMA-6150: avoid using subiterators in filter
 add bbaf75e  UIMA-6154: fixed move on check
 add faffea5  [maven-release-plugin] prepare release ruta-3.0.0
 add 74a6825  [maven-release-plugin] prepare for next development iteration
 add e485640  no jira - manual rollback
 add 1183353  no jira - remove permgen mention
 add c281e2f  no jira - update some example v2 versions, fixed some typos
 add 865129c  no jira - fixed scm urls
 add 2801832  [maven-release-plugin] prepare release ruta-3.0.0
 add f31f835  [maven-release-plugin] prepare for next development iteration
 add 3a208f6  no jira - manual rollback
 add acecd9e  [maven-release-plugin] prepare release ruta-3.0.0
 add e1631ed  [maven-release-plugin] prepare for next development iteration
 add d7c7907  no jira - manual rollback
 add 74257dc  [maven-release-plugin] prepare release ruta-3.0.0
 add ed79ca4  [maven-release-plugin] prepare for next development iteration
 add 0d961d8  no jira - manual rollback
 add 6d06e5a  no jira - fix eclispe update site link to v3
 add 32de728  no jira - avoid problems in jenkins job
 add ca1ccb3  [maven-release-plugin] prepare release ruta-3.0.0
 add 7ac7501  [maven-release-plugin] prepare for next development iteration
 add 7417f02  no jira - manual rollback
 add dd29013  no jira fix jira version, improve readme/release-notes
 add 9dd61c8  no jira - improve release-notes
 add 1d7e2b2  no jira - improve release-notes
 add d69e99d  [maven-release-plugin] prepare release ruta-3.0.0
 add f24224c  [maven-release-plugin] prepare for next development iteration
 add f2262f6  no jira - fix readme/release-notes according rc review
 add 01d2a40  UIMA-6183: fix NPE and visibility problems of literal string 
matches in v3, behavior adapted in order to avoid unexpected matching within 
tokens
 add e2de91f  no jira - preparations fro next release - updated versions - 
updated jira version - updated release notes
 add 1d9cce9  no jira - update updatesite version
 add 92b35ed  merged v2: UIMA-6195, UIMA-6194, UIMA-6193, UIMA-6192, 
UIMA-6191, UIMA-6183, UIMA-6171
 add f5fb57b  [maven-release-plugin] prepare release ruta-3.0.1
 add fdc9355  [maven-release-plugin] prepare for next development iteration
 add 7d8eeec  no jira - manual rollback
 add 0fe2c34  UIMA-6194: merge v2 changes
 add ab7d1f0  [maven-release-plugin] prepare release ruta-3.0.1
 add 2c049ed  [maven-release-plugin] prepare for next development iteration
 add ecde41d  [NO JIRA] Copying v3 code to a branch under the v2 spot so it 
gets included in the GitHub mirror.
 add ed91636  [UIMA-6231] Reducing memory pressure generated by UIMA Ruta
 add 723d532  [UIMA-6231] Reducing memory pressure generated by UIMA Ruta
 add 2f835d3  Merge branch 'master' into 
UIMA-6233-Failing-unit-tests-depending-on-test-execution-order
 add 22085e1  Merge pull 

[uima-ruta] branch main updated (3fe408b -> 5ea4fd7)

[pkluegl]

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

pkluegl pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 3fe408b  Merge pull request #29 from 
apache/feature/UIMA-6337-Upgrade-Ruta-to-UIMA-3.2.0-and-uimaFIT-3.2.0
 add 69dbd3b  Merge pull request #53 from 
apache/bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing
 add 79989c7  [UIMA-6241] Ruta maven plugin does not fail the build when it 
fails
 add 5ea4fd7  Merge branch 'main' into 
bugfix/UIMA-6241-Ruta-maven-plugin-does-not-fail-the-build-when-it-fails

No new revisions were added by this update.

Summary of changes:
 .../ruta/maven/RutaGenerateDescriptorMojo.java | 40 ++-
 .../uima/ruta/maven/RutaGenerateMTWLMojo.java  | 45 +++---
 .../uima/ruta/maven/RutaGenerateTWLMojo.java   | 42 +---
 3 files changed, 91 insertions(+), 36 deletions(-)

[uima-ruta] branch bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script updated (3976a71 -> 1266f14)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 3976a71  Merge branch 'main' into 
bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script
 add 69dbd3b  Merge pull request #53 from 
apache/bugfix/UIMA-6346-Ruta-Action-ADD-case-FLOAT-missing
 add 79989c7  [UIMA-6241] Ruta maven plugin does not fail the build when it 
fails
 add 5ea4fd7  Merge branch 'main' into 
bugfix/UIMA-6241-Ruta-maven-plugin-does-not-fail-the-build-when-it-fails
 add 1266f14  Merge branch 'main' into 
bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script

No new revisions were added by this update.

Summary of changes:
 .../ruta/maven/RutaGenerateDescriptorMojo.java | 40 ++-
 .../uima/ruta/maven/RutaGenerateMTWLMojo.java  | 45 +++---
 .../uima/ruta/maven/RutaGenerateTWLMojo.java   | 42 +---
 3 files changed, 91 insertions(+), 36 deletions(-)

[uima-ruta] branch bugfix/UIMA-6246-Ruta-right-to-left-matching-skips-span created (now ced7af9)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6246-Ruta-right-to-left-matching-skips-span
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


  at ced7af9  Merge pull request #55 from 
apache/bugfix/UIMA-6241-Ruta-maven-plugin-does-not-fail-the-build-when-it-fails

No new revisions were added by this update.

[uima-ruta] branch bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script updated (1266f14 -> 3f7da52)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 1266f14  Merge branch 'main' into 
bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script
 add 3f7da52  [UIMA-6219] Logger errors when running Ruta script

No new revisions were added by this update.

Summary of changes:
 ruta-ep-engine/pom.xml | 26 +++---
 1 file changed, 15 insertions(+), 11 deletions(-)

[uima-ruta] branch main updated (5ea4fd7 -> acd978d)

[pkluegl]

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

pkluegl pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 5ea4fd7  Merge branch 'main' into 
bugfix/UIMA-6241-Ruta-maven-plugin-does-not-fail-the-build-when-it-fails
 add 2eff6e4  [UIMA-6219] Logger errors when running Ruta script
 add 3976a71  Merge branch 'main' into 
bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script
 add 1266f14  Merge branch 'main' into 
bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script
 add 3f7da52  [UIMA-6219] Logger errors when running Ruta script
 new acd978d  Merge pull request #54 from 
apache/bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script

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:
 ruta-ep-engine/pom.xml | 27 ---
 1 file changed, 16 insertions(+), 11 deletions(-)

[uima-ruta] 01/01: Merge pull request #54 from apache/bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script

[pkluegl]

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

pkluegl pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git

commit acd978d6fd9866981435a545901cae60ce04ee61
Merge: 5ea4fd7 3f7da52
Author: pkluegl 
AuthorDate: Fri May 7 16:57:44 2021 +0200

Merge pull request #54 from 
apache/bugfix/UIMA-6219-Logger-errors-when-running-Ruta-script

[UIMA-6219] Logger errors when running Ruta script

 ruta-ep-engine/pom.xml | 27 ---
 1 file changed, 16 insertions(+), 11 deletions(-)

[uima-ruta] branch main updated: [UIMA-6360] UIMA Ruta 3.1.0 release

[pkluegl]

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

pkluegl pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git


The following commit(s) were added to refs/heads/main by this push:
 new 8ed1cc7  [UIMA-6360] UIMA Ruta 3.1.0 release
8ed1cc7 is described below

commit 8ed1cc7ed1e797aa6730ebe09f1ae470fe45deb9
Author: Peter Klügl 
AuthorDate: Fri May 7 17:16:30 2021 +0200

[UIMA-6360] UIMA Ruta 3.1.0 release

- updated readme and release notes
---
 README |  2 +-
 RELEASE_NOTES.html | 28 +---
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/README b/README
index 49770b6..c673e7e 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
-Apache UIMA Ruta (TM) v3.0.1
+Apache UIMA Ruta (TM) v3.1.0
 -
 
 This release is compatible with UIMA v3, but not compatible with UIMA v2. 
diff --git a/RELEASE_NOTES.html b/RELEASE_NOTES.html
index e97ef5d..7ce943c 100644
--- a/RELEASE_NOTES.html
+++ b/RELEASE_NOTES.html
@@ -21,10 +21,10 @@
-->
 
 
-  Apache UIMA Ruta v3.0.1 Release Notes
+  Apache UIMA Ruta v3.1.0 Release Notes
 
 
-Apache UIMA Ruta™ v3.0.1 Release Notes
+Apache UIMA Ruta™ v3.1.0 Release Notes
 
 Contents
 
@@ -56,11 +56,25 @@
 
   UIMA Ruta Language and Analysis Engine:
   
-   Fixed broken literal string matching.
-   Fixed variable initialization with other variables.
-   Fixed assignment of lists to variables.
-   Fixed assignment of annotation comparison expression to 
variables.
-PARSE condition supports additional argument that represents the 
string to be parsed.
+   New config parameter for internal indexing strategy.
+   New config parameter for indexing all debug information.
+   New config parameter for type disambiguation.
+   TextSeeder is the new default seeder (faster, no MARKUP 
annotations).
+Improved null check using label expression.
+Improved conjunctive and disjunctive rule elements.
+Improved conjunct rules.
+Improved implementation of SPLIT, FILL, ADD, REMOVE, AFTER.
+Improved documentation.
+  
+  UIMA Ruta Workbench:
+  
+Fixed problems launching script using newer Java versions 
(LayerInstantiationException).
+Fixed console logging when launching scripts.
+Improved compatibility with dark mode.
+  
+  UIMA Ruta Maven Plugin:
+  
+Fail on error by default.
   
 
  

[uima-ruta] branch main updated: [UIMA-6360] UIMA Ruta 3.1.0 release

[pkluegl]

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

pkluegl pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git


The following commit(s) were added to refs/heads/main by this push:
 new 8b59f62  [UIMA-6360] UIMA Ruta 3.1.0 release
8b59f62 is described below

commit 8b59f62447c0b958aa49d5815858722e6907825b
Author: Peter Klügl 
AuthorDate: Fri May 7 17:18:20 2021 +0200

[UIMA-6360] UIMA Ruta 3.1.0 release

- updated update site verison
---
 ruta-eclipse-update-site/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruta-eclipse-update-site/pom.xml b/ruta-eclipse-update-site/pom.xml
index ec8484e..9712581 100644
--- a/ruta-eclipse-update-site/pom.xml
+++ b/ruta-eclipse-update-site/pom.xml
@@ -30,7 +30,7 @@
 
   ruta-eclipse-update-site
   pom
-  3.1.0-SNAPSHOT
+  3.1.0
 
   Apache UIMA Ruta Eclipse: ${project.artifactId}
   The UIMA Ruta Eclipse update site

[uima-ruta] branch UIMA-6360-UIMA-Ruta-3.1.0-release created (now 8b59f62)

[pkluegl]

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

pkluegl pushed a change to branch UIMA-6360-UIMA-Ruta-3.1.0-release
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


  at 8b59f62  [UIMA-6360] UIMA Ruta 3.1.0 release

No new revisions were added by this update.

[uima-ruta] branch UIMA-6360-UIMA-Ruta-3.1.0-release updated: [UIMA-6360] UIMA Ruta 3.1.0 release

[pkluegl]

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

pkluegl pushed a commit to branch UIMA-6360-UIMA-Ruta-3.1.0-release
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git


The following commit(s) were added to 
refs/heads/UIMA-6360-UIMA-Ruta-3.1.0-release by this push:
 new ba05f00  [UIMA-6360] UIMA Ruta 3.1.0 release
ba05f00 is described below

commit ba05f001ae16d874f9a2bc0e25ff611a606f8f45
Author: Peter Klügl 
AuthorDate: Fri May 7 17:23:27 2021 +0200

[UIMA-6360] UIMA Ruta 3.1.0 release

- jira version
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f726d84..4d9ae88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
   The top project for Apache UIMA Ruta
   ${uimaWebsiteUrl}
   
-12346599
+12348278
 

[uima-ruta] branch UIMA-6360-UIMA-Ruta-3.1.0-release updated (ba05f00 -> 424c575)

[pkluegl]

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

pkluegl pushed a change to branch UIMA-6360-UIMA-Ruta-3.1.0-release
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from ba05f00  [UIMA-6360] UIMA Ruta 3.1.0 release
 add 424c575  [maven-release-plugin] prepare release ruta-3.1.0

No new revisions were added by this update.

Summary of changes:
 .../ruta-ep-example-extensions/pom.xml |  6 ++--
 example-projects/ruta-maven-example/pom.xml|  8 ++---
 pom.xml| 36 +++---
 ruta-basic-type/pom.xml|  8 ++---
 ruta-core-ext/pom.xml  |  8 ++---
 ruta-core/pom.xml  |  8 ++---
 ruta-docbook/pom.xml   |  8 ++---
 ruta-eclipse-feature/pom.xml   |  8 ++---
 ruta-ep-addons/pom.xml |  8 ++---
 ruta-ep-caseditor/pom.xml  |  8 ++---
 ruta-ep-core-ext/pom.xml   |  8 ++---
 ruta-ep-engine/pom.xml |  8 ++---
 ruta-ep-ide-ui/pom.xml |  8 ++---
 ruta-ep-ide/pom.xml| 10 +++---
 ruta-ep-parent/pom.xml |  8 ++---
 ruta-ep-textruler/pom.xml  |  8 ++---
 ruta-maven-archetype/pom.xml   |  8 ++---
 ruta-maven-plugin/pom.xml  |  8 ++---
 ruta-parent/pom.xml|  8 ++---
 ruta-typesystem/pom.xml|  8 ++---
 20 files changed, 68 insertions(+), 120 deletions(-)

[uima-ruta] branch UIMA-6360-UIMA-Ruta-3.1.0-release updated (424c575 -> 12cefeb)

[pkluegl]

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

pkluegl pushed a change to branch UIMA-6360-UIMA-Ruta-3.1.0-release
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 424c575  [maven-release-plugin] prepare release ruta-3.1.0
 add 12cefeb  Revert "[maven-release-plugin] prepare release ruta-3.1.0"

No new revisions were added by this update.

Summary of changes:
 .../ruta-ep-example-extensions/pom.xml |  6 ++--
 example-projects/ruta-maven-example/pom.xml|  8 +++--
 pom.xml| 36 +++---
 ruta-basic-type/pom.xml|  8 +++--
 ruta-core-ext/pom.xml  |  8 +++--
 ruta-core/pom.xml  |  8 +++--
 ruta-docbook/pom.xml   |  8 +++--
 ruta-eclipse-feature/pom.xml   |  8 +++--
 ruta-ep-addons/pom.xml |  8 +++--
 ruta-ep-caseditor/pom.xml  |  8 +++--
 ruta-ep-core-ext/pom.xml   |  8 +++--
 ruta-ep-engine/pom.xml |  8 +++--
 ruta-ep-ide-ui/pom.xml |  8 +++--
 ruta-ep-ide/pom.xml| 10 +++---
 ruta-ep-parent/pom.xml |  8 +++--
 ruta-ep-textruler/pom.xml  |  8 +++--
 ruta-maven-archetype/pom.xml   |  8 +++--
 ruta-maven-plugin/pom.xml  |  8 +++--
 ruta-parent/pom.xml|  8 +++--
 ruta-typesystem/pom.xml|  8 +++--
 20 files changed, 120 insertions(+), 68 deletions(-)

[uima-ruta] branch UIMA-6360-UIMA-Ruta-3.1.0-release updated (12cefeb -> 1963427)

[pkluegl]

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

pkluegl pushed a change to branch UIMA-6360-UIMA-Ruta-3.1.0-release
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 12cefeb  Revert "[maven-release-plugin] prepare release ruta-3.1.0"
 add 1963427  [UIMA-6360] UIMA Ruta 3.1.0 release

No new revisions were added by this update.

Summary of changes:
 example-projects/ruta-maven-example/pom.xml | 4 ++--
 pom.xml | 4 ++--
 ruta-basic-type/pom.xml | 4 ++--
 ruta-core-ext/pom.xml   | 4 ++--
 ruta-core/pom.xml   | 4 ++--
 ruta-docbook/pom.xml| 4 ++--
 ruta-eclipse-feature/pom.xml| 4 ++--
 ruta-eclipse-update-site/pom.xml| 4 ++--
 ruta-ep-addons/pom.xml  | 4 ++--
 ruta-ep-caseditor/pom.xml   | 4 ++--
 ruta-ep-core-ext/pom.xml| 4 ++--
 ruta-ep-engine/pom.xml  | 4 ++--
 ruta-ep-ide-ui/pom.xml  | 4 ++--
 ruta-ep-ide/pom.xml | 4 ++--
 ruta-ep-parent/pom.xml  | 4 ++--
 ruta-ep-textruler/pom.xml   | 4 ++--
 ruta-maven-archetype/pom.xml| 4 ++--
 ruta-maven-plugin/pom.xml   | 4 ++--
 ruta-parent/pom.xml | 4 ++--
 ruta-typesystem/pom.xml | 4 ++--
 20 files changed, 40 insertions(+), 40 deletions(-)

[uima-ruta] branch UIMA-6360-UIMA-Ruta-3.1.0-release updated (1963427 -> 0d41bb8)

[pkluegl]

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

pkluegl pushed a change to branch UIMA-6360-UIMA-Ruta-3.1.0-release
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 1963427  [UIMA-6360] UIMA Ruta 3.1.0 release
 add 0d41bb8  [UIMA-6360] UIMA Ruta 3.1.0 release

No new revisions were added by this update.

Summary of changes:
 example-projects/ruta-maven-example/pom.xml | 6 +++---
 pom.xml | 6 +++---
 ruta-basic-type/pom.xml | 6 +++---
 ruta-core-ext/pom.xml   | 6 +++---
 ruta-core/pom.xml   | 6 +++---
 ruta-docbook/pom.xml| 6 +++---
 ruta-eclipse-feature/pom.xml| 6 +++---
 ruta-eclipse-update-site/pom.xml| 6 +++---
 ruta-ep-addons/pom.xml  | 6 +++---
 ruta-ep-caseditor/pom.xml   | 6 +++---
 ruta-ep-core-ext/pom.xml| 6 +++---
 ruta-ep-engine/pom.xml  | 6 +++---
 ruta-ep-ide-ui/pom.xml  | 6 +++---
 ruta-ep-ide/pom.xml | 6 +++---
 ruta-ep-parent/pom.xml  | 6 +++---
 ruta-ep-textruler/pom.xml   | 6 +++---
 ruta-maven-archetype/pom.xml| 6 +++---
 ruta-maven-plugin/pom.xml   | 4 ++--
 ruta-parent/pom.xml | 6 +++---
 ruta-typesystem/pom.xml | 6 +++---
 20 files changed, 59 insertions(+), 59 deletions(-)

[uima-ruta] branch UIMA-6360-UIMA-Ruta-3.1.0-release updated (0d41bb8 -> 40ae9fa)

[pkluegl]

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

pkluegl pushed a change to branch UIMA-6360-UIMA-Ruta-3.1.0-release
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 0d41bb8  [UIMA-6360] UIMA Ruta 3.1.0 release
 add 40ae9fa  [maven-release-plugin] prepare release ruta-3.1.0

No new revisions were added by this update.

Summary of changes:
 .../ruta-ep-example-extensions/pom.xml |  6 ++--
 example-projects/ruta-maven-example/pom.xml|  8 ++---
 pom.xml| 36 +++---
 ruta-basic-type/pom.xml|  8 ++---
 ruta-core-ext/pom.xml  |  8 ++---
 ruta-core/pom.xml  |  8 ++---
 ruta-docbook/pom.xml   |  8 ++---
 ruta-eclipse-feature/pom.xml   |  8 ++---
 ruta-ep-addons/pom.xml |  8 ++---
 ruta-ep-caseditor/pom.xml  |  8 ++---
 ruta-ep-core-ext/pom.xml   |  8 ++---
 ruta-ep-engine/pom.xml |  8 ++---
 ruta-ep-ide-ui/pom.xml |  8 ++---
 ruta-ep-ide/pom.xml| 10 +++---
 ruta-ep-parent/pom.xml |  8 ++---
 ruta-ep-textruler/pom.xml  |  8 ++---
 ruta-maven-archetype/pom.xml   |  8 ++---
 ruta-maven-plugin/pom.xml  |  8 ++---
 ruta-parent/pom.xml|  8 ++---
 ruta-typesystem/pom.xml|  8 ++---
 20 files changed, 68 insertions(+), 120 deletions(-)

[uima-ruta] annotated tag ruta-3.1.0 updated (40ae9fa -> 0cfb9fa)

[pkluegl]

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

pkluegl pushed a change to annotated tag ruta-3.1.0
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


*** WARNING: tag ruta-3.1.0 was modified! ***

from 40ae9fa  (commit)
  to 0cfb9fa  (tag)
 tagging 40ae9fa7db978e4698cb78c8e6d210c6f41f7f5f (commit)
  by Peter Klügl
  on Fri May 7 18:29:30 2021 +0200

- Log -
[maven-release-plugin] copy for tag ruta-3.1.0
---


No new revisions were added by this update.

Summary of changes:

[uima-ruta] branch UIMA-6360-UIMA-Ruta-3.1.0-release updated (40ae9fa -> 9ee00d8)

[pkluegl]

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

pkluegl pushed a change to branch UIMA-6360-UIMA-Ruta-3.1.0-release
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 40ae9fa  [maven-release-plugin] prepare release ruta-3.1.0
 add 9ee00d8  [maven-release-plugin] prepare for next development iteration

No new revisions were added by this update.

Summary of changes:
 example-projects/ruta-ep-example-extensions/pom.xml | 2 +-
 example-projects/ruta-maven-example/pom.xml | 4 ++--
 pom.xml | 8 
 ruta-basic-type/pom.xml | 4 ++--
 ruta-core-ext/pom.xml   | 4 ++--
 ruta-core/pom.xml   | 4 ++--
 ruta-docbook/pom.xml| 4 ++--
 ruta-eclipse-feature/pom.xml| 4 ++--
 ruta-ep-addons/pom.xml  | 4 ++--
 ruta-ep-caseditor/pom.xml   | 4 ++--
 ruta-ep-core-ext/pom.xml| 4 ++--
 ruta-ep-engine/pom.xml  | 4 ++--
 ruta-ep-ide-ui/pom.xml  | 4 ++--
 ruta-ep-ide/pom.xml | 4 ++--
 ruta-ep-parent/pom.xml  | 4 ++--
 ruta-ep-textruler/pom.xml   | 4 ++--
 ruta-maven-archetype/pom.xml| 4 ++--
 ruta-maven-plugin/pom.xml   | 6 +++---
 ruta-parent/pom.xml | 4 ++--
 ruta-typesystem/pom.xml | 4 ++--
 20 files changed, 42 insertions(+), 42 deletions(-)

svn commit: r47580 - /dev/uima/uima-ruta-3.1.0-rc1/

[pkluegl]

Author: pkluegl
Date: Fri May  7 16:46:15 2021
New Revision: 47580

Log: (empty)

Added:
dev/uima/uima-ruta-3.1.0-rc1/

[uima-ruta] branch UIMA-6360-UIMA-Ruta-3.1.0-release updated (9ee00d8 -> 18b9c6b)

[pkluegl]

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

pkluegl pushed a change to branch UIMA-6360-UIMA-Ruta-3.1.0-release
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 9ee00d8  [maven-release-plugin] prepare for next development iteration
 add 33705d0  [UIMA-6360] UIMA Ruta 3.1.0 release
 add 0b0c9d6  Revert "[maven-release-plugin] prepare for next development 
iteration"
 add 8336b36  Revert "[maven-release-plugin] prepare release ruta-3.1.0"
 add 18b9c6b  [UIMA-6360] UIMA Ruta 3.1.0 release

No new revisions were added by this update.

Summary of changes:
 .../ruta-ep-example-extensions/pom.xml |  6 +-
 example-projects/ruta-maven-example/pom.xml|  6 +-
 pom.xml| 34 +++
 ruta-basic-type/pom.xml|  6 +-
 ruta-core-ext/pom.xml  |  6 +-
 ruta-core/pom.xml  |  6 +-
 ruta-docbook/pom.xml   |  6 +-
 ruta-eclipse-feature/pom.xml   |  6 +-
 ruta-eclipse-update-site/category.xml  |  2 +-
 ruta-eclipse-update-site/pom.xml   | 68 +++---
 ruta-ep-addons/pom.xml |  6 +-
 ruta-ep-caseditor/pom.xml  |  6 +-
 ruta-ep-core-ext/pom.xml   |  6 +-
 ruta-ep-engine/pom.xml |  6 +-
 ruta-ep-ide-ui/pom.xml |  6 +-
 ruta-ep-ide/pom.xml|  8 ++-
 ruta-ep-parent/pom.xml |  6 +-
 ruta-ep-textruler/pom.xml  |  6 +-
 ruta-maven-archetype/pom.xml   |  6 +-
 ruta-maven-plugin/pom.xml  |  8 ++-
 ruta-parent/pom.xml|  6 +-
 ruta-typesystem/pom.xml|  6 +-
 22 files changed, 124 insertions(+), 98 deletions(-)

[uima-ruta] branch UIMA-6360-UIMA-Ruta-3.1.0-release updated (18b9c6b -> 4b6a018)

[pkluegl]

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

pkluegl pushed a change to branch UIMA-6360-UIMA-Ruta-3.1.0-release
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 18b9c6b  [UIMA-6360] UIMA Ruta 3.1.0 release
 add 4b6a018  [maven-release-plugin] prepare release ruta-3.1.0

No new revisions were added by this update.

Summary of changes:
 .../ruta-ep-example-extensions/pom.xml |  6 ++--
 example-projects/ruta-maven-example/pom.xml|  8 ++---
 pom.xml| 36 +++---
 ruta-basic-type/pom.xml|  8 ++---
 ruta-core-ext/pom.xml  |  8 ++---
 ruta-core/pom.xml  |  8 ++---
 ruta-docbook/pom.xml   |  8 ++---
 ruta-eclipse-feature/pom.xml   |  8 ++---
 ruta-ep-addons/pom.xml |  8 ++---
 ruta-ep-caseditor/pom.xml  |  8 ++---
 ruta-ep-core-ext/pom.xml   |  8 ++---
 ruta-ep-engine/pom.xml |  8 ++---
 ruta-ep-ide-ui/pom.xml |  8 ++---
 ruta-ep-ide/pom.xml| 10 +++---
 ruta-ep-parent/pom.xml |  8 ++---
 ruta-ep-textruler/pom.xml  |  8 ++---
 ruta-maven-archetype/pom.xml   |  8 ++---
 ruta-maven-plugin/pom.xml  |  8 ++---
 ruta-parent/pom.xml|  8 ++---
 ruta-typesystem/pom.xml|  8 ++---
 20 files changed, 68 insertions(+), 120 deletions(-)

[uima-ruta] annotated tag ruta-3.1.0 updated (4b6a018 -> dc6b43e)

[pkluegl]

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

pkluegl pushed a change to annotated tag ruta-3.1.0
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


*** WARNING: tag ruta-3.1.0 was modified! ***

from 4b6a018  (commit)
  to dc6b43e  (tag)
 tagging 4b6a0185893c43a4cb057505a80555f915c6e44e (commit)
  by Peter Klügl
  on Fri May 7 20:53:11 2021 +0200

- Log -
[maven-release-plugin] copy for tag ruta-3.1.0
---


No new revisions were added by this update.

Summary of changes:

[uima-ruta] branch UIMA-6360-UIMA-Ruta-3.1.0-release updated (4b6a018 -> b9a28a8)

[pkluegl]

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

pkluegl pushed a change to branch UIMA-6360-UIMA-Ruta-3.1.0-release
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 4b6a018  [maven-release-plugin] prepare release ruta-3.1.0
 add b9a28a8  [maven-release-plugin] prepare for next development iteration

No new revisions were added by this update.

Summary of changes:
 example-projects/ruta-ep-example-extensions/pom.xml | 2 +-
 example-projects/ruta-maven-example/pom.xml | 4 ++--
 pom.xml | 8 
 ruta-basic-type/pom.xml | 4 ++--
 ruta-core-ext/pom.xml   | 4 ++--
 ruta-core/pom.xml   | 4 ++--
 ruta-docbook/pom.xml| 4 ++--
 ruta-eclipse-feature/pom.xml| 4 ++--
 ruta-ep-addons/pom.xml  | 4 ++--
 ruta-ep-caseditor/pom.xml   | 4 ++--
 ruta-ep-core-ext/pom.xml| 4 ++--
 ruta-ep-engine/pom.xml  | 4 ++--
 ruta-ep-ide-ui/pom.xml  | 4 ++--
 ruta-ep-ide/pom.xml | 4 ++--
 ruta-ep-parent/pom.xml  | 4 ++--
 ruta-ep-textruler/pom.xml   | 4 ++--
 ruta-maven-archetype/pom.xml| 4 ++--
 ruta-maven-plugin/pom.xml   | 6 +++---
 ruta-parent/pom.xml | 4 ++--
 ruta-typesystem/pom.xml | 4 ++--
 20 files changed, 42 insertions(+), 42 deletions(-)

svn commit: r47583 [2/2] - in /dev/uima/uima-ruta-3.1.0-rc1: ./ eclipse-update-site-v3/ eclipse-update-site-v3/ruta/ eclipse-update-site-v3/ruta/features/ eclipse-update-site-v3/ruta/plugins/

[pkluegl]

Added: 
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.0.0.jar.pack.gz
==
Binary file - no diff available.

Propchange: 
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.0.0.jar.pack.gz
--
svn:mime-type = application/octet-stream

Added: 
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.0.0.jar.pack.gz.asc
==
--- 
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.0.0.jar.pack.gz.asc
 (added)
+++ 
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.0.0.jar.pack.gz.asc
 Fri May  7 19:09:48 2021
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEkADpuHJ4JTgqyYGySTRDk8CQGfMFAl3c8+AACgkQSTRDk8CQ
+GfM66xAAnGmTX3RbrSZS/uQVeBNQlC5oA7x50PJA7DUO/+AvXuaQ6lWP4Dgmc1Y6
+AEiohFsv6nbdC9THOLtODq5AYsgVi7eLYkZXGyCl4l4I0u3zAb4IW6Nxgr0ggbZm
+wQP2aEMETLxaDxa/tqOEXtHik0N/LQS6arvUMsQVre6rGm6ujzFNSKYYipbN2Bpa
+G9rngwX9ALJWFH3BcVoOjNhKyuNlyrFkS31049eFtIcafL7mi90zp3kzGke2Cf5a
+UXm68OchkUTnrcIXtKjvXOdGLZaHDhjN3jKBYC8Ss+bD29+ryZT+LfsTMfCffxrY
+3NC55gKVG5DEvABRXEfZhLt+KHAia+sqjj29K4eQplz0y1Ql/E58abREqOIAVISv
+VL8Hx747lYbbDfwlZbxFxH5yCVFQE12NHCKk4m4elqn7jzQOm8g1623gx5NlsgQB
+JublMunbQT0LDwSlXEpXpjVFxeWvpTDY7XBrxTLDuULMLquNsksPmaeolFcygQ1u
+49mnZUWUHvUFHKjNaViUC1xBvgsChxNvSKAnAQk2GfkTqZJIlComRPaTHMAoH3/o
+2t3Dr8F/VSfAx5gFhC5SYTP5BsxPHyH3Rc6xZwTofI6G/5UmU+it8ZiadW1ZsAYn
+de/6g5AaMmGSDLWijiYQLcWYrMXWX5oHgO0afFtKW/elEgNSty8=
+=9t8s
+-END PGP SIGNATURE-

Added: 
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.0.0.jar.pack.gz.sha512
==
--- 
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.0.0.jar.pack.gz.sha512
 (added)
+++ 
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.0.0.jar.pack.gz.sha512
 Fri May  7 19:09:48 2021
@@ -0,0 +1 @@
+1c87effeaf4b861ec459a75f208091513122419e970674b612852e81f2cf3206af7bdc4d8216a4c863c073a5d9c5c22ff38a4fc39e1923ebca9df3a9126a097a
 *org.apache.uima.ruta.ide_3.0.0.jar.pack.gz

Added: 
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.0.0.jar.sha512
==
--- 
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.0.0.jar.sha512
 (added)
+++ 
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.0.0.jar.sha512
 Fri May  7 19:09:48 2021
@@ -0,0 +1 @@
+f708f0bf23f159ad45e9b3d3a49533c727ab811cbe8542bc78e7d91b38aa6b87ce6d833c1755d63ffc0ca79add220ad8b9cb151701f91ff6670bbcd2c94d
 *org.apache.uima.ruta.ide_3.0.0.jar

Added: 
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.0.1.jar
==
Binary file - no diff available.

Propchange: 
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.0.1.jar
--
svn:mime-type = application/octet-stream

Added: 
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.0.1.jar.asc
==
--- 
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.0.1.jar.asc
 (added)
+++ 
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.0.1.jar.asc
 Fri May  7 19:09:48 2021
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEkADpuHJ4JTgqyYGySTRDk8CQGfMFAl59EJsACgkQSTRDk8CQ
+GfM++xAAqtM6D4hf1H2O0jmWum5XXqqPeaDUIL/s/OU8YwDjZqwCyXNOILkSEwN8
+pHh1iC63fG9yZHApJ4bK93GFIR9f55sK4ZQF7kUbX84ngaJtowjbLeJ9BbVtMtiW
+DqFGPn61PirJHC2IeSwqoNx2MNyp2buFCDueqCTICvCSfxc+/yrrNB0xrAlZHuK6
+IFujavn9MxUMirok0cb8rm/gDdu4xHGd0l6SMjvpTNFKgNVkRQ9onnb5MnOUUOeJ
+X0vBkRflYAe4kvHquUZHkBwm7SbV3rDeVbBRS3fQGYy+5gKdF8bWENoGrBR6Sopn
+J42KxV1/haIc8Le2fYrhsX44vRTchcbSzgBzKclT0Sd4m8PbVPjeSiza1NMzHshF
+gibgV29PmFME9oRB8RfqE15tvgAHi4hf4YAVUhE6j6nlZphm5Ob94HbmfWGHXoua
+OuPbzyi8kMkTlmNVtxaZTofT1yZb6t4JOl5aat0hCSnJFHLye6zDMYQMxeLDcv0j
+YhNktsDTC1BFWM0Go3uHBjadPVrryA7lZtvfY5ezbx3y9OZGH8OffqeDYiPh1K1I
+fIdf8u7s+mVaJwsmt8qUPSHAQw+xRYm1kIbW/qCYuFs+mNiEWKSH2zW2gsOF5bLs
+bWqIea/6LePW9mpWOp+Rf8y11XR5ONIese4YwL6UyswPdXRSmmg=
+=V/1s
+-END PGP SIGNATURE-

Added: 
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.0.1.jar.pack.gz
=

svn commit: r47583 [1/2] - in /dev/uima/uima-ruta-3.1.0-rc1: ./ eclipse-update-site-v3/ eclipse-update-site-v3/ruta/ eclipse-update-site-v3/ruta/features/ eclipse-update-site-v3/ruta/plugins/

[pkluegl]

Author: pkluegl
Date: Fri May  7 19:09:48 2021
New Revision: 47583

Log:
ruta 3.1.0 rc1

Added:
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/artifacts.jar   
(with props)
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/artifacts.jar.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/artifacts.jar.sha512
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/content.jar   
(with props)
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/content.jar.asc
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/content.jar.sha512
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/features/

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/features/org.apache.uima.ruta.feature_3.0.0.jar
   (with props)

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/features/org.apache.uima.ruta.feature_3.0.0.jar.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/features/org.apache.uima.ruta.feature_3.0.0.jar.sha512

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/features/org.apache.uima.ruta.feature_3.0.1.jar
   (with props)

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/features/org.apache.uima.ruta.feature_3.0.1.jar.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/features/org.apache.uima.ruta.feature_3.0.1.jar.sha512

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/features/org.apache.uima.ruta.feature_3.1.0.jar
   (with props)

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/features/org.apache.uima.ruta.feature_3.1.0.jar.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/features/org.apache.uima.ruta.feature_3.1.0.jar.sha512
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.0.0.jar
   (with props)

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.0.0.jar.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.0.0.jar.pack.gz
   (with props)

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.0.0.jar.pack.gz.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.0.0.jar.pack.gz.sha512

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.0.0.jar.sha512

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.0.1.jar
   (with props)

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.0.1.jar.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.0.1.jar.pack.gz
   (with props)

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.0.1.jar.pack.gz.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.0.1.jar.pack.gz.sha512

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.0.1.jar.sha512

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.1.0.jar
   (with props)

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.1.0.jar.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.1.0.jar.sha512

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.caseditor_3.0.0.jar
   (with props)

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.caseditor_3.0.0.jar.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.caseditor_3.0.0.jar.pack.gz
   (with props)

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.caseditor_3.0.0.jar.pack.gz.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.caseditor_3.0.0.jar.pack.gz.sha512

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.caseditor_3.0.0.jar.sha512

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.caseditor_3.0.1.jar
   (with props)

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.caseditor_3.0.1.jar.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.caseditor_3.0.1.jar.pack.gz
   (with props)

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.caseditor_3.0.1.jar.pack.gz.asc

dev/uima/uima-ruta

[uima-ruta] branch UIMA-6360-UIMA-Ruta-3.1.0-release updated (b9a28a8 -> 661478c)

[pkluegl]

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

pkluegl pushed a change to branch UIMA-6360-UIMA-Ruta-3.1.0-release
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from b9a28a8  [maven-release-plugin] prepare for next development iteration
 add 661478c  no jira - manual rollback

No new revisions were added by this update.

Summary of changes:
 example-projects/ruta-ep-example-extensions/pom.xml | 2 +-
 example-projects/ruta-maven-example/pom.xml | 2 +-
 pom.xml | 2 +-
 ruta-basic-type/pom.xml | 2 +-
 ruta-core-ext/pom.xml   | 2 +-
 ruta-core/pom.xml   | 2 +-
 ruta-docbook/pom.xml| 2 +-
 ruta-eclipse-feature/pom.xml| 2 +-
 ruta-ep-addons/pom.xml  | 2 +-
 ruta-ep-caseditor/pom.xml   | 2 +-
 ruta-ep-core-ext/pom.xml| 2 +-
 ruta-ep-engine/pom.xml  | 2 +-
 ruta-ep-ide-ui/pom.xml  | 2 +-
 ruta-ep-ide/pom.xml | 2 +-
 ruta-ep-parent/pom.xml  | 2 +-
 ruta-ep-textruler/pom.xml   | 2 +-
 ruta-maven-archetype/pom.xml| 2 +-
 ruta-maven-plugin/pom.xml   | 2 +-
 ruta-parent/pom.xml | 2 +-
 ruta-typesystem/pom.xml | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

[uima-ruta] 01/01: [UIMA-6362] Ruta: update versions and notice in eclipse plugin bundles

[pkluegl]

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

pkluegl pushed a commit to branch 
UIMA-6362-Ruta-update-versions-and-notice-in-eclipse-plugin-bundles
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git

commit fd2583899f91949238135b8ae67e106956ef10c8
Author: Peter Klügl 
AuthorDate: Wed May 12 09:19:36 2021 +0200

[UIMA-6362] Ruta: update versions and notice in eclipse plugin bundles

- adapt mention of file
---
 ruta-ep-engine/src/main/readme_bin/NOTICE | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ruta-ep-engine/src/main/readme_bin/NOTICE 
b/ruta-ep-engine/src/main/readme_bin/NOTICE
index 1ba86b7..6ef6c38 100644
--- a/ruta-ep-engine/src/main/readme_bin/NOTICE
+++ b/ruta-ep-engine/src/main/readme_bin/NOTICE
@@ -80,5 +80,4 @@ terms of the Apache 2 licence. Original source copyright:
 Copyright 2010 CS Communication & Systèmes
 ===
 The complete text of licenses and disclaimers associated with the the original
-sources enumerated above at the time of code translation are in the LICENSE.txt
-file.
\ No newline at end of file
+sources enumerated above at the time of code translation are in the LICENSE 
file.
\ No newline at end of file

[uima-ruta] branch UIMA-6362-Ruta-update-versions-and-notice-in-eclipse-plugin-bundles created (now fd25838)

[pkluegl]

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

pkluegl pushed a change to branch 
UIMA-6362-Ruta-update-versions-and-notice-in-eclipse-plugin-bundles
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


  at fd25838  [UIMA-6362] Ruta: update versions and notice in eclipse 
plugin bundles

This branch includes the following new commits:

 new fd25838  [UIMA-6362] Ruta: update versions and notice in eclipse 
plugin bundles

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-ruta] branch UIMA-6362-Ruta-update-versions-and-notice-in-eclipse-plugin-bundles updated (fd25838 -> 97ff6f1)

[pkluegl]

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

pkluegl pushed a change to branch 
UIMA-6362-Ruta-update-versions-and-notice-in-eclipse-plugin-bundles
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from fd25838  [UIMA-6362] Ruta: update versions and notice in eclipse 
plugin bundles
 add 97ff6f1  [UIMA-6362] Ruta: update versions and notice in eclipse 
plugin bundles

No new revisions were added by this update.

Summary of changes:
 .../ruta-ep-example-extensions/pom.xml |   1 -
 ruta-core/pom.xml  |   9 --
 .../org/apache/uima/ruta/engine/RutaTestUtils.java |   7 +-
 .../uima/ruta/resource/MultiTreeWordList.java  |   7 +-
 ruta-ep-addons/pom.xml |   1 -
 ruta-ep-caseditor/pom.xml  |   1 -
 ruta-ep-core-ext/pom.xml   |   1 -
 ruta-ep-engine/pom.xml |  39 ++
 ruta-ep-ide-ui/pom.xml |   1 -
 ruta-ep-ide/pom.xml|   1 -
 ruta-parent/pom.xml| 132 +
 11 files changed, 120 insertions(+), 80 deletions(-)

[uima-ruta] branch UIMA-6362-Ruta-update-versions-and-notice-in-eclipse-plugin-bundles updated (97ff6f1 -> ade1c50)

[pkluegl]

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

pkluegl pushed a change to branch 
UIMA-6362-Ruta-update-versions-and-notice-in-eclipse-plugin-bundles
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 97ff6f1  [UIMA-6362] Ruta: update versions and notice in eclipse 
plugin bundles
 add ade1c50  [UIMA-6361] p2-layout-resolver upgrade required for Java 16 
builds

No new revisions were added by this update.

Summary of changes:
 ruta-ep-parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[uima-ruta] branch UIMA-6362-Ruta-update-versions-and-notice-in-eclipse-plugin-bundles updated (ade1c50 -> 74e2c54)

[pkluegl]

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

pkluegl pushed a change to branch 
UIMA-6362-Ruta-update-versions-and-notice-in-eclipse-plugin-bundles
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from ade1c50  [UIMA-6361] p2-layout-resolver upgrade required for Java 16 
builds
 add 74e2c54  [UIMA-6362] Ruta: update versions and notice in eclipse 
plugin bundles

No new revisions were added by this update.

Summary of changes:
 ruta-ep-engine/src/main/readme_bin/LICENSE | 359 +++--
 ruta-ep-engine/src/main/readme_bin/NOTICE  | 134 ++-
 2 files changed, 369 insertions(+), 124 deletions(-)

[uima-ruta] branch UIMA-6360-UIMA-Ruta-3.1.0-release updated (661478c -> 3bdfda9)

[pkluegl]

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

pkluegl pushed a change to branch UIMA-6360-UIMA-Ruta-3.1.0-release
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 661478c  no jira - manual rollback
 add fd25838  [UIMA-6362] Ruta: update versions and notice in eclipse 
plugin bundles
 add 97ff6f1  [UIMA-6362] Ruta: update versions and notice in eclipse 
plugin bundles
 add ade1c50  [UIMA-6361] p2-layout-resolver upgrade required for Java 16 
builds
 add 74e2c54  [UIMA-6362] Ruta: update versions and notice in eclipse 
plugin bundles
 add 3bdfda9  Merge pull request #57 from 
apache/UIMA-6362-Ruta-update-versions-and-notice-in-eclipse-plugin-bundles

No new revisions were added by this update.

Summary of changes:
 .../ruta-ep-example-extensions/pom.xml |   1 -
 ruta-core/pom.xml  |   9 -
 .../org/apache/uima/ruta/engine/RutaTestUtils.java |   7 +-
 .../uima/ruta/resource/MultiTreeWordList.java  |   7 +-
 ruta-ep-addons/pom.xml |   1 -
 ruta-ep-caseditor/pom.xml  |   1 -
 ruta-ep-core-ext/pom.xml   |   1 -
 ruta-ep-engine/pom.xml |  39 +--
 ruta-ep-engine/src/main/readme_bin/LICENSE | 359 +
 ruta-ep-engine/src/main/readme_bin/NOTICE  | 135 
 ruta-ep-ide-ui/pom.xml |   1 -
 ruta-ep-ide/pom.xml|   1 -
 ruta-ep-parent/pom.xml |   2 +-
 ruta-parent/pom.xml| 132 ++--
 14 files changed, 490 insertions(+), 206 deletions(-)

[uima-ruta] branch UIMA-6360-UIMA-Ruta-3.1.0-release updated (3bdfda9 -> b62ba33)

[pkluegl]

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

pkluegl pushed a change to branch UIMA-6360-UIMA-Ruta-3.1.0-release
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 3bdfda9  Merge pull request #57 from 
apache/UIMA-6362-Ruta-update-versions-and-notice-in-eclipse-plugin-bundles
 add b62ba33  [maven-release-plugin] prepare release ruta-3.1.0

No new revisions were added by this update.

Summary of changes:
 example-projects/ruta-ep-example-extensions/pom.xml | 2 +-
 example-projects/ruta-maven-example/pom.xml | 4 ++--
 pom.xml | 8 
 ruta-basic-type/pom.xml | 4 ++--
 ruta-core-ext/pom.xml   | 4 ++--
 ruta-core/pom.xml   | 4 ++--
 ruta-docbook/pom.xml| 4 ++--
 ruta-eclipse-feature/pom.xml| 4 ++--
 ruta-ep-addons/pom.xml  | 4 ++--
 ruta-ep-caseditor/pom.xml   | 4 ++--
 ruta-ep-core-ext/pom.xml| 4 ++--
 ruta-ep-engine/pom.xml  | 4 ++--
 ruta-ep-ide-ui/pom.xml  | 4 ++--
 ruta-ep-ide/pom.xml | 4 ++--
 ruta-ep-parent/pom.xml  | 4 ++--
 ruta-ep-textruler/pom.xml   | 4 ++--
 ruta-maven-archetype/pom.xml| 4 ++--
 ruta-maven-plugin/pom.xml   | 4 ++--
 ruta-parent/pom.xml | 8 +++-
 ruta-typesystem/pom.xml | 4 ++--
 20 files changed, 42 insertions(+), 44 deletions(-)

[uima-ruta] branch UIMA-6360-UIMA-Ruta-3.1.0-release updated (b62ba33 -> 0f0fb55)

[pkluegl]

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

pkluegl pushed a change to branch UIMA-6360-UIMA-Ruta-3.1.0-release
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from b62ba33  [maven-release-plugin] prepare release ruta-3.1.0
 add 0f0fb55  Revert "[maven-release-plugin] prepare release ruta-3.1.0"

No new revisions were added by this update.

Summary of changes:
 example-projects/ruta-ep-example-extensions/pom.xml | 2 +-
 example-projects/ruta-maven-example/pom.xml | 4 ++--
 pom.xml | 8 
 ruta-basic-type/pom.xml | 4 ++--
 ruta-core-ext/pom.xml   | 4 ++--
 ruta-core/pom.xml   | 4 ++--
 ruta-docbook/pom.xml| 4 ++--
 ruta-eclipse-feature/pom.xml| 4 ++--
 ruta-ep-addons/pom.xml  | 4 ++--
 ruta-ep-caseditor/pom.xml   | 4 ++--
 ruta-ep-core-ext/pom.xml| 4 ++--
 ruta-ep-engine/pom.xml  | 4 ++--
 ruta-ep-ide-ui/pom.xml  | 4 ++--
 ruta-ep-ide/pom.xml | 4 ++--
 ruta-ep-parent/pom.xml  | 4 ++--
 ruta-ep-textruler/pom.xml   | 4 ++--
 ruta-maven-archetype/pom.xml| 4 ++--
 ruta-maven-plugin/pom.xml   | 4 ++--
 ruta-parent/pom.xml | 8 +---
 ruta-typesystem/pom.xml | 4 ++--
 20 files changed, 44 insertions(+), 42 deletions(-)

[uima-ruta] branch UIMA-6360-UIMA-Ruta-3.1.0-release updated (0f0fb55 -> ade09ef)

[pkluegl]

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

pkluegl pushed a change to branch UIMA-6360-UIMA-Ruta-3.1.0-release
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 0f0fb55  Revert "[maven-release-plugin] prepare release ruta-3.1.0"
 add ade09ef  [maven-release-plugin] prepare release ruta-3.1.0

No new revisions were added by this update.

Summary of changes:
 example-projects/ruta-ep-example-extensions/pom.xml | 2 +-
 example-projects/ruta-maven-example/pom.xml | 4 ++--
 pom.xml | 8 
 ruta-basic-type/pom.xml | 4 ++--
 ruta-core-ext/pom.xml   | 4 ++--
 ruta-core/pom.xml   | 4 ++--
 ruta-docbook/pom.xml| 4 ++--
 ruta-eclipse-feature/pom.xml| 4 ++--
 ruta-ep-addons/pom.xml  | 4 ++--
 ruta-ep-caseditor/pom.xml   | 4 ++--
 ruta-ep-core-ext/pom.xml| 4 ++--
 ruta-ep-engine/pom.xml  | 4 ++--
 ruta-ep-ide-ui/pom.xml  | 4 ++--
 ruta-ep-ide/pom.xml | 4 ++--
 ruta-ep-parent/pom.xml  | 4 ++--
 ruta-ep-textruler/pom.xml   | 4 ++--
 ruta-maven-archetype/pom.xml| 4 ++--
 ruta-maven-plugin/pom.xml   | 4 ++--
 ruta-parent/pom.xml | 8 +++-
 ruta-typesystem/pom.xml | 4 ++--
 20 files changed, 42 insertions(+), 44 deletions(-)

[uima-ruta] annotated tag ruta-3.1.0 updated (ade09ef -> 02dbaa3)

[pkluegl]

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

pkluegl pushed a change to annotated tag ruta-3.1.0
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


*** WARNING: tag ruta-3.1.0 was modified! ***

from ade09ef  (commit)
  to 02dbaa3  (tag)
 tagging ade09ef00562a416f0ae40a55cbf816b60b2e664 (commit)
  by Peter Klügl
  on Wed May 12 16:43:21 2021 +0200

- Log -
[maven-release-plugin] copy for tag ruta-3.1.0
---


No new revisions were added by this update.

Summary of changes:

[uima-ruta] branch UIMA-6360-UIMA-Ruta-3.1.0-release updated (ade09ef -> 65daca9)

[pkluegl]

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

pkluegl pushed a change to branch UIMA-6360-UIMA-Ruta-3.1.0-release
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from ade09ef  [maven-release-plugin] prepare release ruta-3.1.0
 add 65daca9  [maven-release-plugin] prepare for next development iteration

No new revisions were added by this update.

Summary of changes:
 example-projects/ruta-ep-example-extensions/pom.xml | 2 +-
 example-projects/ruta-maven-example/pom.xml | 4 ++--
 pom.xml | 8 
 ruta-basic-type/pom.xml | 4 ++--
 ruta-core-ext/pom.xml   | 4 ++--
 ruta-core/pom.xml   | 4 ++--
 ruta-docbook/pom.xml| 4 ++--
 ruta-eclipse-feature/pom.xml| 4 ++--
 ruta-ep-addons/pom.xml  | 4 ++--
 ruta-ep-caseditor/pom.xml   | 4 ++--
 ruta-ep-core-ext/pom.xml| 4 ++--
 ruta-ep-engine/pom.xml  | 4 ++--
 ruta-ep-ide-ui/pom.xml  | 4 ++--
 ruta-ep-ide/pom.xml | 4 ++--
 ruta-ep-parent/pom.xml  | 4 ++--
 ruta-ep-textruler/pom.xml   | 4 ++--
 ruta-maven-archetype/pom.xml| 4 ++--
 ruta-maven-plugin/pom.xml   | 4 ++--
 ruta-parent/pom.xml | 4 ++--
 ruta-typesystem/pom.xml | 4 ++--
 20 files changed, 41 insertions(+), 41 deletions(-)

svn commit: r47658 - in /dev/uima/uima-ruta-3.1.0-rc1: ./ eclipse-update-site-v3/ruta/ eclipse-update-site-v3/ruta/features/ eclipse-update-site-v3/ruta/plugins/

[pkluegl]

Author: pkluegl
Date: Wed May 12 15:02:19 2021
New Revision: 47658

Log:
no jira - prepare rc2

Modified:
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/artifacts.jar
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/artifacts.jar.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/artifacts.jar.sha512
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/content.jar
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/content.jar.asc
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/content.jar.sha512

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/features/org.apache.uima.ruta.feature_3.1.0.jar

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/features/org.apache.uima.ruta.feature_3.1.0.jar.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/features/org.apache.uima.ruta.feature_3.1.0.jar.sha512

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.1.0.jar

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.1.0.jar.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.1.0.jar.sha512

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.caseditor_3.1.0.jar

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.caseditor_3.1.0.jar.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.caseditor_3.1.0.jar.sha512

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.core.ext_3.1.0.jar

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.core.ext_3.1.0.jar.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.core.ext_3.1.0.jar.sha512

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.engine_3.1.0.jar

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.engine_3.1.0.jar.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.engine_3.1.0.jar.sha512

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide.ui_3.1.0.jar

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide.ui_3.1.0.jar.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide.ui_3.1.0.jar.sha512

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.1.0.jar

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.1.0.jar.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.1.0.jar.sha512

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.textruler_3.1.0.jar

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.textruler_3.1.0.jar.asc

dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.textruler_3.1.0.jar.sha512
dev/uima/uima-ruta-3.1.0-rc1/ruta-3.1.0-source-release.zip
dev/uima/uima-ruta-3.1.0-rc1/ruta-3.1.0-source-release.zip.asc
dev/uima/uima-ruta-3.1.0-rc1/ruta-3.1.0-source-release.zip.sha512

Modified: dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/artifacts.jar
==
Binary files - no diff available.

Modified: 
dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/artifacts.jar.asc
==
--- dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/artifacts.jar.asc 
(original)
+++ dev/uima/uima-ruta-3.1.0-rc1/eclipse-update-site-v3/ruta/artifacts.jar.asc 
Wed May 12 15:02:19 2021
@@ -1,16 +1,16 @@
 -BEGIN PGP SIGNATURE-
 
-iQIzBAABCAAdFiEEkADpuHJ4JTgqyYGySTRDk8CQGfMFAmCVjyoACgkQSTRDk8CQ
-GfMEPQ/7BKo+jrKqT5I3rS1J/Sz4gdIPhblcWXNo7NN2f7hZ9Vj1lg/VraBUkCEK
-50R8PrpAz7HQ2GteYE+e/TiSSQxwOI4Dd3pVV8zvngfA5KWrs7tIW9ZWnRdqSLGd
-P0k31XoDqrU5h3Rq7F/XyfCji6neAjlnd/3b5AybUrwtxHzPpunpIR46ZOS+ohSB
-IzJbnwFkFZZPrFKHU7cbauv4Aokt517z3+nF5RG+5hRJyPWL3Xzc82R1j/JxrfhT
-Cxu1uDscyANZaRhITKpLpGS032cr6iX+HASMmTYuRXdXFsdHlRRLi+1mP18Z+Xwn
-0n3uDHF3aOdDDzhpqVinbiwtwAvXYKMbYP5fkLqin9MYXnOb81Uwk0PVX3P4+LoT
-VGkkv17OIANHORfO6j0qgiEIwOP1ym5yhDYML34vtvKNVMz1+oAyf+lbWFlk9Drt
-UwMxpaUrPoBlAiXh+90jZnRp3l9HrY2lTvCa2yAJ/VtTMPE4U4iOoK6aKLdask+7
-k4Yr2HNbxZXmsHwGTwVfI4rVHwu7IBj8vWcx+vzL37JlLp8fveoBUiHQtcwe4F81
-KkR/CckyfYwWJbpCIeO9t39QPLLmyhlHkaupTeEGSNFwPlrCcr2AdL99ARj6gI/T
-pdiSsohSPdjA4YsFKMyULKmmuyuO45kyQscqRkXCPATMiIQWHCA=
-=volK
+iQIzBAABCAAdFiEEkADpuHJ4JTgqyYGySTRDk8CQGfMFAmCb7S8ACgkQSTRDk8CQ
+GfOavg//T0e8ySgka1vzA/99Lfmw5W3gU4

svn commit: r47659 - in /dev/uima: uima-ruta-3.1.0-rc1/ uima-ruta-3.1.0-rc2/

[pkluegl]

Author: pkluegl
Date: Wed May 12 15:03:11 2021
New Revision: 47659

Log:
no jira - prepare rc2

Added:
dev/uima/uima-ruta-3.1.0-rc2/
  - copied from r47658, dev/uima/uima-ruta-3.1.0-rc1/
Removed:
dev/uima/uima-ruta-3.1.0-rc1/

svn commit: r47779 - /release/uima/ruta-3.1.0/

[pkluegl]

Author: pkluegl
Date: Tue May 18 07:09:28 2021
New Revision: 47779

Log:
release spot

Added:
release/uima/ruta-3.1.0/

svn commit: r47780 - in /release/uima/ruta-3.1.0: ./ issuesFixed/ issuesFixed/css/ issuesFixed/images/ issuesFixed/images/logos/

[pkluegl]

Author: pkluegl
Date: Tue May 18 07:12:54 2021
New Revision: 47780

Log:
adding release files

Added:
release/uima/ruta-3.1.0/RELEASE_NOTES.html
release/uima/ruta-3.1.0/issuesFixed/
release/uima/ruta-3.1.0/issuesFixed/css/
release/uima/ruta-3.1.0/issuesFixed/css/maven-base.css
release/uima/ruta-3.1.0/issuesFixed/css/maven-theme.css
release/uima/ruta-3.1.0/issuesFixed/css/print.css
release/uima/ruta-3.1.0/issuesFixed/css/site.css
release/uima/ruta-3.1.0/issuesFixed/images/
release/uima/ruta-3.1.0/issuesFixed/images/collapsed.gif   (with props)
release/uima/ruta-3.1.0/issuesFixed/images/expanded.gif   (with props)
release/uima/ruta-3.1.0/issuesFixed/images/external.png   (with props)
release/uima/ruta-3.1.0/issuesFixed/images/icon_error_sml.gif   (with props)
release/uima/ruta-3.1.0/issuesFixed/images/icon_info_sml.gif   (with props)
release/uima/ruta-3.1.0/issuesFixed/images/icon_success_sml.gif   (with 
props)
release/uima/ruta-3.1.0/issuesFixed/images/icon_warning_sml.gif   (with 
props)
release/uima/ruta-3.1.0/issuesFixed/images/logos/
release/uima/ruta-3.1.0/issuesFixed/images/logos/build-by-maven-black.png   
(with props)
release/uima/ruta-3.1.0/issuesFixed/images/logos/build-by-maven-white.png   
(with props)
release/uima/ruta-3.1.0/issuesFixed/images/logos/maven-feather.png   (with 
props)
release/uima/ruta-3.1.0/issuesFixed/images/newwindow.png   (with props)
release/uima/ruta-3.1.0/issuesFixed/jira-report.html
release/uima/ruta-3.1.0/ruta-3.1.0-source-release.zip   (with props)
release/uima/ruta-3.1.0/ruta-3.1.0-source-release.zip.asc
release/uima/ruta-3.1.0/ruta-3.1.0-source-release.zip.sha512

Added: release/uima/ruta-3.1.0/RELEASE_NOTES.html
==
--- release/uima/ruta-3.1.0/RELEASE_NOTES.html (added)
+++ release/uima/ruta-3.1.0/RELEASE_NOTES.html Tue May 18 07:12:54 2021
@@ -0,0 +1,104 @@
+
+  
+
+
+  Apache UIMA Ruta v3.1.0 Release Notes
+
+
+Apache UIMA Ruta™ v3.1.0 Release Notes
+
+Contents
+
+1. What is UIMA Ruta
+2. Major Changes in this Release
+3. How to Get Involved
+4. How to Report Issues
+5. List of JIRA Issues Fixed in this Release
+  
+   
+1. What is UIMA Ruta?
+
+
+  Apache UIMA Ruta™ is a rule-based script language supported by 
Eclipse-based tooling.
+  The language is designed to enable rapid development of text processing 
applications within Apache UIMA™. 
+  A special focus lies on the intuitive and flexible domain specific language 
for defining 
+  patterns of annotations. The Eclipse-based tooling for Ruta, called the Ruta 
Workbench,
+  was created to support the user and to facilitate every step when writing 
Ruta rules. Both the 
+  Ruta rule language and the Ruta Workbench integrate smoothly with Apache 
UIMA.
+
+
+2. Major Changes in this Release
+
+
+  This release provides compatibility to UIMA v3. An upgrade from UIMA Ruta v2 
to this version requires 
+  also an update to UIMA v3 of the overall application or Eclipse 
installation. Please refer to the 
+  UIMA v3 user's guide for detailed information: 
https://uima.apache.org/d/uimaj-3.0.0/version_3_users_guide.html
+
+
+  UIMA Ruta Language and Analysis Engine:
+  
+   New config parameter for internal indexing strategy.
+   New config parameter for indexing all debug information.
+   New config parameter for type disambiguation.
+   TextSeeder is the new default seeder (faster, no MARKUP 
annotations).
+Improved null check using label expression.
+Improved conjunctive and disjunctive rule elements.
+Improved conjunct rules.
+Improved implementation of SPLIT, FILL, ADD, REMOVE, AFTER.
+Improved documentation.
+  
+  UIMA Ruta Workbench:
+  
+Fixed problems launching script using newer Java versions 
(LayerInstantiationException).
+Fixed console logging when launching scripts.
+Improved compatibility with dark mode.
+  
+  UIMA Ruta Maven Plugin:
+  
+Fail on error by default.
+  
+
+ 
+  
+3. How to Get Involved
+
+The Apache UIMA Ruta project really needs and appreciates any contributions, 
+including documentation help, source code and feedback.  If you are interested
+in contributing, please visit 
+https://uima.apache.org/get-involved.html";>
+  https://uima.apache.org/get-involved.html.
+
+  
+4. How to Report Issues
+
+The Apache UIMA project uses JIRA for issue tracking.  Please report any 
+issues you find at 
+https://issues.apache.org/jira/browse/uima";>https://issues.apache.org/jira/browse/uima
+
+  
+5. List of JIRA Issues Fixed in this Release
+
+Click issuesFixed/jira-report.html 
for the list of 
+issues fixed in this release.
+
+
+
\ No newline at end of file

Added: release/uima/ruta-3.1.0/issuesFixed/css/maven-base.css
==
--- release/uima/ruta-3.1.0/issuesFixed/css/maven-base.cs

svn commit: r47781 - in /release/uima/eclipse-update-site-v3/ruta: ./ features/ plugins/

[pkluegl]

Author: pkluegl
Date: Tue May 18 07:14:55 2021
New Revision: 47781

Log:
ruta release

Added:

release/uima/eclipse-update-site-v3/ruta/features/org.apache.uima.ruta.feature_3.1.0.jar
   (with props)

release/uima/eclipse-update-site-v3/ruta/features/org.apache.uima.ruta.feature_3.1.0.jar.asc

release/uima/eclipse-update-site-v3/ruta/features/org.apache.uima.ruta.feature_3.1.0.jar.sha512

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.1.0.jar
   (with props)

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.1.0.jar.asc

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.addons_3.1.0.jar.sha512

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.caseditor_3.1.0.jar
   (with props)

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.caseditor_3.1.0.jar.asc

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.caseditor_3.1.0.jar.sha512

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.core.ext_3.1.0.jar
   (with props)

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.core.ext_3.1.0.jar.asc

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.core.ext_3.1.0.jar.sha512

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.engine_3.1.0.jar
   (with props)

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.engine_3.1.0.jar.asc

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.engine_3.1.0.jar.sha512

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide.ui_3.1.0.jar
   (with props)

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide.ui_3.1.0.jar.asc

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide.ui_3.1.0.jar.sha512

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.1.0.jar
   (with props)

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.1.0.jar.asc

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.ide_3.1.0.jar.sha512

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.textruler_3.1.0.jar
   (with props)

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.textruler_3.1.0.jar.asc

release/uima/eclipse-update-site-v3/ruta/plugins/org.apache.uima.ruta.textruler_3.1.0.jar.sha512
Modified:
release/uima/eclipse-update-site-v3/ruta/artifacts.jar
release/uima/eclipse-update-site-v3/ruta/artifacts.jar.asc
release/uima/eclipse-update-site-v3/ruta/artifacts.jar.sha512
release/uima/eclipse-update-site-v3/ruta/content.jar
release/uima/eclipse-update-site-v3/ruta/content.jar.asc
release/uima/eclipse-update-site-v3/ruta/content.jar.sha512

Modified: release/uima/eclipse-update-site-v3/ruta/artifacts.jar
==
Binary files - no diff available.

Modified: release/uima/eclipse-update-site-v3/ruta/artifacts.jar.asc
==
--- release/uima/eclipse-update-site-v3/ruta/artifacts.jar.asc (original)
+++ release/uima/eclipse-update-site-v3/ruta/artifacts.jar.asc Tue May 18 
07:14:55 2021
@@ -1,16 +1,16 @@
 -BEGIN PGP SIGNATURE-
 
-iQIzBAABCAAdFiEEkADpuHJ4JTgqyYGySTRDk8CQGfMFAl59EJ0ACgkQSTRDk8CQ
-GfMIUhAApN+eNAHB1r8ex+OukmOcrEHz7UpeL5+vjWBWiBGp6F+B5/wSb+T+XNVb
-FotL6NjcgDrR80ba9FmceUFiVVpmKl0Mxc9Cx50jW0phdH74g0yfjHkj2UfrqGQy
-emqORUASa8JFDf+/LX9EJQ0lU/zHpQLfYy1vYK7s8J/fedj4u218IpiFBKKD4WgL
-SuLVMMSQrv00ut0lUZfjfNqajGmx8iNZv75kRtzcUKO/1SnMZn3WmWikl+NDOeKm
-L38bOxnBViA2oyX/9NygdjAuua2ZYA4a8z/R38dq9T0leEchLWRUDpW4WkfhO4Kf
-FLBi8fXIg6jk6lSaqe5vIBMPKOspZIbyxHq6hWdMoTnWa7w21RZ4hBsH4lSsLXc8
-4izh6N97gdqrqylQpCLgXiHsYoWBwAShXkboDQMMRHlOIiRqrksnrzDQtklj0tIO
-DITBvIq6+yweGWfnhdPLPxBiFmWXzk2dkSimaLe8/c6+nmKUIkoW/rCLKK/RoX/j
-uCk84Tfs/h08o2aX+t7g3eYPeZU3l4um3taBNjeUdLi/1JXdy4SMwSVSs4nYv+Nh
-AOZJr2ZL5H/N0I57fBOWWHDBvSP47yPQN+L5PbqZM1FJpL7WY+slswzsuti9+9Wu
-PnBu/ObtJtlRIR7NFj3rePlJKDJofsCKBmyUyzTv9LO0JDWcfcc=
-=vCCn
+iQIzBAABCAAdFiEEkADpuHJ4JTgqyYGySTRDk8CQGfMFAmCb7S8ACgkQSTRDk8CQ
+GfOavg//T0e8ySgka1vzA/99Lfmw5W3gU4+7bKzOam2oT2DBp7Obli9ZRYtaCV1X
+YdUQsU97rRJuNvvqrtvF0EALWWzKLjY0vg1PHyAllIfoVOfE/Dtkt7+whsbHej8w
+X9F7IWaNAsk2M8VBeAibm5xbG/Lq1w9LRi0G6NG8hO7onpY+mws8RFCZq25YHzvU
+iCVlRGBJXU4X2g8uN5lFmtgQ7G7hmvmohWVxzr22cVm7g0Ju7F3YL36CNq0Ji5Jn
+sUqRbEqT3L2zQdRTKtZDbaRMWBdRBOzyc32otRoD976udDgg6RDbP7HmrWFXQsUi
+BylN97kbl2Kt0B6ZOEoApm45qSHt6GUQ3ri5EwHRbnih4PCke3Q4ezywpdpxc/b7
+1sEY47xvPlgtwh4ilWDPDEIooQh0SARi4Qu+JOu3eVNYvDpP3sP30wIpwFFXOAo+
+BXPY447jxQowtXIiQsGbXcHnmJIxb55SVI2f2l67c0qM7oSZJSjv7viYGTdTQR7q
+/j0kJd5k9k/eKxNugJKWiEbTvkbfqBrpipGu/4+QsBhZMUAequj3ABWkSAy7BuFg
+ZQxcB4dvtuxCA1pmpl2cNr848kpKoMiNbzNtrt5J+DQgcuixR5RUi7YPZluYdCiu

svn commit: r47782 - /dev/uima/uima-ruta-3.1.0-rc2/

[pkluegl]

Author: pkluegl
Date: Tue May 18 07:17:41 2021
New Revision: 47782

Log:
remove rc

Removed:
dev/uima/uima-ruta-3.1.0-rc2/

[uima-ruta] annotated tag rel/ruta-3.1.0 updated (ade09ef -> dee4467)

[pkluegl]

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

pkluegl pushed a change to annotated tag rel/ruta-3.1.0
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


*** WARNING: tag rel/ruta-3.1.0 was modified! ***

from ade09ef  (commit)
  to dee4467  (tag)
 tagging ade09ef00562a416f0ae40a55cbf816b60b2e664 (commit)
  by Peter Klügl
  on Tue May 18 09:18:25 2021 +0200

- Log -
---


No new revisions were added by this update.

Summary of changes:

[uima-ruta] branch main updated (8b59f62 -> 65daca9)

[pkluegl]

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

pkluegl pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 8b59f62  [UIMA-6360] UIMA Ruta 3.1.0 release
 add ba05f00  [UIMA-6360] UIMA Ruta 3.1.0 release
 add 424c575  [maven-release-plugin] prepare release ruta-3.1.0
 add 12cefeb  Revert "[maven-release-plugin] prepare release ruta-3.1.0"
 add 1963427  [UIMA-6360] UIMA Ruta 3.1.0 release
 add 0d41bb8  [UIMA-6360] UIMA Ruta 3.1.0 release
 add 40ae9fa  [maven-release-plugin] prepare release ruta-3.1.0
 add 9ee00d8  [maven-release-plugin] prepare for next development iteration
 add 33705d0  [UIMA-6360] UIMA Ruta 3.1.0 release
 add 0b0c9d6  Revert "[maven-release-plugin] prepare for next development 
iteration"
 add 8336b36  Revert "[maven-release-plugin] prepare release ruta-3.1.0"
 add 18b9c6b  [UIMA-6360] UIMA Ruta 3.1.0 release
 add 4b6a018  [maven-release-plugin] prepare release ruta-3.1.0
 add b9a28a8  [maven-release-plugin] prepare for next development iteration
 add 661478c  no jira - manual rollback
 add fd25838  [UIMA-6362] Ruta: update versions and notice in eclipse 
plugin bundles
 add 97ff6f1  [UIMA-6362] Ruta: update versions and notice in eclipse 
plugin bundles
 add ade1c50  [UIMA-6361] p2-layout-resolver upgrade required for Java 16 
builds
 add 74e2c54  [UIMA-6362] Ruta: update versions and notice in eclipse 
plugin bundles
 add 3bdfda9  Merge pull request #57 from 
apache/UIMA-6362-Ruta-update-versions-and-notice-in-eclipse-plugin-bundles
 add b62ba33  [maven-release-plugin] prepare release ruta-3.1.0
 add 0f0fb55  Revert "[maven-release-plugin] prepare release ruta-3.1.0"
 add ade09ef  [maven-release-plugin] prepare release ruta-3.1.0
 add 65daca9  [maven-release-plugin] prepare for next development iteration

No new revisions were added by this update.

Summary of changes:
 .../ruta-ep-example-extensions/pom.xml |   7 +-
 example-projects/ruta-maven-example/pom.xml|  12 +-
 pom.xml|  42 +--
 ruta-basic-type/pom.xml|  12 +-
 ruta-core-ext/pom.xml  |  12 +-
 ruta-core/pom.xml  |  21 +-
 .../org/apache/uima/ruta/engine/RutaTestUtils.java |   7 +-
 .../uima/ruta/resource/MultiTreeWordList.java  |   7 +-
 ruta-docbook/pom.xml   |  12 +-
 ruta-eclipse-feature/pom.xml   |  12 +-
 ruta-eclipse-update-site/category.xml  |   2 +-
 ruta-eclipse-update-site/pom.xml   |  74 ++---
 ruta-ep-addons/pom.xml |  13 +-
 ruta-ep-caseditor/pom.xml  |  13 +-
 ruta-ep-core-ext/pom.xml   |  13 +-
 ruta-ep-engine/pom.xml |  51 +--
 ruta-ep-engine/src/main/readme_bin/LICENSE | 359 +
 ruta-ep-engine/src/main/readme_bin/NOTICE  | 135 
 ruta-ep-ide-ui/pom.xml |  13 +-
 ruta-ep-ide/pom.xml|  15 +-
 ruta-ep-parent/pom.xml |  14 +-
 ruta-ep-textruler/pom.xml  |  12 +-
 ruta-maven-archetype/pom.xml   |  12 +-
 ruta-maven-plugin/pom.xml  |  12 +-
 ruta-parent/pom.xml| 140 ++--
 ruta-typesystem/pom.xml|  12 +-
 26 files changed, 619 insertions(+), 415 deletions(-)

svn commit: r1889992 [2/3] - in /uima/site/trunk/uima-website: docs/d/ruta-current/tools.ruta.book.html docs/d/ruta-current/tools.ruta.book.pdf docs/downloads.html docs/news.html docs/ruta.html xdocs/

[pkluegl]

Modified: uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.html
URL: 
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.html?rev=1889992&r1=1889991&r2=1889992&view=diff
==
--- uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.html 
(original)
+++ uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.html Tue 
May 18 08:50:02 2021
@@ -2,7 +2,7 @@
   
Apache UIMA Ruta™ Guide and Referencehttp://docbook.org/ns/docbook"; 
class="titlepage">Apache UIMA Ruta™ Guide and 
Reference
   Written and maintained by the Apache UIMA 
Development Community
-Version 3.0.1Copyright © 2011, 2020 The Apache Software 
Foundation
+Version 3.1.0Copyright © 2011, 2021 The Apache Software 
Foundation

   
 License and Disclaimer. 
@@ -35,8 +35,8 @@
 the trademark or service mark.
 
   
-March, 
2020Table of 
Contents1. Apache UIMA Ruta 
Overview1.1. What is Apache UIMA 
Ruta?1.2. Getting 
started1.3. Core 
Concepts1.4. Learning by 
Example1.5. UIMA Analysis 
Engines1.5.1. Ruta Engine1.5.2. Annotation 
Writer
 1.5.3. Plain 
Text Annotator1.5.4. Modifier1.5.5. HTML 
Annotator1.5.6. HTML 
Converter1.5.7. Style Map 
Creator1.5.8. Cutter1.5.9. View 
Writer1.5.10. XMI 
Writer2. Apache UIMA Ruta 
Language2.1. Syntaxhref="#ugr.tools.ruta.language.anchoring">2.2. Rule elements and their 
 >matching orderhref="#ugr.tools.ruta.language.seeding">2.3. Basic annotations and 
 >tokenshref="#ugr.tools.ruta.language.quantifier">2.4. 
 >Quantifiershref="#ugr.tools.ruta.language.quantifier.sg">2.4.1. * Star 
 >Greedyhref="#ugr.tools.ruta.language.quantifier.sr">2.4.2. *? Star 
 >Reluctanthref="#ugr.tools.ruta.language.quantifier.pg">2.4.3. + Plus 
 >Greedyhref="#ugr.tools.ruta.language.quantifier.pr">2.4.4. +? Plus 
 >Reluctanthref="#ugr.tools.ruta.language.quantifier.qg">2.4.5. ? Question 
 >Greedy2.4.6. ?? Question 
Reluctant2.4.7. [x,y] Min Max 
Greedy2.4.8. [x,y]? Min Max 
Reluctant2.5. 
Declarations2.5.1. 
Types2.5.2. 
Variables2.5.3. 
Resources2.5.4. 
Scripts2.5.5. Components<
 /a>2.6. 
Expressions2.6.1. Type 
Expressions2.6.2. Annotation 
Expressions2.6.3. Number 
Expressions2.6.4. String 
Expressions2.6.5. Boolean 
Expressions2.6.6. List 
Expressions2.6.7. Feature 
Expressions<
 /dd>2.7. 
Conditions2.7.1. 
AFTER2.7.2. 
AND2.7.3. 
BEFORE2.7.4. 
CONTAINS2.7.5. 
CONTEXTCOUNT2.7.6. 
COUNT2.7.7. 
CURRENTCOUNT2.7.8. ENDSWITH<
 /dt>2.7.9. 
FEATURE2.7.10. 
IF2.7.11. 
INLIST2.7.12. 
IS2.7.13. 
LAST2.7.14. 
MOFN2.7.15. 
NEAR2.7.16. 
NOT2.7.17. 
OR2.7.18. PARSE2.7.19. 
PARTOF2.7.20. 
PARTOFNEQ2.7.21. 
POSITION2.7.22. 
REGEXP2.7.23. 
SCORE2.7.24. 
SIZE2.7.25. 
STARTSWITH2.7.26. 
TOTALCOUNT2.7.27. VOTE2.8. 
Actions2.8.1. ADD2.8.2. 
ADDFILTERTYPE2.8.3. 
ADDRETAINTYPE2.8.4. 
ASSIGN2.8.5. 
CALL2.8.6. 
CLEAR2.8.7. 
COLOR
 2.8.8. CONFIGURE2.8.9. 
CREATE2.8.10. 
DEL2.8.11. 
DYNAMICANCHORING2.8.12. 
EXEC2.8.13. 
FILL2.8.14. 
FILTERTYPE2.8.15. 
GATHER2.8.16. 
GET2.8.17. 
GETFEATURE<
 /dt>2.8.18. 
GETLIST2.8.19. 
GREEDYANCHORING2.8.20. 
LOG2.8.21. 
MARK2.8.22. 
MARKFAST2.8.23. 
MARKFIRST2.8.24. 
MARKLAST2.8.25. 
MARKONCE2.8.26. 
MARKSCORE<
 span class="section">2.8.27. 
MARKTABLE2.8.28. 
MATCHEDTEXT2.8.29. 
MERGE2.8.30. 
REMOVE2.8.31. 
REMOVEDUPLICATE2.8.32. 
REMOVEFILTERTYPE2.8.33. 
REMOVERETAINTYPE2.8.34. 
REPLACE
 2.8.35. RETAINTYPE2.8.36. 
SETFEATURE2.8.37. 
SHIFT2.8.38. 
SPLIT2.8.39. 
TRANSFER2.8.40. 
TRIE2.8.41. 
TRIM2.8.42. 
UNMARK2.8.43. 
UNMARKALL2.9. Robust extraction using
  filtering2.10. Wildcard 
#2.11. Optional match 
_2.12. Label 
expressions2.13. 
Blocks2.13.1. 
BLOCK2.13.2. 
FOREACH2.14. Inlined 
rules2.15. Macros for conditions and 
actions2.16. Heuristic extraction using scor
 ing rules2.17. 
Modification2.18. External 
resources2.18.1. WORDLISTs2.18.2. WORDTABLEs2.19. Simple 
Rules based on Regular Expressions2.20. Language 
Extensions2.20.1. Provided 
Extensions2.20.2. Adding new Language 
Elements3. Apache UIMA Ruta 
Workbench3.1. 
Installation3.2. UIMA Ruta Workbench 
Overview3.3. UIMA Ruta 
Projects3.3.1. UIMA 
Ruta create project wizard3.4. UIMA Ruta 
Perspective3.4.1.
 Annotation Browser3.4.2. 
Selection3.5. UIMA Ruta 
Explain Perspective3.5.1.
 Applied Rules3.5.2.
 Matched Rules and Failed Rules3.5.3.
 Rule Elements3.5.4.
 Inlined Rules3.5.5.
 Covering Rules3.5.6. Rule List3.5.7. 
Created By3.5.8. 
Statistics3.6. UIMA Ruta CDE 
perspective3.6.1. CDE Documents 
view3.6.2. CDE Constraints 
view3.6.3. CDE Result 
view3.7. Ruta Query 
View3.8. Testing3.8.1. 
Usage3.8.2. 
Evaluators3.9. 
TextRuler3.9.1. Included rule 
learning algorithms3.9.2. The TextRuler 
view3.10. Check Annotations 
view3.11. Creation of 
Tree Word Lists3.
 12. Apply a UIMA Ruta script to a folder4. Apache UIMA Ruta 
HowTos4.1. Apply UIMA Ruta Analysis Engine in 
plain Java4.2. Integrating UIMA Ruta in an existing 
UIMA Annotator4.2.1. Adding Rut

svn commit: r1889992 [3/3] - in /uima/site/trunk/uima-website: docs/d/ruta-current/tools.ruta.book.html docs/d/ruta-current/tools.ruta.book.pdf docs/downloads.html docs/news.html docs/ruta.html xdocs/

[pkluegl]

Modified: uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.pdf
URL: 
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.pdf?rev=1889992&r1=1889991&r2=1889992&view=diff
==
Binary files - no diff available.

Modified: uima/site/trunk/uima-website/docs/downloads.html
URL: 
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/downloads.html?rev=1889992&r1=1889991&r2=1889992&view=diff
==
--- uima/site/trunk/uima-website/docs/downloads.html (original)
+++ uima/site/trunk/uima-website/docs/downloads.html Tue May 18 08:50:02 2021
@@ -889,27 +889,27 @@ Other mirrors: 
 
   
 
-  https://svn.apache.org/repos/asf/uima/site/archive/docs/d/ruta-3.0.1/RELEASE_NOTES.html";>
-  UIMA Ruta 3.0.1
+  https://svn.apache.org/repos/asf/uima/site/archive/docs/d/ruta-3.1.0/RELEASE_NOTES.html";>
+  UIMA Ruta 3.1.0
   
 
-html
+html
   
 
 
 
 
   
- zip
- [asc]
+ zip
+ [asc]
 
 
- [sha512]
+ [sha512]
  
 
   
 
-  17-Apr-2020
+  15-May-2021
 
   
 

Modified: uima/site/trunk/uima-website/docs/news.html
URL: 
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/news.html?rev=1889992&r1=1889991&r2=1889992&view=diff
==
--- uima/site/trunk/uima-website/docs/news.html (original)
+++ uima/site/trunk/uima-website/docs/news.html Tue May 18 08:50:02 2021
@@ -232,6 +232,13 @@
 
   
 
+  18 May 2020
+  
+  Apache UIMA Ruta 3.1.0 released
+
+  
+
+  
   06 May 2021
   
   Apache uimaFIT 3.2.0 released
@@ -824,6 +831,67 @@
 


+   
+  
+18 May 2020
+– Apache UIMA Ruta 3.1.0 released
+
+  
+  
+  
+
+Apache UIMA Ruta is a rule-based script 
language supported by
+Eclipse-based tooling. The language is designed to enable rapid
+development of text processing applications within UIMA. A special 
focus
+lies on the intuitive and flexible domain specific language for 
defining
+patterns of annotations. The Eclipse-based tooling,
+called the Apache UIMA Ruta Workbench, supports the
+user and facilitates every step when writing rules. Both
+the rule language and the workbench integrate
+smoothly with Apache UIMA.
+  
+Major Changes in this 
Release
+
+This release provides compatibility to UIMA v3. 
+An upgrade from UIMA Ruta v2 to this version 
+requires also an update to UIMA v3 of the overall application and/or 
Eclipse installation. 
+Please refer to the UIMA v3 user's guide for detailed information: 
+https://uima.apache.org/d/uimaj-3.2.0/version_3_users_guide.html
+  
+
+UIMA Ruta Language and Analysis Engine:
+
+  New config parameter for internal indexing strategy.
+  New config parameter for indexing all debug information.
+  New config parameter for type disambiguation.
+  TextSeeder is the new default seeder (faster, no MARKUP 
annotations).
+  Improved null check using label expression.
+  Improved conjunctive and disjunctive rule elements.
+  Improved conjunct rules.
+  Improved implementation of SPLIT, FILL, ADD, REMOVE, AFTER.
+  Improved documentation.
+
+UIMA Ruta Workbench:
+
+  Fixed problems launching script using newer Java versions 
(LayerInstantiationException).
+  Fixed console logging when launching scripts.
+  Improved compatibility with dark mode.
+
+UIMA Ruta Maven Plugin:
+
+  Fail on error by default.
+
+  
+For a complete list of bugs 
and improvements included in this release please see
+  https://svn.apache.org/repos/asf/uima/site/archive/docs/d/ruta-3.1.0/issuesFixed/jira-report.html";>issue
 report.
+  
+
+
+
+  
+
+   
+   

svn commit: r1889992 [1/3] - in /uima/site/trunk/uima-website: docs/d/ruta-current/tools.ruta.book.html docs/d/ruta-current/tools.ruta.book.pdf docs/downloads.html docs/news.html docs/ruta.html xdocs/

[pkluegl]

Author: pkluegl
Date: Tue May 18 08:50:02 2021
New Revision: 1889992

URL: http://svn.apache.org/viewvc?rev=1889992&view=rev
Log:
ruta release

Modified:
uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.html
uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.pdf
uima/site/trunk/uima-website/docs/downloads.html
uima/site/trunk/uima-website/docs/news.html
uima/site/trunk/uima-website/docs/ruta.html
uima/site/trunk/uima-website/xdocs/news.xml
uima/site/trunk/uima-website/xdocs/ruta.xml
uima/site/trunk/uima-website/xdocs/stylesheets/project.xml

svn commit: r1889993 - in /uima/site/trunk/uima-website: docs/ruta.html xdocs/ruta.xml

[pkluegl]

Author: pkluegl
Date: Tue May 18 09:12:27 2021
New Revision: 1889993

URL: http://svn.apache.org/viewvc?rev=1889993&view=rev
Log:
mention v3 update site

Modified:
uima/site/trunk/uima-website/docs/ruta.html
uima/site/trunk/uima-website/xdocs/ruta.xml

Modified: uima/site/trunk/uima-website/docs/ruta.html
URL: 
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/ruta.html?rev=1889993&r1=1889992&r2=1889993&view=diff
==
--- uima/site/trunk/uima-website/docs/ruta.html (original)
+++ uima/site/trunk/uima-website/docs/ruta.html Tue May 18 09:12:27 2021
@@ -284,7 +284,7 @@
 
   
 The UIMA Ruta Workbench can be installed via our Eclipse update site:
-https://downloads.apache.org/uima/eclipse-update-site/";>https://downloads.apache.org/uima/eclipse-update-site/
+https://downloads.apache.org/uima/eclipse-update-site-v3/";>https://downloads.apache.org/uima/eclipse-update-site-v3/

   
 The UIMA Ruta Workbench 3.1.0/2.8.0 is tested with Eclipse 2019-9 
(older versions but Mars may still supported). The UIMA Ruta Workbench 2.3.0 - 
2.4.0 is tested with Eclipse 4.3 (Kepler) and Eclipse 4.4 (Luna). The UIMA Ruta 
Workbench 2.2.1 requires Eclipse 4.3.2

Modified: uima/site/trunk/uima-website/xdocs/ruta.xml
URL: 
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/ruta.xml?rev=1889993&r1=1889992&r2=1889993&view=diff
==
--- uima/site/trunk/uima-website/xdocs/ruta.xml (original)
+++ uima/site/trunk/uima-website/xdocs/ruta.xml Tue May 18 09:12:27 2021
@@ -51,7 +51,7 @@ under the License.
 
   
 The UIMA Ruta Workbench can be installed via our Eclipse update site:
-https://downloads.apache.org/uima/eclipse-update-site/";>https://downloads.apache.org/uima/eclipse-update-site/
+https://downloads.apache.org/uima/eclipse-update-site-v3/";>https://downloads.apache.org/uima/eclipse-update-site-v3/

   
 The UIMA Ruta Workbench 3.1.0/2.8.0 is tested with Eclipse 2019-9 
(older versions but Mars may still supported). The UIMA Ruta Workbench 2.3.0 - 
2.4.0 is tested with Eclipse 4.3 (Kepler) and Eclipse 4.4 (Luna). The UIMA Ruta 
Workbench 2.2.1 requires Eclipse 4.3.2

[uima-uimaj] branch bugfix/UIMA-6367-JCas-cover-annotation-created-in-PEAR-context-replaced-during-index-operations created (now 7b85a62)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6367-JCas-cover-annotation-created-in-PEAR-context-replaced-during-index-operations
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.


  at 7b85a62  UIMA-6367: JCas cover annotation created in PEAR context 
replaced during index operations

This branch includes the following new commits:

 new 7b85a62  UIMA-6367: JCas cover annotation created in PEAR context 
replaced during index operations

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-uimaj] 01/01: UIMA-6367: JCas cover annotation created in PEAR context replaced during index operations

[pkluegl]

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

pkluegl pushed a commit to branch 
bugfix/UIMA-6367-JCas-cover-annotation-created-in-PEAR-context-replaced-during-index-operations
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git

commit 7b85a62f6679ad780b321cb3ae702e70fbf5bd4e
Author: Peter Klügl 
AuthorDate: Thu May 27 11:37:13 2021 +0200

UIMA-6367: JCas cover annotation created in PEAR context replaced during 
index operations

- fixed trampoline map
- added test that checks annotation instance in mocked pear context
---
 .../java/org/apache/uima/cas/impl/CASImpl.java |   1 +
 .../uima/cas/test/FSCreatedInPearContextTest.java  | 107 +
 2 files changed, 108 insertions(+)

diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java 
b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
index 690b525..1e918cd 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
@@ -1483,6 +1483,7 @@ public class CASImpl extends AbstractCas_ImplBase 
implements CAS, CASMgr, LowLev
   svd.reuseId = 0;
 }
 svd.id2base.put(baseFs);
+svd.id2tramp.put(baseFs._id, (TOP) fs);
 pearBaseFs = baseFs;
 return true;
   }
diff --git 
a/uimaj-core/src/test/java/org/apache/uima/cas/test/FSCreatedInPearContextTest.java
 
b/uimaj-core/src/test/java/org/apache/uima/cas/test/FSCreatedInPearContextTest.java
new file mode 100644
index 000..4c11189
--- /dev/null
+++ 
b/uimaj-core/src/test/java/org/apache/uima/cas/test/FSCreatedInPearContextTest.java
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.uima.cas.test;
+
+import static org.apache.uima.UIMAFramework.getXMLParser;
+import static org.apache.uima.UIMAFramework.newDefaultResourceManager;
+import static org.apache.uima.util.CasCreationUtils.createCas;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.test.JCasClassLoaderTest.IsolatingClassloader;
+import org.apache.uima.cas.test.JCasClassLoaderTest.JCasCreator;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.tcas.Annotation;
+import org.apache.uima.resource.ResourceManager;
+import org.apache.uima.resource.metadata.TypeSystemDescription;
+import org.apache.uima.util.InvalidXMLException;
+import org.apache.uima.util.XMLInputSource;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class FSCreatedInPearContextTest {
+
+  @Test
+  public void thatAnnotationIsCreatedOnce() throws Exception, IOException {
+
+ClassLoader rootCl = getClass().getClassLoader();
+
+IsolatingClassloader clForCas = new IsolatingClassloader("CAS", rootCl);
+
+ClassLoader clForToken = new IsolatingClassloader("Token", rootCl)
+.redefining("org\\.apache\\.uima\\.cas\\.test\\.Token(_Type)?.*");
+
+TypeSystemDescription tsd = loadTokensAndSentencesTS();
+
+JCas jcas = makeJCas(clForCas, tsd);
+jcas.setDocumentText("Test");
+
+CASImpl casImpl = jcas.getCasImpl();
+casImpl.switchClassLoader(clForToken, false);
+
+Annotation mockedPearToken = createToken(jcas, clForToken);
+
+Annotation indexedToken = 
jcas.getAnnotationIndex(Token.class).iterator().next();
+
+Assert.assertTrue("Token identical", mockedPearToken == indexedToken);
+  }
+
+  private Annotation createToken(JCas jcas, ClassLoader clForToken) throws 
Exception {
+Class tokenClass = clForToken.loadClass(Token.class.getName());
+Constructor constructor = tokenClass.getConstructor(JCas.class);
+Annotation token = (Annotation) constructor.newInstance(jcas);
+token.addToIndexes();
+return token;
+  }
+
+  private TypeSystemDescription loadTokensAndSentencesTS() throws 
InvalidXMLException, IOException {
+return getXMLParser().parseTypeSystemDescription(new XMLInputSource(
+new 
File("src/test/resources/CASTests/desc/TokensAndSentencesTS.xml")));
+  }
+
+  private JCas makeJCas

[uima-uimaj] branch bugfix/UIMA-6367-JCas-cover-annotation-created-in-PEAR-context-replaced-during-index-operations updated (7b85a62 -> ebe476b)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6367-JCas-cover-annotation-created-in-PEAR-context-replaced-during-index-operations
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.


from 7b85a62  UIMA-6367: JCas cover annotation created in PEAR context 
replaced during index operations
 add ebe476b  TM-975: Discuss resource lookup for multiple identical 
classpath lookup paths

No new revisions were added by this update.

Summary of changes:
 .../main/java/org/apache/uima/jcas/impl/JCasHashMapSubMap.java   | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

[uima-uimaj] branch bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk created (now 48f0526)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.


  at 48f0526  [UIMA-6393]: Circular imports break resource manager cache PK

This branch includes the following new commits:

 new 48f0526  [UIMA-6393]: Circular imports break resource manager cache PK

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-uimaj] 01/01: [UIMA-6393]: Circular imports break resource manager cache PK

[pkluegl]

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

pkluegl pushed a commit to branch 
bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git

commit 48f0526f4c80d2e328e9888a48eee72cf7bc8515
Author: Peter Klügl 
AuthorDate: Fri Nov 5 17:45:00 2021 +0100

[UIMA-6393]: Circular imports break resource manager cache PK

- various exploratory changes for testing different solutions, very work in 
progress
---
 .../metadata/impl/TypeSystemDescription_impl.java  | 271 +-
 .../impl/TypeSystemDescription_impl_old.java   | 299 
 .../impl/TypeSystemDescription_impl_pk.java| 312 +
 ...pl.java => TypeSystemDescription_impl_rec.java} |   0
 .../impl/TypeSystemDescription_implTest.java   |  33 +--
 5 files changed, 695 insertions(+), 220 deletions(-)

diff --git 
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
 
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
index 7e5f1cb..5af0d37 100644
--- 
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
+++ 
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
@@ -19,13 +19,13 @@
 
 package org.apache.uima.resource.metadata.impl;
 
-import static java.util.Arrays.asList;
-import static org.apache.uima.UIMAFramework.getXMLParser;
-
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -75,7 +75,6 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
   /**
* @see ResourceMetaData#getName()
*/
-  @Override
   public String getName() {
 return mName;
   }
@@ -83,7 +82,6 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
   /**
* @see ResourceMetaData#setName(String)
*/
-  @Override
   public void setName(String aName) {
 mName = aName;
   }
@@ -91,7 +89,6 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
   /**
* @see ResourceMetaData#getVersion()
*/
-  @Override
   public String getVersion() {
 return mVersion;
   }
@@ -99,7 +96,6 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
   /**
* @see ResourceMetaData#setVersion(String)
*/
-  @Override
   public void setVersion(String aVersion) {
 mVersion = aVersion;
   }
@@ -107,7 +103,6 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
   /**
* @see ResourceMetaData#getDescription()
*/
-  @Override
   public String getDescription() {
 return mDescription;
   }
@@ -115,7 +110,6 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
   /**
* @see ResourceMetaData#setDescription(String)
*/
-  @Override
   public void setDescription(String aDescription) {
 mDescription = aDescription;
   }
@@ -123,7 +117,6 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
   /**
* @see ResourceMetaData#getVendor()
*/
-  @Override
   public String getVendor() {
 return mVendor;
   }
@@ -131,7 +124,6 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
   /**
* @see ResourceMetaData#setVendor(String)
*/
-  @Override
   public void setVendor(String aVendor) {
 mVendor = aVendor;
   }
@@ -139,7 +131,6 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
   /**
* @see TypeSystemDescription#getImports()
*/
-  @Override
   public Import[] getImports() {
 return mImports;
   }
@@ -147,7 +138,6 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
   /**
* @see TypeSystemDescription#setImports(Import[])
*/
-  @Override
   public void setImports(Import[] aImports) {
 if (aImports == null) {
   throw new 
UIMA_IllegalArgumentException(UIMA_IllegalArgumentException.ILLEGAL_ARGUMENT,
@@ -159,7 +149,6 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
   /**
* @see TypeSystemDescription#getTypes()
*/
-  @Override
   public TypeDescription[] getTypes() {
 return mTypes;
   }
@@ -167,7 +156,6 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
   /**
* @see TypeSystemDescription#setTypes(TypeDescription[])
*/
-  @Override
   public void setTypes(TypeDescription[] aTypes) {
 if (aTypes == null) {
   throw new 
UIMA_IllegalArgumentException(UIMA_IllegalArgumentException.ILLEGAL_ARGUMENT,
@@ -179,7 +167,6 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
   /**
* @see TypeSystemDescription#addType(String, String, String)
*/
-  @Override
   public TypeDescription addType(String aTypeN

[uima-uimaj] branch bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk updated: [UIMA-6393]: Circular imports break resource manager cache PK

[pkluegl]

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

pkluegl pushed a commit to branch 
bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git


The following commit(s) were added to 
refs/heads/bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk by 
this push:
 new 1e38ecb  [UIMA-6393]: Circular imports break resource manager cache PK
1e38ecb is described below

commit 1e38ecb10830e8f64bdf84ec4b8f9a30eb99086e
Author: Peter Klügl 
AuthorDate: Sat Nov 6 14:04:31 2021 +0100

[UIMA-6393]: Circular imports break resource manager cache PK

- comment temp code variants
---
 .../impl/TypeSystemDescription_impl_old.java   | 598 +++---
 .../impl/TypeSystemDescription_impl_pk.java| 624 +++
 .../impl/TypeSystemDescription_impl_rec.java   | 890 ++---
 3 files changed, 1056 insertions(+), 1056 deletions(-)

diff --git 
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl_old.java
 
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl_old.java
index 6e9f3f2..9772018 100644
--- 
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl_old.java
+++ 
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl_old.java
@@ -1,299 +1,299 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.uima.resource.metadata.impl;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.apache.uima.UIMAFramework;
-import org.apache.uima.UIMA_IllegalArgumentException;
-import org.apache.uima.resource.ResourceManager;
-import org.apache.uima.resource.impl.ResourceManager_impl;
-import org.apache.uima.resource.metadata.Import;
-import org.apache.uima.resource.metadata.ResourceMetaData;
-import org.apache.uima.resource.metadata.TypeDescription;
-import org.apache.uima.resource.metadata.TypeSystemDescription;
-import org.apache.uima.util.InvalidXMLException;
-import org.apache.uima.util.XMLInputSource;
-import org.apache.uima.util.XMLizable;
-
-/**
- * Reference implementation of {@link TypeSystemDescription}.
- * 
- * 
- */
-public class TypeSystemDescription_impl extends MetaDataObject_impl implements
-TypeSystemDescription {
-
-  static final long serialVersionUID = -3372766232454730201L;
-
-  private String mName;
-
-  private String mVersion;
-
-  private String mDescription;
-
-  private String mVendor;
-
-  private Import[] mImports = Import.EMPTY_IMPORTS;
-
-  /** Descriptions of all Types in this type system. */
-  private TypeDescription[] mTypes = TypeDescription.EMPTY_TYPE_DESCRIPTIONS;
-
-  /**
-   * Creates a new TypeSystemDescription_impl.
-   */
-  public TypeSystemDescription_impl() {
-  }
-
-  /**
-   * @see ResourceMetaData#getName()
-   */
-  public String getName() {
-return mName;
-  }
-
-  /**
-   * @see ResourceMetaData#setName(String)
-   */
-  public void setName(String aName) {
-mName = aName;
-  }
-
-  /**
-   * @see ResourceMetaData#getVersion()
-   */
-  public String getVersion() {
-return mVersion;
-  }
-
-  /**
-   * @see ResourceMetaData#setVersion(String)
-   */
-  public void setVersion(String aVersion) {
-mVersion = aVersion;
-  }
-
-  /**
-   * @see ResourceMetaData#getDescription()
-   */
-  public String getDescription() {
-return mDescription;
-  }
-
-  /**
-   * @see ResourceMetaData#setDescription(String)
-   */
-  public void setDescription(String aDescription) {
-mDescription = aDescription;
-  }
-
-  /**
-   * @see ResourceMetaData#getVendor()
-   */
-  public String getVendor() {
-return mVendor;
-  }
-
-  /**
-   * @see ResourceMetaData#setVendor(String)
-   */
-  public void setVendor(String aVendor) {
-mVendor = aVendor;
-  }
-
-  /**
-   * @see TypeSystemDescription#getImports()
-   */
-  public Import[] getImports() {

[uima-uimaj] branch bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk updated: [UIMA-6393]: Circular imports break resource manager cache PK

[pkluegl]

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

pkluegl pushed a commit to branch 
bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git


The following commit(s) were added to 
refs/heads/bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk by 
this push:
 new 74ae2b3  [UIMA-6393]: Circular imports break resource manager cache PK
74ae2b3 is described below

commit 74ae2b3843cd30a4359fd59d7d63e25d07073fa5
Author: Peter Klügl 
AuthorDate: Sat Nov 6 15:10:27 2021 +0100

[UIMA-6393]: Circular imports break resource manager cache PK

- resolve imports if possible for better caching
- added another test for that scenario
---
 .../metadata/impl/TypeSystemDescription_impl.java  | 51 
 .../impl/TypeSystemDescription_implTest.java   | 56 ++
 .../Transitive-with-3-nodes-1.xml  | 39 +++
 .../Transitive-with-3-nodes-2.xml  | 39 +++
 .../Transitive-with-3-nodes-3.xml  | 38 +++
 5 files changed, 214 insertions(+), 9 deletions(-)

diff --git 
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
 
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
index 5af0d37..3f85567 100644
--- 
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
+++ 
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
@@ -24,8 +24,8 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
+import java.util.Deque;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -218,38 +218,69 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
   return;
 }
 
+Deque typeSystemStack = new LinkedList<>();
+typeSystemStack.push(getSourceUrlString());
 aAlreadyImportedTypeSystemURLs.add(getSourceUrlString());
-collectTypeDescriptions(result, aAlreadyImportedTypeSystemURLs, 
aResourceManager);
+
+collectTypeDescriptions(result, typeSystemStack, 
aAlreadyImportedTypeSystemURLs,
+aResourceManager);
+typeSystemStack.pop();
+
 setTypes(result.toArray(new TypeDescription_impl[0]));
 // clear imports
 this.setImports(Import.EMPTY_IMPORTS);
   }
 
-  public void collectTypeDescriptions(List result, 
Collection visited,
-  ResourceManager aResourceManager) throws InvalidXMLException {
+  public boolean collectTypeDescriptions(List result, 
Deque stack,
+  Collection visited, ResourceManager aResourceManager) throws 
InvalidXMLException {
 
-result.addAll(Arrays.asList(getTypes()));
+List unresolvedImports = new ArrayList<>();
+List resolvedTypeDescriptions = new ArrayList<>();
+resolvedTypeDescriptions.addAll(Arrays.asList(getTypes()));
+
+boolean completelyResolved = true;
 
 Import[] imports = getImports();
 for (Import tsImport : imports) {
 
   URL url = tsImport.findAbsoluteUrl(aResourceManager);
   String urlString = url.toString();
+
   if (visited.contains(urlString)) {
+// cycle detected? -> complete=false, not able to completely resolve 
imports right now
+completelyResolved &= !stack.contains(urlString);
 continue;
   }
+  stack.push(urlString);
   visited.add(urlString);
+
   TypeSystemDescription_impl importedDescription = 
getTypeSystemDescription(url,
   aResourceManager);
-  importedDescription.collectTypeDescriptions(result, visited, 
aResourceManager);
+  boolean importCompletelyCollected = importedDescription
+  .collectTypeDescriptions(resolvedTypeDescriptions, stack, 
visited, aResourceManager);
+  if (!importCompletelyCollected) {
+// TODO: update importUrlsCache? here or at all?
+unresolvedImports.add(tsImport);
+  }
+  completelyResolved &= importCompletelyCollected;
+  stack.pop();
+}
+
+if (imports.length != unresolvedImports.size()) {
+  // update own resolved status
+  setTypes(resolvedTypeDescriptions.toArray(new TypeDescription_impl[0]));
+  setImports(unresolvedImports.toArray(new Import[0]));
 }
+result.addAll(resolvedTypeDescriptions);
+
+return completelyResolved;
   }
 
   private TypeSystemDescription_impl getTypeSystemDescription(URL url,
   ResourceManager resourceManager) throws InvalidXMLException {
 
 String urlString = url.toString();
-
+// TODO where to synchronize the importCache?
 Map importCache = ((ResourceManager_impl) 
resourceManager).getImportCache();
 XMLizable cachedObject = importCache.get(urlString);
   

[uima-uimaj] branch bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk updated: [UIMA-6393]: Circular imports break resource manager cache PK

[pkluegl]

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

pkluegl pushed a commit to branch 
bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git


The following commit(s) were added to 
refs/heads/bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk by 
this push:
 new 767c530  [UIMA-6393]: Circular imports break resource manager cache PK
767c530 is described below

commit 767c530a403a0aa3fe997b0b66fc60aff64ef45e
Author: Peter Klügl 
AuthorDate: Sat Nov 6 15:16:27 2021 +0100

[UIMA-6393]: Circular imports break resource manager cache PK

- some cleanup and renaming
---
 .../metadata/impl/TypeSystemDescription_impl.java  | 54 --
 1 file changed, 9 insertions(+), 45 deletions(-)

diff --git 
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
 
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
index 3f85567..32e8a06 100644
--- 
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
+++ 
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
@@ -28,7 +28,6 @@ import java.util.Deque;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.TreeSet;
 
 import org.apache.uima.UIMAFramework;
@@ -222,16 +221,14 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
 typeSystemStack.push(getSourceUrlString());
 aAlreadyImportedTypeSystemURLs.add(getSourceUrlString());
 
-collectTypeDescriptions(result, typeSystemStack, 
aAlreadyImportedTypeSystemURLs,
-aResourceManager);
+resolveImports(result, typeSystemStack, aAlreadyImportedTypeSystemURLs, 
aResourceManager);
 typeSystemStack.pop();
 
 setTypes(result.toArray(new TypeDescription_impl[0]));
-// clear imports
-this.setImports(Import.EMPTY_IMPORTS);
+setImports(Import.EMPTY_IMPORTS);
   }
 
-  public boolean collectTypeDescriptions(List result, 
Deque stack,
+  private boolean resolveImports(List result, Deque 
stack,
   Collection visited, ResourceManager aResourceManager) throws 
InvalidXMLException {
 
 List unresolvedImports = new ArrayList<>();
@@ -247,7 +244,8 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
   String urlString = url.toString();
 
   if (visited.contains(urlString)) {
-// cycle detected? -> complete=false, not able to completely resolve 
imports right now
+// cycle detected? -> completelyResolved = false, not able to 
completely resolve imports
+// right now
 completelyResolved &= !stack.contains(urlString);
 continue;
   }
@@ -256,13 +254,13 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
 
   TypeSystemDescription_impl importedDescription = 
getTypeSystemDescription(url,
   aResourceManager);
-  boolean importCompletelyCollected = importedDescription
-  .collectTypeDescriptions(resolvedTypeDescriptions, stack, 
visited, aResourceManager);
-  if (!importCompletelyCollected) {
+  boolean importCompletelyResolved = importedDescription
+  .resolveImports(resolvedTypeDescriptions, stack, visited, 
aResourceManager);
+  if (!importCompletelyResolved) {
 // TODO: update importUrlsCache? here or at all?
 unresolvedImports.add(tsImport);
   }
-  completelyResolved &= importCompletelyCollected;
+  completelyResolved &= importCompletelyResolved;
   stack.pop();
 }
 
@@ -299,40 +297,6 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
 }
   }
 
-  private void resolveImport(URL aURL, Collection 
aAlreadyImportedTypeSystemURLs,
-  Collection aResults, ResourceManager 
aResourceManager)
-  throws InvalidXMLException, IOException {
-// TODO remove method
-
-// check the import cache
-TypeSystemDescription desc;
-String urlString = aURL.toString();
-Map importCache = ((ResourceManager_impl) 
aResourceManager).getImportCache();
-Map> importUrlsCache = ((ResourceManager_impl) 
aResourceManager)
-.getImportUrlsCache();
-synchronized (importCache) {
-  XMLizable cachedObject = importCache.get(urlString);
-  if (cachedObject instanceof TypeSystemDescription) {
-desc = (TypeSystemDescription) cachedObject;
-// Add the URLs parsed for this cached object to the list 
already-parsed (UIMA-5058)
-aAlreadyImportedTypeSystemURLs.addAll(importUrlsCache.get(urlString));
-  } else {
-XMLInputSource input;
-input = new XMLInputSource(aURL);
-desc = UIMAFramework.getXMLParser().parseTypeSystemDescription(input);
-TreeSet previouslyImported = new 
TreeSet<&g

[uima-uimaj] branch bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk updated: [UIMA-6393]: Circular imports break resource manager cache PK

[pkluegl]

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

pkluegl pushed a commit to branch 
bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git


The following commit(s) were added to 
refs/heads/bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk by 
this push:
 new 88e6585  [UIMA-6393]: Circular imports break resource manager cache PK
88e6585 is described below

commit 88e6585fc4f8802a0c5c4c4bd93843019b611bec
Author: Peter Klügl 
AuthorDate: Sat Nov 6 15:16:49 2021 +0100

[UIMA-6393]: Circular imports break resource manager cache PK

- some cleanup
---
 .../impl/TypeSystemDescription_impl_old.java   | 299 --
 .../impl/TypeSystemDescription_impl_pk.java| 312 ---
 .../impl/TypeSystemDescription_impl_rec.java   | 445 -
 3 files changed, 1056 deletions(-)

diff --git 
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl_old.java
 
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl_old.java
deleted file mode 100644
index 9772018..000
--- 
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl_old.java
+++ /dev/null
@@ -1,299 +0,0 @@
-///*
-// * Licensed to the Apache Software Foundation (ASF) under one
-// * or more contributor license agreements.  See the NOTICE file
-// * distributed with this work for additional information
-// * regarding copyright ownership.  The ASF licenses this file
-// * to you under the Apache License, Version 2.0 (the
-// * "License"); you may not use this file except in compliance
-// * with the License.  You may obtain a copy of the License at
-// * 
-// *   http://www.apache.org/licenses/LICENSE-2.0
-// * 
-// * Unless required by applicable law or agreed to in writing,
-// * software distributed under the License is distributed on an
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// * KIND, either express or implied.  See the License for the
-// * specific language governing permissions and limitations
-// * under the License.
-// */
-//
-//package org.apache.uima.resource.metadata.impl;
-//
-//import java.io.IOException;
-//import java.net.URL;
-//import java.util.ArrayList;
-//import java.util.Arrays;
-//import java.util.Collection;
-//import java.util.List;
-//import java.util.Map;
-//import java.util.Set;
-//import java.util.TreeSet;
-//
-//import org.apache.uima.UIMAFramework;
-//import org.apache.uima.UIMA_IllegalArgumentException;
-//import org.apache.uima.resource.ResourceManager;
-//import org.apache.uima.resource.impl.ResourceManager_impl;
-//import org.apache.uima.resource.metadata.Import;
-//import org.apache.uima.resource.metadata.ResourceMetaData;
-//import org.apache.uima.resource.metadata.TypeDescription;
-//import org.apache.uima.resource.metadata.TypeSystemDescription;
-//import org.apache.uima.util.InvalidXMLException;
-//import org.apache.uima.util.XMLInputSource;
-//import org.apache.uima.util.XMLizable;
-//
-///**
-// * Reference implementation of {@link TypeSystemDescription}.
-// * 
-// * 
-// */
-//public class TypeSystemDescription_impl extends MetaDataObject_impl 
implements
-//TypeSystemDescription {
-//
-//  static final long serialVersionUID = -3372766232454730201L;
-//
-//  private String mName;
-//
-//  private String mVersion;
-//
-//  private String mDescription;
-//
-//  private String mVendor;
-//
-//  private Import[] mImports = Import.EMPTY_IMPORTS;
-//
-//  /** Descriptions of all Types in this type system. */
-//  private TypeDescription[] mTypes = TypeDescription.EMPTY_TYPE_DESCRIPTIONS;
-//
-//  /**
-//   * Creates a new TypeSystemDescription_impl.
-//   */
-//  public TypeSystemDescription_impl() {
-//  }
-//
-//  /**
-//   * @see ResourceMetaData#getName()
-//   */
-//  public String getName() {
-//return mName;
-//  }
-//
-//  /**
-//   * @see ResourceMetaData#setName(String)
-//   */
-//  public void setName(String aName) {
-//mName = aName;
-//  }
-//
-//  /**
-//   * @see ResourceMetaData#getVersion()
-//   */
-//  public String getVersion() {
-//return mVersion;
-//  }
-//
-//  /**
-//   * @see ResourceMetaData#setVersion(String)
-//   */
-//  public void setVersion(String aVersion) {
-//mVersion = aVersion;
-//  }
-//
-//  /**
-//   * @see ResourceMetaData#getDescription()
-//   */
-//  public String getDescription() {
-//return mDescription;
-//  }
-//
-//  /**
-//   * @see ResourceMetaData#setDescription(String)
-//   */
-//  public void setDescription(String aDescription) {
-//mDescription = aDescription;
-//  }
-//
-//  /**
-//   * @see ResourceMetaData#getVendor()
-//   */
-//  public String getVendor() {
-//return mVendor;
-//  }
-//
-//  /**
-//   * @see ResourceMetaData#setVendor(String)
-//   */
-//  public void setVendor(String aVendor) {
-// 

[uima-uimaj] branch bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk updated: [UIMA-6393]: Circular imports break resource manager cache PK

[pkluegl]

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

pkluegl pushed a commit to branch 
bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git


The following commit(s) were added to 
refs/heads/bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk by 
this push:
 new 3a28d06  [UIMA-6393]: Circular imports break resource manager cache PK
3a28d06 is described below

commit 3a28d06a647441d88efadfab97c5d2e7beef0f94
Author: Peter Klügl 
AuthorDate: Sat Nov 6 15:18:16 2021 +0100

[UIMA-6393]: Circular imports break resource manager cache PK

- allow cycles again in bulk test
---
 .../uima/resource/metadata/impl/TypeSystemDescription_implTest.java| 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_implTest.java
 
b/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_implTest.java
index e46cbb4..6968183 100644
--- 
a/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_implTest.java
+++ 
b/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_implTest.java
@@ -214,8 +214,7 @@ public class TypeSystemDescription_implTest {
   public void 
thatResolvingMultipleComplexImportScenariosWithSingleResourceManagerWorks()
   throws Exception {
 final int tsCount = 5;
-// TODO increase passes again for testing cycles
-final int passes = 1;
+final int passes = 3;
 final int importsPerPass = 1;
 
 File workDir = new File(

[uima-uimaj] branch bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk updated: [UIMA-6393]: Circular imports break resource manager cache PK

[pkluegl]

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

pkluegl pushed a commit to branch 
bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git


The following commit(s) were added to 
refs/heads/bugfix/UIMA-6393-Circular-imports-break-resource-manager-cache_pk by 
this push:
 new 55d48a8  [UIMA-6393]: Circular imports break resource manager cache PK
55d48a8 is described below

commit 55d48a8d23fefdb8449db8d1e37b9b53731ba8bb
Author: Peter Klügl 
AuthorDate: Sun Nov 7 22:51:18 2021 +0100

[UIMA-6393]: Circular imports break resource manager cache PK

- fixed and refactored algorithm
---
 .../metadata/impl/TypeSystemDescription_impl.java  | 43 ++
 .../impl/TypeSystemDescription_implTest.java   |  5 ++-
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git 
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
 
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
index 32e8a06..f27b26b 100644
--- 
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
+++ 
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
@@ -211,6 +211,7 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
   public synchronized void resolveImports(Collection 
aAlreadyImportedTypeSystemURLs,
   ResourceManager aResourceManager) throws InvalidXMLException {
 
+// TODO what to do with aAlreadyImportedTypeSystemURLs???
 List result = new ArrayList<>();
 
 if (getImports() == null || getImports().length == 0) {
@@ -219,59 +220,55 @@ public class TypeSystemDescription_impl extends 
MetaDataObject_impl
 
 Deque typeSystemStack = new LinkedList<>();
 typeSystemStack.push(getSourceUrlString());
-aAlreadyImportedTypeSystemURLs.add(getSourceUrlString());
-
-resolveImports(result, typeSystemStack, aAlreadyImportedTypeSystemURLs, 
aResourceManager);
+resolveImports(result, typeSystemStack, aResourceManager);
 typeSystemStack.pop();
 
 setTypes(result.toArray(new TypeDescription_impl[0]));
 setImports(Import.EMPTY_IMPORTS);
   }
 
-  private boolean resolveImports(List result, Deque 
stack,
-  Collection visited, ResourceManager aResourceManager) throws 
InvalidXMLException {
+  private boolean resolveImports(List result, Deque 
stack, ResourceManager aResourceManager) throws InvalidXMLException {
+
+Import[] imports = getImports();
+
+if (imports.length == 0) {
+  result.addAll(Arrays.asList(getTypes()));
+  return true;
+}
 
 List unresolvedImports = new ArrayList<>();
 List resolvedTypeDescriptions = new ArrayList<>();
 resolvedTypeDescriptions.addAll(Arrays.asList(getTypes()));
 
-boolean completelyResolved = true;
-
-Import[] imports = getImports();
 for (Import tsImport : imports) {
 
   URL url = tsImport.findAbsoluteUrl(aResourceManager);
   String urlString = url.toString();
 
-  if (visited.contains(urlString)) {
-// cycle detected? -> completelyResolved = false, not able to 
completely resolve imports
-// right now
-completelyResolved &= !stack.contains(urlString);
+  if (stack.contains(urlString)) {
+unresolvedImports.add(tsImport);
 continue;
   }
-  stack.push(urlString);
-  visited.add(urlString);
-
+  
   TypeSystemDescription_impl importedDescription = 
getTypeSystemDescription(url,
   aResourceManager);
+  stack.push(urlString);
   boolean importCompletelyResolved = importedDescription
-  .resolveImports(resolvedTypeDescriptions, stack, visited, 
aResourceManager);
+  .resolveImports(resolvedTypeDescriptions, stack, 
aResourceManager);
   if (!importCompletelyResolved) {
 // TODO: update importUrlsCache? here or at all?
 unresolvedImports.add(tsImport);
   }
-  completelyResolved &= importCompletelyResolved;
   stack.pop();
 }
 
-if (imports.length != unresolvedImports.size()) {
-  // update own resolved status
-  setTypes(resolvedTypeDescriptions.toArray(new TypeDescription_impl[0]));
-  setImports(unresolvedImports.toArray(new Import[0]));
-}
+// update own resolved status
+setTypes(resolvedTypeDescriptions.toArray(new TypeDescription_impl[0]));
+setImports(unresolvedImports.toArray(new Import[0]));
+
 result.addAll(resolvedTypeDescriptions);
 
-return completelyResolved;
+return unresolvedImports.isEmpty();
   }
 
   private TypeSystemDescription_impl getTypeSystemDescription(URL url,
diff --git 
a/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_implTest.java
 
b/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/

[uima-ruta] branch bugfix/UIMA-6394-Ruta-label-assignment-in-alternative-match-causes-problems created (now 0476c2a)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6394-Ruta-label-assignment-in-alternative-match-causes-problems
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


  at 0476c2a  UIMA-6394: Ruta: label assignment in alternative match causes 
problems

This branch includes the following new commits:

 new 0476c2a  UIMA-6394: Ruta: label assignment in alternative match causes 
problems

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-ruta] 01/01: UIMA-6394: Ruta: label assignment in alternative match causes problems

[pkluegl]

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

pkluegl pushed a commit to branch 
bugfix/UIMA-6394-Ruta-label-assignment-in-alternative-match-causes-problems
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git

commit 0476c2a217e3a9c1c9da834eec2099755f8ed107
Author: Peter Klügl 
AuthorDate: Thu Nov 11 11:54:26 2021 +0100

UIMA-6394: Ruta: label assignment in alternative match causes problems

- adding test
---
 .../annotation/AnnotationLabelExpressionTest.java  | 27 ++
 1 file changed, 27 insertions(+)

diff --git 
a/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationLabelExpressionTest.java
 
b/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationLabelExpressionTest.java
index c4738aa..dd63f43 100644
--- 
a/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationLabelExpressionTest.java
+++ 
b/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationLabelExpressionTest.java
@@ -845,4 +845,31 @@ public class AnnotationLabelExpressionTest {
 RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Some text");
   }
 
+  @Test
+  public void testCompareStringFeatures() throws Exception {
+
+String document = "A b.";
+Map typeMap = new TreeMap();
+typeMap.put("Struct1", "uima.tcas.Annotation");
+typeMap.put("Struct2", "uima.tcas.Annotation");
+
+Map> featureMap = new TreeMap>();
+List list = new ArrayList();
+featureMap.put("Struct1", list);
+featureMap.put("Struct2", list);
+list.add(new TestFeature("s", "", "uima.cas.String"));
+
+String script = "";
+script += "SW{->CREATE(Struct2, \"s\" = \"b\")};\n";
+script += "SW{->CREATE(Struct2, \"s\" = \"a\")};\n";
+script += "CW{->CREATE(Struct1, \"s\" = \"a\")};\n";
+script += "(s1:Struct1 s2:Struct2){s1.s==s2.s-> T1};\n";
+
+CAS cas = RutaTestUtils.getCAS(document, typeMap, featureMap);
+Ruta.apply(cas, script);
+
+RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "A b");
+
+  }
+
 }

[uima-ruta] branch bugfix/UIMA-6404-Ruta-anchor-with-quantifier-ignores-matches created (now 11e09e0)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6404-Ruta-anchor-with-quantifier-ignores-matches
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


  at 11e09e0  UIMA-6404: Ruta: @ with quantifier ignores matches

This branch includes the following new commits:

 new 11e09e0  UIMA-6404: Ruta: @ with quantifier ignores matches

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-ruta] 01/01: UIMA-6404: Ruta: @ with quantifier ignores matches

[pkluegl]

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

pkluegl pushed a commit to branch 
bugfix/UIMA-6404-Ruta-anchor-with-quantifier-ignores-matches
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git

commit 11e09e053e0638c974e4b36d744e213dc3f1f4ba
Author: Peter Klügl 
AuthorDate: Mon Jan 3 10:36:38 2022 +0100

UIMA-6404: Ruta: @ with quantifier ignores matches

- added test mentioned in issue
---
 .../ruta/rule/quantifier/MinMaxQuantifierTest.java  | 21 -
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git 
a/ruta-core/src/test/java/org/apache/uima/ruta/rule/quantifier/MinMaxQuantifierTest.java
 
b/ruta-core/src/test/java/org/apache/uima/ruta/rule/quantifier/MinMaxQuantifierTest.java
index 425ee0e..55fe85b 100644
--- 
a/ruta-core/src/test/java/org/apache/uima/ruta/rule/quantifier/MinMaxQuantifierTest.java
+++ 
b/ruta-core/src/test/java/org/apache/uima/ruta/rule/quantifier/MinMaxQuantifierTest.java
@@ -37,6 +37,25 @@ public class MinMaxQuantifierTest {
 Ruta.apply(cas, script);
 
 RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "B, B, B");
-cas.release();
+  }
+
+  @Test
+  public void testMinMaxOnComposedWithAnchor() throws Exception {
+String document = "omega alpha beta gamma omega alpha beta gamma omega 
alpha";
+String script = "";
+script += "(W @W W W)[2,2]{-> T1};\n";
+script += "(W W @W W)[2,2]{-> T2};\n";
+
+CAS cas = RutaTestUtils.getCAS(document);
+Ruta.apply(cas, script);
+
+RutaTestUtils.assertAnnotationsEquals(cas, 1, 3,
+"omega alpha beta gamma omega alpha beta gamma",
+"alpha beta gamma omega alpha beta gamma omega",
+"beta gamma omega alpha beta gamma omega alpha");
+RutaTestUtils.assertAnnotationsEquals(cas, 2, 3,
+"omega alpha beta gamma omega alpha beta gamma",
+"alpha beta gamma omega alpha beta gamma omega",
+"beta gamma omega alpha beta gamma omega alpha");
   }
 }

[uima-ruta] branch bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition created (now 351ddca)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


  at 351ddca  UIMA-6405: Local variable not captured properly in a wildcard 
matching condition

This branch includes the following new commits:

 new 351ddca  UIMA-6405: Local variable not captured properly in a wildcard 
matching condition

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-ruta] 01/01: UIMA-6405: Local variable not captured properly in a wildcard matching condition

[pkluegl]

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

pkluegl pushed a commit to branch 
bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git

commit 351ddcafb4b8c5b903d7acc107169e358139a793
Author: Peter Klügl 
AuthorDate: Mon Jan 3 10:56:29 2022 +0100

UIMA-6405: Local variable not captured properly in a wildcard matching 
condition

- added test
---
 .../org/apache/uima/ruta/rule/WildCard2Test.java   | 33 ++
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git 
a/ruta-core/src/test/java/org/apache/uima/ruta/rule/WildCard2Test.java 
b/ruta-core/src/test/java/org/apache/uima/ruta/rule/WildCard2Test.java
index 38dabdf..af6f5b4 100644
--- a/ruta-core/src/test/java/org/apache/uima/ruta/rule/WildCard2Test.java
+++ b/ruta-core/src/test/java/org/apache/uima/ruta/rule/WildCard2Test.java
@@ -275,13 +275,12 @@ public class WildCard2Test {
   public void testLabelForFailedLookahead() throws Exception {
 String document = "A x B x C x D";
 String script = "(w1:CW{REGEXP(\"A\")} # 
w2:CW{REGEXP(\"C\")})->{w1{->T1};};";
-   
-   CAS cas = RutaTestUtils.getCAS(document, null, null, false);
+
+CAS cas = RutaTestUtils.getCAS(document, null, null, false);
 Ruta.apply(cas, script);
-   
-   RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "A");
-  }
 
+RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "A");
+  }
 
   @Test
   public void testLastElementAlsoAnnotatedWithLookahead() throws Exception {
@@ -297,4 +296,28 @@ public class WildCard2Test {
 RutaTestUtils.assertAnnotationsEquals(cas, 4, 2, "c", "c");
   }
 
+  @Test
+  public void testLookaheadWithFeatureMatch() throws Exception {
+String document = "a 2 b 3 c 4 d";
+String script = "";
+script += "\"2\"{->s:Struct,s.s=\"x\"};\n";
+script += "\"3\"{->s:Struct};\n";
+script += "\"4\"{->s:Struct,s.s=\"y\"};\n";
+script += "s1:Struct.s==\"x\" # s2:Struct.s==\"y\"{->s2.s=s1.s, T1};\n";
+script += "s:Struct.s==\"x\"{->T2};\n";
+
+Map complexType = new HashMap<>();
+complexType.put("Struct", CAS.TYPE_NAME_ANNOTATION);
+Map> featureMap = new HashMap<>();
+List list = new ArrayList<>();
+list.add(new TestFeature("s", "", CAS.TYPE_NAME_STRING));
+featureMap.put("Struct", list);
+
+CAS cas = RutaTestUtils.getCAS(document, complexType, featureMap);
+Ruta.apply(cas, script);
+
+RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "4");
+RutaTestUtils.assertAnnotationsEquals(cas, 2, 2, "2", "4");
+  }
+
 }

[uima-ruta] branch bugfix/UIMA-6406-Removing-an-annotation-inside-a-BLOCK-only-takes-effect-outside-the-block created (now e710b31)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6406-Removing-an-annotation-inside-a-BLOCK-only-takes-effect-outside-the-block
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


  at e710b31  UIMA-6406: Removing an annotation inside a BLOCK only takes 
effect outside the block

This branch includes the following new commits:

 new e710b31  UIMA-6406: Removing an annotation inside a BLOCK only takes 
effect outside the block

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-ruta] 01/01: UIMA-6406: Removing an annotation inside a BLOCK only takes effect outside the block

[pkluegl]

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

pkluegl pushed a commit to branch 
bugfix/UIMA-6406-Removing-an-annotation-inside-a-BLOCK-only-takes-effect-outside-the-block
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git

commit e710b31e70b616dfb8f91b92149ec13923cdeb1d
Author: Peter Klügl 
AuthorDate: Mon Jan 3 11:05:58 2022 +0100

UIMA-6406: Removing an annotation inside a BLOCK only takes effect outside 
the block

- added test
---
 .../org/apache/uima/ruta/action/UnmarkTest.java| 48 +++---
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git 
a/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkTest.java 
b/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkTest.java
index 64b7152..ad992d7 100644
--- a/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkTest.java
+++ b/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkTest.java
@@ -20,6 +20,7 @@
 package org.apache.uima.ruta.action;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -43,45 +44,64 @@ public class UnmarkTest {
 
 cas.release();
   }
-  
-  
+
   @Test
   public void testAnnotationExpression() throws Exception {
-Map typeMap = new TreeMap();
+Map typeMap = new LinkedHashMap();
 typeMap.put("Complex", "uima.tcas.Annotation");
 Map> featureMap = new TreeMap>();
-List list = new ArrayList();
+List list = new ArrayList<>();
 featureMap.put("Complex", list);
 list.add(new TestFeature("inner", "", "uima.tcas.Annotation"));
-
+
 CAS cas = RutaTestUtils.getCAS("This is a test.", typeMap, featureMap);
 String script = "";
 script += "CW{->T1};t:T1 SW SW{-> UNMARK(t)};";
 script += "CW{->T2};\n t:T2 # PERIOD{-> Complex, Complex.inner=t};\n 
Complex{-> UNMARK(Complex.inner)};\n";
 Ruta.apply(cas, script);
-
+
 RutaTestUtils.assertAnnotationsEquals(cas, 1, 0);
 RutaTestUtils.assertAnnotationsEquals(cas, 2, 0);
-
+
   }
-  
+
   @Test
-  public void testAnnotationListExpression()  throws Exception {
-Map typeMap = new TreeMap();
+  public void testAnnotationListExpression() throws Exception {
+Map typeMap = new LinkedHashMap();
 typeMap.put("Complex", "uima.tcas.Annotation");
 Map> featureMap = new TreeMap>();
-List list = new ArrayList();
+List list = new ArrayList<>();
 featureMap.put("Complex", list);
 list.add(new TestFeature("inner", "", "uima.cas.FSArray"));
-
+
 CAS cas = RutaTestUtils.getCAS("This is a test.", typeMap, featureMap);
 String script = "";
 script += "W{->T1}; Document{-> Complex, Complex.inner = T1};";
 script += "Complex{-> UNMARK(Complex.inner)};\n";
 Ruta.apply(cas, script);
-
+
 RutaTestUtils.assertAnnotationsEquals(cas, 1, 0);
 RutaTestUtils.assertAnnotationsEquals(cas, 2, 0);
   }
-  
+
+  @Test
+  public void testUnmarkWithFeatureMatchInBlock() throws Exception {
+
+Map typeMap = new LinkedHashMap();
+typeMap.put("Struct", "uima.tcas.Annotation");
+Map> featureMap = new TreeMap>();
+List list = new ArrayList<>();
+featureMap.put("Struct", list);
+list.add(new TestFeature("s", "", CAS.TYPE_NAME_STRING));
+
+CAS cas = RutaTestUtils.getCAS("This is a test.", typeMap, featureMap);
+String script = "\"is\"{->s:Struct,Struct.s=\"foo\"};";
+script += "BLOCK(SoftRemove) Struct.s==\"foo\"{} {\r\n"
++ "t:Struct.s==\"foo\"{-> UNMARK(t)};\r\n"
++ "t:Struct.s==\"foo\"{-> T1}; \r\n" + "}";
+Ruta.apply(cas, script);
+
+RutaTestUtils.assertAnnotationsEquals(cas, 1, 0);
+  }
+
 }

[uima-ruta] branch bugfix/UIMA-6406-Removing-an-annotation-inside-a-BLOCK-only-takes-effect-outside-the-block updated (e710b31 -> e781524)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6406-Removing-an-annotation-inside-a-BLOCK-only-takes-effect-outside-the-block
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from e710b31  UIMA-6406: Removing an annotation inside a BLOCK only takes 
effect outside the block
 add e781524  UIMA-6406: Removing an annotation inside a BLOCK only takes 
effect outside the block

No new revisions were added by this update.

Summary of changes:
 ruta-core/.gitignore   |   2 +
 .../main/java/org/apache/uima/ruta/RutaStream.java |   6 +-
 .../org/apache/uima/ruta/engine/RutaTestUtils.java | 112 ++---
 .../org/apache/uima/ruta/action/UnmarkTest.java|  12 ++-
 4 files changed, 93 insertions(+), 39 deletions(-)
 create mode 100644 ruta-core/.gitignore

[uima-ruta] branch maintenance/3.1.x updated (2377279 -> 4d6c5bc)

[pkluegl]

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

pkluegl pushed a change to branch maintenance/3.1.x
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 2377279  Merge pull request #64 from 
apache/bugfix/UIMA-6399-RutaPatternCache-prevents-CPEEngine-from-terminating
 add e710b31  UIMA-6406: Removing an annotation inside a BLOCK only takes 
effect outside the block
 add e781524  UIMA-6406: Removing an annotation inside a BLOCK only takes 
effect outside the block
 new 4d6c5bc  Merge pull request #68 from 
apache/bugfix/UIMA-6406-Removing-an-annotation-inside-a-BLOCK-only-takes-effect-outside-the-block

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:
 ruta-core/.gitignore   |   2 +
 .../main/java/org/apache/uima/ruta/RutaStream.java |   6 +-
 .../org/apache/uima/ruta/engine/RutaTestUtils.java | 112 ++---
 .../org/apache/uima/ruta/action/UnmarkTest.java|  54 +++---
 4 files changed, 124 insertions(+), 50 deletions(-)
 create mode 100644 ruta-core/.gitignore

[uima-ruta] 01/01: Merge pull request #68 from apache/bugfix/UIMA-6406-Removing-an-annotation-inside-a-BLOCK-only-takes-effect-outside-the-block

[pkluegl]

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

pkluegl pushed a commit to branch maintenance/3.1.x
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git

commit 4d6c5bc02e6940c76e076f523efead32bf9701d8
Merge: 2377279 e781524
Author: pkluegl 
AuthorDate: Fri Jan 7 10:36:29 2022 +0100

Merge pull request #68 from 
apache/bugfix/UIMA-6406-Removing-an-annotation-inside-a-BLOCK-only-takes-effect-outside-the-block

UIMA-6406: Removing an annotation inside a BLOCK only takes effect outside 
the block

 ruta-core/.gitignore   |   2 +
 .../main/java/org/apache/uima/ruta/RutaStream.java |   6 +-
 .../org/apache/uima/ruta/engine/RutaTestUtils.java | 112 ++---
 .../org/apache/uima/ruta/action/UnmarkTest.java|  54 +++---
 4 files changed, 124 insertions(+), 50 deletions(-)

[uima-ruta] branch bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition updated (351ddca -> 722ac79)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 351ddca  UIMA-6405: Local variable not captured properly in a wildcard 
matching condition
 add e710b31  UIMA-6406: Removing an annotation inside a BLOCK only takes 
effect outside the block
 add e781524  UIMA-6406: Removing an annotation inside a BLOCK only takes 
effect outside the block
 add 4d6c5bc  Merge pull request #68 from 
apache/bugfix/UIMA-6406-Removing-an-annotation-inside-a-BLOCK-only-takes-effect-outside-the-block
 add 722ac79  Merge branch 'maintenance/3.1.x' into 
bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition

No new revisions were added by this update.

Summary of changes:
 ruta-core/.gitignore   |   2 +
 .../main/java/org/apache/uima/ruta/RutaStream.java |   6 +-
 .../org/apache/uima/ruta/engine/RutaTestUtils.java | 112 ++---
 .../org/apache/uima/ruta/action/UnmarkTest.java|  54 +++---
 4 files changed, 124 insertions(+), 50 deletions(-)
 create mode 100644 ruta-core/.gitignore

[uima-ruta] branch bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition updated (722ac79 -> 422e193)

[pkluegl]

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

pkluegl pushed a change to branch 
bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git.


from 722ac79  Merge branch 'maintenance/3.1.x' into 
bugfix/UIMA-6405-Local-variable-not-captured-properly-in-a-wildcard-matching-condition
 add 422e193  UIMA-6405: Local variable not captured properly in a wildcard 
matching condition

No new revisions were added by this update.

Summary of changes:
 .../main/java/org/apache/uima/ruta/rule/AbstractRuleElement.java   | 7 ---
 .../main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java   | 2 +-
 .../src/main/java/org/apache/uima/ruta/rule/RutaRuleElement.java   | 7 +++
 .../src/test/java/org/apache/uima/ruta/rule/WildCard2Test.java | 5 +
 4 files changed, 13 insertions(+), 8 deletions(-)