|
From: <man...@us...> - 2010-12-18 20:34:31
|
Revision: 6027
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6027&view=rev
Author: manningr
Date: 2010-12-18 20:34:25 +0000 (Sat, 18 Dec 2010)
Log Message:
-----------
Updated squirrelsql-version-plugin to set the value for the changelog header (in changes.txt). Now, based on the project version, the header will be set to either the "latest changes in SVN or Snapshot" if the project version ends in -SNAPSHOT, or else the header is set to the version followed by the current date.
Modified Paths:
--------------
trunk/sql12/doc/pom.xml
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/pom.xml
Modified: trunk/sql12/doc/pom.xml
===================================================================
--- trunk/sql12/doc/pom.xml 2010-12-18 20:26:15 UTC (rev 6026)
+++ trunk/sql12/doc/pom.xml 2010-12-18 20:34:25 UTC (rev 6027)
@@ -58,10 +58,35 @@
<resources>
<resource>
<directory>src/main/resources</directory>
+ <excludes>
+ <exclude>changes.txt</exclude>
+ </excludes>
+ <filtering>false</filtering>
</resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>changes.txt</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
</resources>
<plugins>
+ <!-- Set the squirrelsql.changelog.header if it has not already been set. -->
<plugin>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrelsql-version-plugin</artifactId>
+ <version>${squirrelsql-version-plugin-version}</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>set-version</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
@@ -72,5 +97,4 @@
</plugin>
</plugins>
</build>
-
-</project>
\ No newline at end of file
+</project>
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2010-12-18 20:26:15 UTC (rev 6026)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2010-12-18 20:34:25 UTC (rev 6027)
@@ -2,8 +2,7 @@
==============================
-Not yet released - available from SVN or in the latest snapshot:
-----------------------------------------------------------------
+${squirrelsql.changelog.header}
Enhancements:
@@ -26,7 +25,7 @@
Bug-fixes:
-3137390: Cannot connect after latest software update.
+3137390: Cannot connect after latest software update.
3123014: StackOverflow ProgressCallBackDialog.
Thanks to Stefan (wis775) for the patch.
3055859: Regular expressions did not work in find & replace dialog
Modified: trunk/sql12/pom.xml
===================================================================
--- trunk/sql12/pom.xml 2010-12-18 20:26:15 UTC (rev 6026)
+++ trunk/sql12/pom.xml 2010-12-18 20:34:25 UTC (rev 6027)
@@ -73,7 +73,7 @@
<release-plugin-version>2.1</release-plugin-version>
<scm-plugin-version>1.4</scm-plugin-version>
<source-plugin-version>2.1.2</source-plugin-version>
- <squirrelsql-version-plugin-version>1.0.4</squirrelsql-version-plugin-version>
+ <squirrelsql-version-plugin-version>1.0.5</squirrelsql-version-plugin-version>
<squirrelsql-update-site-plugin-version>1.0.4</squirrelsql-update-site-plugin-version>
<surefire-plugin-version>2.6</surefire-plugin-version>
<surefire-report-plugin-version>2.0-beta-1</surefire-report-plugin-version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
