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 2008/03/10 19:38:04 UTC
svn commit: r635634 - in
/incubator/uima/sandbox/trunk/uima-as/uima-as-distr: pom.xml
src/main/build/changeVersion.xml src/main/build/versions.properties
Author: schor
Date: Mon Mar 10 11:38:01 2008
New Revision: 635634
URL: http://svn.apache.org/viewvc?rev=635634&view=rev
Log:
[UIMA-864] fixes to uima-as-distr's version of changeVersion, and running it to change the version to 2.2.2-incubating
Modified:
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/pom.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/build/changeVersion.xml
incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/build/versions.properties
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/pom.xml?rev=635634&r1=635633&r2=635634&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/pom.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/pom.xml Mon Mar 10 11:38:01 2008
@@ -47,7 +47,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as</artifactId>
- <version>0.7.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
+ <version>2.2.2-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
</parent>
<!-- dependencies used during assembly -->
@@ -166,7 +166,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
- <version>2.5.1</version>
+ <version>2.0.6</version>
</dependency>
<dependency>
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/build/changeVersion.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/build/changeVersion.xml?rev=635634&r1=635633&r2=635634&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/build/changeVersion.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/build/changeVersion.xml Mon Mar 10 11:38:01 2008
@@ -34,11 +34,17 @@
sets uima.as.prev.version.snapshot
sets uima.as.prev.version.base
-->
-
+
+ <property name="uima.version" value="${uima.version.base}-incubating${uima.version.snapshot}"/>
+ <property name="uima.eclipse.version" value="${uima.version.base}.incubating${uima.version.snapshot}"/>
+ <property name="uima.prev.version" value="${uima.prev.version.base}-incubating${uima.prev.version.snapshot}"/>
+ <property name="uima.eclipse.prev.version" value="${uima.prev.version.base}.incubating${uima.prev.version.snapshot}"/>
+
<property name="uima.as.version" value="${uima.as.version.base}-incubating${uima.as.version.snapshot}"/>
<property name="uima.as.eclipse.version" value="${uima.as.version.base}.incubating${uima.as.version.snapshot}"/>
<property name="uima.as.prev.version" value="${uima.as.prev.version.base}-incubating${uima.as.prev.version.snapshot}"/>
<property name="uima.as.eclipse.prev.version" value="${uima.as.prev.version.base}.incubating${uima.as.prev.version.snapshot}"/>
+
<property name="wksp" location="../../../../"/>
<target name="all" depends=
@@ -54,18 +60,20 @@
docbooks, readme -->
<target name="uimaj-as">
- <replace file="${wksp}/uimaj/pom.xml" summary="yes">
+ <replace file="${wksp}/uimaj-as/pom.xml" summary="yes">
<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="<uimaj-release-version>${uima.as.prev.version.base}</uimaj-release-version>"
- value="<uimaj-release-version>${uima.as.version.base}</uimaj-release-version>"/>
- <replacefilter token="<uimaj-release-eclipse-version>${uima.as.prev.version.base}</uimaj-release-eclipse-version>"
- value="<uimaj-release-eclipse-version>${uima.as.version.base}</uimaj-release-eclipse-version>"/>
- <replacefilter token="<uimaj-as-release-version>${uima.as.prev.version.base}</uimaj-as-release-version>"
- value="<uimaj-as-release-version>${uima.as.version.base}</uimaj-as-release-version>"/>
+ <replacefilter token="<uimaj-release-version>${uima.as.prev.version}</uimaj-release-version>"
+ value="<uimaj-release-version>${uima.as.version}</uimaj-release-version>"/>
+ <replacefilter token="<uimaj-release-eclipse-version>${uima.eclipse.prev.version}</uimaj-release-eclipse-version>"
+ value="<uimaj-release-eclipse-version>${uima.eclipse.version}</uimaj-release-eclipse-version>"/>
+ <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>
- <replace file="${wksp}/uimaj/eclipse-plugin-superPom/pom.xml" summary="yes">
+ <replace file="${wksp}/uimaj-as/eclipse-plugin-superPom/pom.xml" summary="yes">
<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 -->"
@@ -97,8 +105,7 @@
</target>
<target name="eclipse-features">
- <replace dir="${wksp}" includes=
- "uimaj-eclipse-feature-deployeditor/feature.xml"
+ <replace dir="${wksp}" includes="uimaj-eclipse-feature-deployeditor/feature.xml"
summary="yes"
token='version="${uima.as.eclipse.prev.version}"'
value='version="${uima.as.eclipse.version}"'/>
@@ -117,7 +124,7 @@
summary="yes"
token="<releaseinfo>Version ${uima.as.prev.version}</releaseinfo>"
value="<releaseinfo>Version ${uima.as.version}</releaseinfo>" />
- <replace dir="${wksp}" includes="uima-docbooks/src/index.html"
+ <replace dir="${wksp}" includes="uima-as-docbooks/src/index.html"
summary="yes"
token='<p class="releaseinfo">Version ${uima.as.prev.version}</p>'
value='<p class="releaseinfo">Version ${uima.as.version}</p>' />
Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/build/versions.properties
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/build/versions.properties?rev=635634&r1=635633&r2=635634&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/build/versions.properties (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/build/versions.properties Mon Mar 10 11:38:01 2008
@@ -20,8 +20,9 @@
############################################################
# UIMA Version strings
#
-# We keep all the version strings here, for reference,
-# but only the first set is used.
+# Unlike other Ant property assignments, in the case of
+# duplicates, the last one wins.
+# So - don't have duplicate values in this file
#
# A set consists of
# a) what the new values should be
@@ -33,21 +34,18 @@
# set this to -SNAPSHOT to have the snapshot suffix
# otherwise set to [nothing]
-uima.version.snapshot=-SNAPSHOT
+uima.as.version.snapshot=
+uima.version.snapshot=
uima.version.base=2.2.2
uima.version.major=2
uima.version.minor=2
uima.version.buildRevision=2
uima.as.version.base=2.2.2
-uima.as.version.snapshot=-SNAPSHOT
-
-# These next values are used to construct the matching
-# strings to replace
+uima.as.prev.version.snapshot=-SNAPSHOT
uima.prev.version.snapshot=-SNAPSHOT
-uima.prev.version.base=2.3.0
+uima.prev.version.base=2.2.2
uima.prev.version.major=2
-uima.prev.version.minor=3
-uima.prev.version.buildRevision=0
-uima.as.prev.version.base=0.7.0
-uima.as.prev.version.snapshot=
\ No newline at end of file
+uima.prev.version.minor=2
+uima.prev.version.buildRevision=2
+uima.as.prev.version.base=2.2.2