You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2019/04/15 15:38:39 UTC
svn commit: r1857593 - in /uima/ruta/trunk: ruta-core/
ruta-core/src/main/java/org/apache/uima/ruta/constraint/
ruta-core/src/main/java/org/apache/uima/ruta/engine/
ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/
ruta-core/src/test/java/o...
Author: pkluegl
Date: Mon Apr 15 15:38:39 2019
New Revision: 1857593
URL: http://svn.apache.org/viewvc?rev=1857593&view=rev
Log:
no jira - cleanup usage of commons-lang
Modified:
uima/ruta/trunk/ruta-core/pom.xml
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/BasicTypeConstraint.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/AbstractRuleElementQuantifier.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaEngineTest.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/TestRutaInferenceVisitor.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationFeatureExpressionTest.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordListStringExpressionTest.java
uima/ruta/trunk/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java
uima/ruta/trunk/ruta-parent/pom.xml
Modified: uima/ruta/trunk/ruta-core/pom.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/pom.xml?rev=1857593&r1=1857592&r2=1857593&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/pom.xml (original)
+++ uima/ruta/trunk/ruta-core/pom.xml Mon Apr 15 15:38:39 2019
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.4</version>
+ <version>3.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/BasicTypeConstraint.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/BasicTypeConstraint.java?rev=1857593&r1=1857592&r2=1857593&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/BasicTypeConstraint.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/constraint/BasicTypeConstraint.java Mon Apr 15 15:38:39 2019
@@ -22,7 +22,7 @@ package org.apache.uima.ruta.constraint;
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
import org.apache.uima.cas.FSTypeConstraint;
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.Type;
@@ -34,7 +34,7 @@ public class BasicTypeConstraint impleme
private final Collection<Type> types;
private final boolean matchOnEmpty;
-
+
public BasicTypeConstraint(Collection<Type> types, boolean matchOnEmpty) {
super();
this.types = types;
@@ -59,7 +59,7 @@ public class BasicTypeConstraint impleme
@Override
public void add(String typeString) {
- throw new NotImplementedException();
+ throw new NotImplementedException("Not supported.");
}
@Override
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java?rev=1857593&r1=1857592&r2=1857593&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java Mon Apr 15 15:38:39 2019
@@ -38,8 +38,8 @@ import org.antlr.runtime.ANTLRStringStre
import org.antlr.runtime.CharStream;
import org.antlr.runtime.CommonTokenStream;
import org.antlr.runtime.RecognitionException;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.uima.UIMAFramework;
import org.apache.uima.UimaContext;
import org.apache.uima.UimaContextAdmin;
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/AbstractRuleElementQuantifier.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/AbstractRuleElementQuantifier.java?rev=1857593&r1=1857592&r2=1857593&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/AbstractRuleElementQuantifier.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/AbstractRuleElementQuantifier.java Mon Apr 15 15:38:39 2019
@@ -21,7 +21,7 @@ package org.apache.uima.ruta.rule.quanti
import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.ruta.RutaEnvironment;
import org.apache.uima.ruta.RutaStream;
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaEngineTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaEngineTest.java?rev=1857593&r1=1857592&r2=1857593&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaEngineTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaEngineTest.java Mon Apr 15 15:38:39 2019
@@ -24,7 +24,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.uima.analysis_engine.AnalysisEngine;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/TestRutaInferenceVisitor.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/TestRutaInferenceVisitor.java?rev=1857593&r1=1857592&r2=1857593&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/TestRutaInferenceVisitor.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/TestRutaInferenceVisitor.java Mon Apr 15 15:38:39 2019
@@ -20,7 +20,7 @@ package org.apache.uima.ruta.engine;
import java.util.List;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.ruta.RutaElement;
import org.apache.uima.ruta.RutaStream;
@@ -33,23 +33,23 @@ public class TestRutaInferenceVisitor im
@Override
public void beginVisit(RutaElement element, ScriptApply result) {
- throw new NotImplementedException();
+ throw new NotImplementedException("Not supported.");
}
@Override
public void endVisit(RutaElement element, ScriptApply result) {
- throw new NotImplementedException();
+ throw new NotImplementedException("Not supported.");
}
@Override
public void finished(RutaStream stream, List<RutaInferenceVisitor> visitors) {
- throw new NotImplementedException();
+ throw new NotImplementedException("Not supported.");
}
@Override
public void annotationAdded(AnnotationFS annotation,
AbstractRuleMatch<? extends AbstractRule> creator) {
- throw new NotImplementedException();
+ throw new NotImplementedException("Not supported.");
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationFeatureExpressionTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationFeatureExpressionTest.java?rev=1857593&r1=1857592&r2=1857593&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationFeatureExpressionTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationFeatureExpressionTest.java Mon Apr 15 15:38:39 2019
@@ -19,8 +19,6 @@
package org.apache.uima.ruta.expression.annotation;
-import java.io.File;
-import java.io.FileOutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -29,16 +27,13 @@ import java.util.TreeMap;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.FeatureStructure;
-import org.apache.uima.cas.SerialFormat;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.fit.factory.TypeSystemDescriptionFactory;
import org.apache.uima.fit.util.FSCollectionFactory;
import org.apache.uima.jcas.cas.FSArray;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.apache.uima.ruta.engine.RutaTestUtils.TestFeature;
-import org.apache.uima.util.CasIOUtils;
import org.junit.Test;
public class AnnotationFeatureExpressionTest {
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordListStringExpressionTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordListStringExpressionTest.java?rev=1857593&r1=1857592&r2=1857593&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordListStringExpressionTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordListStringExpressionTest.java Mon Apr 15 15:38:39 2019
@@ -19,6 +19,11 @@
package org.apache.uima.ruta.expression.resource;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
import org.apache.uima.resource.ResourceConfigurationException;
@@ -30,11 +35,6 @@ import org.apache.uima.util.InvalidXMLEx
import org.junit.Test;
import org.xml.sax.SAXException;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
public class WordListStringExpressionTest {
Modified: uima/ruta/trunk/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java?rev=1857593&r1=1857592&r2=1857593&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java (original)
+++ uima/ruta/trunk/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java Mon Apr 15 15:38:39 2019
@@ -35,8 +35,8 @@ import java.util.Set;
import org.antlr.runtime.RecognitionException;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
Modified: uima/ruta/trunk/ruta-parent/pom.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-parent/pom.xml?rev=1857593&r1=1857592&r2=1857593&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-parent/pom.xml (original)
+++ uima/ruta/trunk/ruta-parent/pom.xml Mon Apr 15 15:38:39 2019
@@ -327,8 +327,8 @@ Creative Commons Attribution 3.0 License
<exclude>org.apache.uima.ruta.type</exclude>
<exclude>org.apache.uima.ruta.parser.RutaParser</exclude>
</excludes>
- filter out classes with impl in their package or class name
- <postAnalysisScript>${project.basedir}/../ruta-parent/src/main/groovy/api-report.groovy</postAnalysisScript>
+ <!-- filter out classes with impl in their package or class name -->
+<!-- <postAnalysisScript>${project.basedir}/../ruta-parent/src/main/groovy/api-report.groovy</postAnalysisScript> -->
</parameter>
</configuration>
<executions>