You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2009/10/13 17:18:10 UTC
svn commit: r824802 - in /incubator/uima: sandbox/trunk/Lucas/
sandbox/trunk/OpenCalaisAnnotator/ sandbox/trunk/PearPackagingAntTask/
sandbox/trunk/RegularExpressionAnnotator/ sandbox/trunk/SandboxDistr/
sandbox/trunk/SandboxDistr/annotator-package/bui...
Author: schor
Date: Tue Oct 13 15:18:10 2009
New Revision: 824802
URL: http://svn.apache.org/viewvc?rev=824802&view=rev
Log:
UIMA-1614 clean up the update to 2.3.0-incubating (drop "-SNAPSHOT")
Modified:
incubator/uima/sandbox/trunk/Lucas/pom.xml
incubator/uima/sandbox/trunk/OpenCalaisAnnotator/pom.xml
incubator/uima/sandbox/trunk/PearPackagingAntTask/pom.xml
incubator/uima/sandbox/trunk/RegularExpressionAnnotator/pom.xml
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/build/changeVersion.xml
incubator/uima/sandbox/trunk/SandboxDistr/pear-builder-pom/pom.xml
incubator/uima/sandbox/trunk/SandboxDistr/pom.xml
incubator/uima/sandbox/trunk/Tagger/pom.xml
incubator/uima/uima-as/trunk/uima-as-distr/pom.xml
incubator/uima/uima-as/trunk/uima-as-distr/src/main/build/changeVersion.xml
incubator/uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml
incubator/uima/uimaj/trunk/uimaj-bootstrap/pom.xml
incubator/uima/uimaj/trunk/uimaj-distr/src/main/build/changeVersion.xml
incubator/uima/uimaj/trunk/uimaj-eclipse-update-site/build.xml
incubator/uima/uimaj/trunk/uimaj-eclipse-update-site/site.xml
Modified: incubator/uima/sandbox/trunk/Lucas/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/Lucas/pom.xml?rev=824802&r1=824801&r2=824802&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/Lucas/pom.xml (original)
+++ incubator/uima/sandbox/trunk/Lucas/pom.xml Tue Oct 13 15:18:10 2009
@@ -26,7 +26,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>Lucas</artifactId>
<name>Apache UIMA Lucene CAS Indexer</name>
- <version>2.3.0-incubating-SNAPSHOT</version>
+ <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
<description>Writes information contained in CAS objects to fields of a Lucene search index; mapping is done in a mapping file.</description>
<parent>
Modified: incubator/uima/sandbox/trunk/OpenCalaisAnnotator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotator/pom.xml?rev=824802&r1=824801&r2=824802&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotator/pom.xml (original)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotator/pom.xml Tue Oct 13 15:18:10 2009
@@ -23,7 +23,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>OpenCalaisAnnotator</artifactId>
<packaging>jar</packaging>
- <version>2.3.0-incubating-SNAPSHOT</version>
+ <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
<name>Apache UIMA OpenCalais Annotator Wrapper</name>
<parent>
Modified: incubator/uima/sandbox/trunk/PearPackagingAntTask/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/PearPackagingAntTask/pom.xml?rev=824802&r1=824801&r2=824802&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/PearPackagingAntTask/pom.xml (original)
+++ incubator/uima/sandbox/trunk/PearPackagingAntTask/pom.xml Tue Oct 13 15:18:10 2009
@@ -22,7 +22,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>PearPackagingAntTask</artifactId>
<name>Apache UIMA PEAR packaging ANT task</name>
- <version>2.3.0-incubating-SNAPSHOT</version>
+ <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
<parent>
<groupId>org.apache.uima</groupId>
Modified: incubator/uima/sandbox/trunk/RegularExpressionAnnotator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/RegularExpressionAnnotator/pom.xml?rev=824802&r1=824801&r2=824802&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/RegularExpressionAnnotator/pom.xml (original)
+++ incubator/uima/sandbox/trunk/RegularExpressionAnnotator/pom.xml Tue Oct 13 15:18:10 2009
@@ -23,7 +23,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>RegularExpressionAnnotator</artifactId>
<packaging>jar</packaging>
- <version>2.3.0-incubating-SNAPSHOT</version>
+ <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
<name>Apache UIMA RegularExpressionAnnotator</name>
<parent>
Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/build/changeVersion.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/build/changeVersion.xml?rev=824802&r1=824801&r2=824802&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/build/changeVersion.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/build/changeVersion.xml Tue Oct 13 15:18:10 2009
@@ -77,6 +77,8 @@
OpenCalaisAnnotator/pom.xml,
PearPackagingAntTask/pom.xml,
RegularExpressionAnnotator/pom.xml,
+ SandboxDistr/annotator-package/pom.xml,
+ SandboxDistr/pear-builder-pom/pom.xml,
SimpleServer/pom.xml,
SnowballAnnotator/pom.xml,
Tagger/pom.xml,
Modified: incubator/uima/sandbox/trunk/SandboxDistr/pear-builder-pom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/pear-builder-pom/pom.xml?rev=824802&r1=824801&r2=824802&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/pear-builder-pom/pom.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/pear-builder-pom/pom.xml Tue Oct 13 15:18:10 2009
@@ -28,7 +28,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>SandboxDistr-pearBuilder</artifactId>
<!-- version cannot be a ${xxx} form for Parent poms -->
- <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
+ <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
<name>Apache UIMA Sandbox distribution pear builder</name>
<packaging>pom</packaging>
<description>Common approach to building PEARs for Sandbox annotator projects</description>
@@ -37,7 +37,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>SandboxDistr</artifactId>
<!-- version cannot be a ${xxx} form -->
- <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
+ <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
<relativePath>..</relativePath>
</parent>
@@ -50,7 +50,7 @@
<plugin>
<groupId>org.apache.uima</groupId>
<artifactId>PearPackagingMavenPlugin</artifactId>
- <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
+ <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
<extensions>true</extensions>
<executions><execution>
<id>buildPear</id>
Modified: incubator/uima/sandbox/trunk/SandboxDistr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/pom.xml?rev=824802&r1=824801&r2=824802&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/pom.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/pom.xml Tue Oct 13 15:18:10 2009
@@ -373,6 +373,7 @@
<module>../FsVariables</module>
<module>../Lucas</module>
<module>../OpenCalaisAnnotator</module>
+ <module>pear-builder-pom</module>
<module>../PearPackagingAntTask</module>
<module>../RegularExpressionAnnotator</module>
<module>../SimpleServer</module>
Modified: incubator/uima/sandbox/trunk/Tagger/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/Tagger/pom.xml?rev=824802&r1=824801&r2=824802&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/Tagger/pom.xml (original)
+++ incubator/uima/sandbox/trunk/Tagger/pom.xml Tue Oct 13 15:18:10 2009
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>WhitespaceTokenizer</artifactId>
- <version>2.3.0-incubating-SNAPSHOT</version>
+ <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/uima/uima-as/trunk/uima-as-distr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/pom.xml?rev=824802&r1=824801&r2=824802&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/pom.xml (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/pom.xml Tue Oct 13 15:18:10 2009
@@ -34,8 +34,8 @@
</parent>
<properties>
- <uimaj-as-release-version>2.3.0-incubating-SNAPSHOT</uimaj-as-release-version> <!-- this comment is a flag for changeVersion -->
- <uimaj-as-release-eclipse-version>2.3.0.incubating-SNAPSHOT</uimaj-as-release-eclipse-version> <!-- this comment is a flag for changeVersion -->
+ <uimaj-as-release-version>2.3.0-incubating</uimaj-as-release-version> <!-- this comment is a flag for changeVersion -->
+ <uimaj-as-release-eclipse-version>2.3.0.incubating</uimaj-as-release-eclipse-version> <!-- this comment is a flag for changeVersion -->
<!-- property used in multiple places in distr-superPom -->
<assemblyFinalName>uima-as-${uimaj-release-version}</assemblyFinalName>
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/build/changeVersion.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/build/changeVersion.xml?rev=824802&r1=824801&r2=824802&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/build/changeVersion.xml (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/build/changeVersion.xml Tue Oct 13 15:18:10 2009
@@ -49,7 +49,7 @@
<target name="all" depends=
"uimaj-as,
- uima-as-distr,
+ uima-as-distr,
normal-modules,
eclipse-plugins,
eclipse-features,
@@ -78,18 +78,21 @@
<replacefilter token="<version>${uima.as.prev.version}</version> <!-- this comment is a flag for changeVersion -->"
value="<version>${uima.as.version}</version> <!-- this comment is a flag for changeVersion -->"/>
<replacefilter token="<version>${uima.eclipse.prev.version}</version> <!-- this comment is a flag for changeVersion - eclipse -->"
- value="<version>${uima.eclipse.version}</version> <!-- this comment is a flag for changeVersion - eclipse -->"/>
-
+ value="<version>${uima.eclipse.version}</version> <!-- this comment is a flag for changeVersion - eclipse -->"/>
</replace>
</target>
- <target name="uima-as-distr">
+ <target name="uima-as-distr">
<replace file="${wksp}/uima-as-distr/pom.xml" summary="yes">
- <replacefilter token="<version>${uima.as.prev.version}</version> <!-- this comment is a flag for changeVersion -->"
+ <replacefilter token="<version>${uima.as.prev.version}</version> <!-- this comment is a flag for changeVersion -->"
value="<version>${uima.as.version}</version> <!-- this comment is a flag for changeVersion -->"/>
- </replace>
+ <replacefilter token="<uimaj-as-release-version>${uima.as.prev.version}</uimaj-as-release-version>"
+ value="<uimaj-as-release-version>${uima.as.version}</uimaj-as-release-version>"/>
+ <replacefilter token="<uimaj-as-release-eclipse-version>${uima.as.eclipse.prev.version}</uimaj-as-release-eclipse-version>"
+ value="<uimaj-as-release-eclipse-version>${uima.as.eclipse.version}</uimaj-as-release-eclipse-version>"/>
+ </replace>
</target>
-
+
<target name="normal-modules">
<replace dir="${wksp}" includes=
"uimaj-as-activemq/pom.xml,
Modified: incubator/uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml?rev=824802&r1=824801&r2=824802&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml (original)
+++ incubator/uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml Tue Oct 13 15:18:10 2009
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj</artifactId>
- <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
+ <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
<relativePath>../uimaj</relativePath>
</parent>
Modified: incubator/uima/uimaj/trunk/uimaj-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-bootstrap/pom.xml?rev=824802&r1=824801&r2=824802&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-bootstrap/pom.xml (original)
+++ incubator/uima/uimaj/trunk/uimaj-bootstrap/pom.xml Tue Oct 13 15:18:10 2009
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj</artifactId>
- <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
+ <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
<relativePath>../uimaj</relativePath>
</parent>
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/build/changeVersion.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/build/changeVersion.xml?rev=824802&r1=824801&r2=824802&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/build/changeVersion.xml (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/build/changeVersion.xml Tue Oct 13 15:18:10 2009
@@ -51,7 +51,8 @@
normal-modules,
uima-framework,
eclipse-plugins,
- eclipse-features,
+ eclipse-features,
+ eclipse-update-site,
docbooks,
readme"/>
<!-- uimaj, normal-modules, uima-framework,
@@ -81,6 +82,7 @@
"jVinci/pom.xml,
uimaj-adapter-soap/pom.xml,
uimaj-adapter-vinci/pom.xml,
+ uimaj-bootstrap/pom.xml,
uimaj-component-test-util/pom.xml,
uimaj-core/pom.xml,
uimaj-cpe/pom.xml,
@@ -90,7 +92,7 @@
uimaj-internal-tools/pom.xml,
uimaj-test-util/pom.xml,
uimaj-tools/pom.xml,
- PearPackagingMavenPlugin,
+ PearPackagingMavenPlugin/pom.xml,
uimaj/distr-superPom/pom.xml
- " summary="yes"
token="<version>${uima.prev.version}</version> <!-- this comment is a flag for changeVersion -->"
@@ -132,6 +134,21 @@
value='version="${uima.eclipse.version}"'/>
</target>
+ <target name="eclipse-update-site">
+ <replace file="${wksp}/uimaj-eclipse-update-site/build.xml"
+ summary="yes"
+ token='version="${uima.eclipse.prev.version}"'
+ value='version="${uima.eclipse.version}"'/>
+ <replace file="${wksp}/uimaj-eclipse-update-site/site.xml"
+ summary="yes"
+ token='version="${uima.eclipse.prev.version}"'
+ value='version="${uima.eclipse.version}"'/>
+ <replace file="${wksp}/uimaj-eclipse-update-site/site.xml"
+ summary="yes"
+ token='_${uima.eclipse.prev.version}.jar'
+ value='_${uima.eclipse.version}.jar'/>
+ </target>
+
<target name="readme">
<echo message="Manually update the uimaj-distr/src/main/readme/RELEASE_NOTES and RELEASE_NOTES.html"/>
</target>
Modified: incubator/uima/uimaj/trunk/uimaj-eclipse-update-site/build.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-eclipse-update-site/build.xml?rev=824802&r1=824801&r2=824802&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-eclipse-update-site/build.xml (original)
+++ incubator/uima/uimaj/trunk/uimaj-eclipse-update-site/build.xml Tue Oct 13 15:18:10 2009
@@ -219,13 +219,13 @@
<target name="build-features" depends="init">
<makeFeatureJar project-name="uimaj-eclipse-feature-deployeditor"
org-name="org.apache.uima.deployeditor"
- version="2.3.0.incubating-SNAPSHOT"/>
+ version="2.3.0.incubating"/>
<makeFeatureJar project-name="uimaj-eclipse-feature-runtime"
org-name="org.apache.uima.runtime"
- version="2.3.0.incubating-SNAPSHOT"/>
+ version="2.3.0.incubating"/>
<makeFeatureJar project-name="uimaj-eclipse-feature-tools"
org-name="org.apache.uima.tools"
- version="2.3.0.incubating-SNAPSHOT"/>
+ version="2.3.0.incubating"/>
</target>
<target name="pack-jars" depends="init">
Modified: incubator/uima/uimaj/trunk/uimaj-eclipse-update-site/site.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-eclipse-update-site/site.xml?rev=824802&r1=824801&r2=824802&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-eclipse-update-site/site.xml (original)
+++ incubator/uima/uimaj/trunk/uimaj-eclipse-update-site/site.xml Tue Oct 13 15:18:10 2009
@@ -25,13 +25,13 @@
</description>
<!-- keep old features listed here - to permit the update site to provide the older features -->
- <feature url="features/org.apache.uima.tools_2.3.0.incubating-SNAPSHOT.jar" id="org.apache.uima.tools" version="2.3.0.incubating-SNAPSHOT">
+ <feature url="features/org.apache.uima.tools_2.3.0.incubating.jar" id="org.apache.uima.tools" version="2.3.0.incubating">
<category name="uima-tooling-and-runtimes"/>
</feature>
- <feature url="features/org.apache.uima.runtime_2.3.0.incubating-SNAPSHOT.jar" id="org.apache.uima.runtime" version="2.3.0.incubating-SNAPSHOT">
+ <feature url="features/org.apache.uima.runtime_2.3.0.incubating.jar" id="org.apache.uima.runtime" version="2.3.0.incubating">
<category name="uima-tooling-and-runtimes"/>
</feature>
- <feature url="features/org.apache.uima.as.deployeditor_2.3.0.incubating-SNAPSHOT.jar" id="org.apache.uima.as.deployeditor" version="2.3.0.incubating-SNAPSHOT">
+ <feature url="features/org.apache.uima.as.deployeditor_2.3.0.incubating.jar" id="org.apache.uima.as.deployeditor" version="2.3.0.incubating">
<category name="uima-as-tooling"/>
</feature>