You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2015/03/04 17:11:33 UTC

svn commit: r1664067 - in /uima/uimafit/trunk: uimafit-core/.settings/ uimafit-core/src/test/java/org/apache/uima/fit/factory/ uimafit-cpe/.settings/ uimafit-examples/.settings/ uimafit-legacy-support/.settings/ uimafit-legacy-support/src/test/java/org...

Author: rec
Date: Wed Mar  4 16:11:33 2015
New Revision: 1664067

URL: http://svn.apache.org/r1664067
Log:
[UIMA-4273] Upgrade to UIMA-SDK 2.7.0
- Upgrade to 2.7.0-SNAPSHOT
- Upgrade to Java 7

Modified:
    uima/uimafit/trunk/uimafit-core/.settings/org.eclipse.jdt.core.prefs
    uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/FsIndexFactoryTest.java
    uima/uimafit/trunk/uimafit-cpe/.settings/org.eclipse.jdt.core.prefs
    uima/uimafit/trunk/uimafit-examples/.settings/org.eclipse.jdt.core.prefs
    uima/uimafit/trunk/uimafit-legacy-support/.settings/org.eclipse.jdt.core.prefs
    uima/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/FsIndexFactoryTest.java
    uima/uimafit/trunk/uimafit-maven-plugin/.settings/org.eclipse.jdt.core.prefs
    uima/uimafit/trunk/uimafit-parent/pom.xml
    uima/uimafit/trunk/uimafit-spring/.settings/org.eclipse.jdt.core.prefs

Modified: uima/uimafit/trunk/uimafit-core/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/.settings/org.eclipse.jdt.core.prefs?rev=1664067&r1=1664066&r2=1664067&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/.settings/org.eclipse.jdt.core.prefs (original)
+++ uima/uimafit/trunk/uimafit-core/.settings/org.eclipse.jdt.core.prefs Wed Mar  4 16:11:33 2015
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

Modified: uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/FsIndexFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/FsIndexFactoryTest.java?rev=1664067&r1=1664066&r2=1664067&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/FsIndexFactoryTest.java (original)
+++ uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/FsIndexFactoryTest.java Wed Mar  4 16:11:33 2015
@@ -85,6 +85,7 @@ public class FsIndexFactoryTest extends
     token1.addToIndexes();
 
     // index1 is a sorted index, so when adding a token twice, both remain in the index
+    // Since UIMA 2.7.0, annotations are not added twice to the index by default.
     Token token2 = new Token(jcas, 3, 4);
     token2.addToIndexes();
     token2.addToIndexes();
@@ -100,7 +101,7 @@ public class FsIndexFactoryTest extends
     FSIndex<FeatureStructure> index1 = jcas.getFSIndexRepository().getIndex("index1");
     FSIndex<FeatureStructure> index2 = jcas.getFSIndexRepository().getIndex("index2");
 
-    assertEquals(3, index1.size());
+    assertEquals(2, index1.size());
     assertEquals(2, index2.size());
 
     // AnalysisEngine dumpWriter = createPrimitive(CASDumpWriter.class);

Modified: uima/uimafit/trunk/uimafit-cpe/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-cpe/.settings/org.eclipse.jdt.core.prefs?rev=1664067&r1=1664066&r2=1664067&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-cpe/.settings/org.eclipse.jdt.core.prefs (original)
+++ uima/uimafit/trunk/uimafit-cpe/.settings/org.eclipse.jdt.core.prefs Wed Mar  4 16:11:33 2015
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

Modified: uima/uimafit/trunk/uimafit-examples/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-examples/.settings/org.eclipse.jdt.core.prefs?rev=1664067&r1=1664066&r2=1664067&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-examples/.settings/org.eclipse.jdt.core.prefs (original)
+++ uima/uimafit/trunk/uimafit-examples/.settings/org.eclipse.jdt.core.prefs Wed Mar  4 16:11:33 2015
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

Modified: uima/uimafit/trunk/uimafit-legacy-support/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-legacy-support/.settings/org.eclipse.jdt.core.prefs?rev=1664067&r1=1664066&r2=1664067&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-legacy-support/.settings/org.eclipse.jdt.core.prefs (original)
+++ uima/uimafit/trunk/uimafit-legacy-support/.settings/org.eclipse.jdt.core.prefs Wed Mar  4 16:11:33 2015
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

Modified: uima/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/FsIndexFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/FsIndexFactoryTest.java?rev=1664067&r1=1664066&r2=1664067&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/FsIndexFactoryTest.java (original)
+++ uima/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/FsIndexFactoryTest.java Wed Mar  4 16:11:33 2015
@@ -85,6 +85,7 @@ public class FsIndexFactoryTest extends
     token1.addToIndexes();
 
     // index1 is a sorted index, so when adding a token twice, both remain in the index
+    // Since UIMA 2.7.0, annotations are not added twice to the index by default.
     Token token2 = new Token(jcas, 3, 4);
     token2.addToIndexes();
     token2.addToIndexes();
@@ -100,7 +101,7 @@ public class FsIndexFactoryTest extends
     FSIndex<FeatureStructure> index1 = jcas.getFSIndexRepository().getIndex("index1");
     FSIndex<FeatureStructure> index2 = jcas.getFSIndexRepository().getIndex("index2");
 
-    assertEquals(3, index1.size());
+    assertEquals(2, index1.size());
     assertEquals(2, index2.size());
 
     // AnalysisEngine dumpWriter = createPrimitive(CASDumpWriter.class);

Modified: uima/uimafit/trunk/uimafit-maven-plugin/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-maven-plugin/.settings/org.eclipse.jdt.core.prefs?rev=1664067&r1=1664066&r2=1664067&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-maven-plugin/.settings/org.eclipse.jdt.core.prefs (original)
+++ uima/uimafit/trunk/uimafit-maven-plugin/.settings/org.eclipse.jdt.core.prefs Wed Mar  4 16:11:33 2015
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

Modified: uima/uimafit/trunk/uimafit-parent/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-parent/pom.xml?rev=1664067&r1=1664066&r2=1664067&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-parent/pom.xml (original)
+++ uima/uimafit/trunk/uimafit-parent/pom.xml Wed Mar  4 16:11:33 2015
@@ -14,7 +14,9 @@
 	<inceptionYear>2012</inceptionYear>
 	<properties>
 		<spring.version>3.1.2.RELEASE</spring.version>
-		<uima.version>2.6.0</uima.version>
+		<uima.version>2.7.0-SNAPSHOT</uima.version>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
 	</properties>
     <!--
       - Only required while uimaFIT depends on unreleased versions of UIMA.
@@ -174,6 +176,15 @@
 		</plugins>
 		<pluginManagement>
 			<plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>${maven.compiler.source}</source>
+                        <target>${maven.compiler.target}</target>
+                        <!--encoding>UTF-8</encoding this inherited from apache pom 7 -->
+                    </configuration>
+                </plugin>
 				<plugin>
 					<groupId>org.apache.uima</groupId>
 					<artifactId>jcasgen-maven-plugin</artifactId>

Modified: uima/uimafit/trunk/uimafit-spring/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-spring/.settings/org.eclipse.jdt.core.prefs?rev=1664067&r1=1664066&r2=1664067&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-spring/.settings/org.eclipse.jdt.core.prefs (original)
+++ uima/uimafit/trunk/uimafit-spring/.settings/org.eclipse.jdt.core.prefs Wed Mar  4 16:11:33 2015
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0