Menu
▾
▴
[Geotools-commits] svn - r38837 - in trunk: build build/release docs docs/user/tutorial/advanced/artifacts docs/user/tutorial/feature/artifacts docs/user/tutorial/filter/artifacts docs/user/tutorial/geometry/artifacts docs/user/tutorial/map/artifacts docs/user/tutorial/quickstart/artifacts docs/user/tutorial/raster/artifacts modules/unsupported/wfs-ng
|
From: <svn...@os...> - 2012-06-27 18:19:14
|
Author: jdeolive
Date: 2012-06-27 11:19:03 -0700 (Wed, 27 Jun 2012)
New Revision: 38837
Modified:
trunk/build/release/build_release.sh
trunk/build/rename.xml
trunk/docs/build.xml
trunk/docs/common.py
trunk/docs/pom.xml
trunk/docs/user/tutorial/advanced/artifacts/pom.xml
trunk/docs/user/tutorial/feature/artifacts/pom.xml
trunk/docs/user/tutorial/filter/artifacts/pom.xml
trunk/docs/user/tutorial/geometry/artifacts/pom.xml
trunk/docs/user/tutorial/map/artifacts/pom.xml
trunk/docs/user/tutorial/quickstart/artifacts/pom.xml
trunk/docs/user/tutorial/raster/artifacts/pom.xml
trunk/modules/unsupported/wfs-ng/pom.xml
Log:
GEOT-4185, fixing version substitution for release
Modified: trunk/build/release/build_release.sh
===================================================================
--- trunk/build/release/build_release.sh 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/build/release/build_release.sh 2012-06-27 18:19:03 UTC (rev 38837)
@@ -136,6 +136,7 @@
# update versions
pushd build > /dev/null
sed -i 's/@VERSION@/'$tag'/g' rename.xml
+sed -i "s/@RELEASE_DATE@/`date "+%b %d, %Y"`/g" rename.xml
ant -f rename.xml
popd > /dev/null
Modified: trunk/build/rename.xml
===================================================================
--- trunk/build/rename.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/build/rename.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -8,37 +8,21 @@
<target name="code">
<replace dir="..">
<include name="**/pom.xml"/>
- <replacefilter token="<version>8-SNAPSHOT</version>"
- value="<version>@VERSION@</version>"/>
+ <include name="**/GeoTools.java"/>
+ <replacefilter token="8-SNAPSHOT" value="@VERSION@"/>
</replace>
-
- <replace dir="../modules/library/metadata/src/main/java/org/geotools/factory">
- <include name="GeoTools.java"/>
- <replacefilter token="8-SNAPSHOT"
- value="@VERSION@"/>
- </replace>
</target>
<target name="doc">
- <replace dir="../docs/user/tutorial/">
- <include name="**/pom.xml"/>
- <replacefilter token="<geotools.version>8-SNAPSHOT</geotools.version>"
- value="<geotools.version>@VERSION@</geotools.version>"/>
+ <replace file="../docs/common.py">
+ <replacefilter token="@RELEASE@" value="@VERSION@"/>
</replace>
-
- <replace dir="../docs/">
- <include name="pom.xml"/>
- <replacefilter token="8-SNAPSHOT"
- value="@VERSION@"/>
- </replace>
</target>
- <target name="readme">
+ <target name="readme">
<replace file="../README.html">
- <replacefilter token="@RELEASE@"
- value="@VERSION@"/>
- <replacefilter token="@DATE@"
- value="@RELEASE_DATE@"/>
+ <replacefilter token="@RELEASE@" value="@VERSION@"/>
+ <replacefilter token="@DATE@" value="@RELEASE_DATE@"/>
</replace>
</target>
Modified: trunk/docs/build.xml
===================================================================
--- trunk/docs/build.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/build.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -26,7 +26,7 @@
<isset property="build.directory" />
</condition>
- <condition property="project.version" value="${project.version}" else="8.0-M3">
+ <condition property="project.version" value="${project.version}" else="8-SNAPSHOT">
<isset property="project.version" />
</condition>
Modified: trunk/docs/common.py
===================================================================
--- trunk/docs/common.py 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/common.py 2012-06-27 18:19:03 UTC (rev 38837)
@@ -12,6 +12,7 @@
# serve to show the default.
import sys, os
+import re
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
@@ -47,11 +48,12 @@
# |version| and |release|, also used in various other places throughout the
# built documents.
#
+# The full version, including alpha/beta/rc tags.
+release = '@RELEASE@'
+
# The short X.Y version.
-version = '8.0'
+version = re.sub('-.*', '', release)
-# The full version, including alpha/beta/rc tags.
-release = '8.0-RC1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Modified: trunk/docs/pom.xml
===================================================================
--- trunk/docs/pom.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/pom.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -240,7 +240,7 @@
<ant antfile="build.xml" dir="${basedir}" target="${target}">
<property name="build.directory" value="${build.directory}"/>
<!-- may be ${project.version} when tagged -->
- <property name="project.version" value="8.0-RC1"/>
+ <property name="project.version" value="${project.version}"/>
</ant>
</tasks>
</configuration>
Modified: trunk/docs/user/tutorial/advanced/artifacts/pom.xml
===================================================================
--- trunk/docs/user/tutorial/advanced/artifacts/pom.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/user/tutorial/advanced/artifacts/pom.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
- <geotools.version>8.0-M4</geotools.version>
+ <geotools.version>8-SNAPSHOT</geotools.version>
</properties>
<dependencies>
Modified: trunk/docs/user/tutorial/feature/artifacts/pom.xml
===================================================================
--- trunk/docs/user/tutorial/feature/artifacts/pom.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/user/tutorial/feature/artifacts/pom.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
- <geotools.version>8.0-M4</geotools.version>
+ <geotools.version>8-SNAPSHOT</geotools.version>
</properties>
<dependencies>
Modified: trunk/docs/user/tutorial/filter/artifacts/pom.xml
===================================================================
--- trunk/docs/user/tutorial/filter/artifacts/pom.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/user/tutorial/filter/artifacts/pom.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <geotools.version>8.0-M4</geotools.version>
+ <geotools.version>8-SNAPSHOT</geotools.version>
</properties>
<dependencies>
<!-- Provides map projections -->
Modified: trunk/docs/user/tutorial/geometry/artifacts/pom.xml
===================================================================
--- trunk/docs/user/tutorial/geometry/artifacts/pom.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/user/tutorial/geometry/artifacts/pom.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <geotools.version>8.0-M4</geotools.version>
+ <geotools.version>8-SNAPSHOT</geotools.version>
</properties>
<dependencies>
<dependency>
Modified: trunk/docs/user/tutorial/map/artifacts/pom.xml
===================================================================
--- trunk/docs/user/tutorial/map/artifacts/pom.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/user/tutorial/map/artifacts/pom.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <geotools.version>8.0-M4</geotools.version>
+ <geotools.version>8-SNAPSHOT</geotools.version>
</properties>
<dependencies>
<dependency>
Modified: trunk/docs/user/tutorial/quickstart/artifacts/pom.xml
===================================================================
--- trunk/docs/user/tutorial/quickstart/artifacts/pom.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/user/tutorial/quickstart/artifacts/pom.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <geotools.version>8.0-RC1</geotools.version>
+ <geotools.version>8-SNAPSHOT</geotools.version>
</properties>
<dependencies>
<dependency>
Modified: trunk/docs/user/tutorial/raster/artifacts/pom.xml
===================================================================
--- trunk/docs/user/tutorial/raster/artifacts/pom.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/docs/user/tutorial/raster/artifacts/pom.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -11,7 +11,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <geotools.version>8.0-M4</geotools.version>
+ <geotools.version>8-SNAPSHOT</geotools.version>
</properties>
<dependencies>
<dependency>
Modified: trunk/modules/unsupported/wfs-ng/pom.xml
===================================================================
--- trunk/modules/unsupported/wfs-ng/pom.xml 2012-06-27 02:57:30 UTC (rev 38836)
+++ trunk/modules/unsupported/wfs-ng/pom.xml 2012-06-27 18:19:03 UTC (rev 38837)
@@ -105,9 +105,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.geotools</groupId>
- <artifactId>gt-data</artifactId>
- <version>2.7-SNAPSHOT</version>
+ <groupId>org.geotools</groupId>
+ <artifactId>gt-data</artifactId>
+ <version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
|
