Revision: 5788
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5788&view=rev
Author: manningr
Date: 2010-08-14 20:22:23 +0000 (Sat, 14 Aug 2010)
Log Message:
-----------
Update to add RPM-safe form of version string which contains no dashes.
Modified Paths:
--------------
trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
Modified: trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-08-11 00:10:20 UTC (rev 5787)
+++ trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-08-14 20:22:23 UTC (rev 5788)
@@ -37,7 +37,9 @@
* form of YYYYMMDD_HHMM. If however, the project version does not end with "-SNAPSHOT", then
* squirrelsql.version will be set to the value of the project version. In case this mojo is configured and
* executed more than once in a build, the squirrelsqlVersion property is set to the value that it was
- * initially set to during the first execution of this plugin.
+ * initially set to during the first execution of this plugin. This mojo will also set a modified form
+ * of the version to a property called "squirrelsql.rpm.version". This property's value is safe to use for
+ * the RPM which requires no dashes in the version string.
*
* @goal set-version
* @phase initialize
@@ -50,12 +52,18 @@
/** This is the property that will be set for use in the pom */
public static String VERSION_PROPERTY_KEY = "squirrelsql.version";
+ /**
+ * This is the property for the rpm version that will be set for use in the pom. RPM doesn't allow
+ * dashes in the version so this is a sanitized form.
+ */
+ public static String RPM_VERSION_PROPERTY_KEY = "squirrelsql.rpm.version";
+
/** The format of the timestamp that follows the prefix SNAPSHOT- in the version string */
public static String TIMESTAMP_PATTERN = "yyyyMMdd_kkmm";
/** A place to keep the version after it has been generated. */
private static String squirrelsqlVersion = null;
-
+
/**
* The maven project in which this plugin is configured.
*
@@ -121,10 +129,11 @@
// unnecessary.
Properties props = project.getProperties();
props.put(VERSION_PROPERTY_KEY, squirrelsqlVersion);
+ props.put(RPM_VERSION_PROPERTY_KEY, squirrelsqlVersion.replace('-', '_'));
// Also a global system property so that this is accessible from any pom as a pom property.
System.setProperty(VERSION_PROPERTY_KEY, squirrelsqlVersion);
-
+ System.setProperty(RPM_VERSION_PROPERTY_KEY, squirrelsqlVersion.replace('-', '_'));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 5795
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5795&view=rev
Author: manningr
Date: 2010-08-20 22:56:00 +0000 (Fri, 20 Aug 2010)
Log Message:
-----------
Hold onto the rpm version as well. Added an output file for debug purposes, which is currently disabled.
Modified Paths:
--------------
trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
Modified: trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-08-15 19:07:29 UTC (rev 5794)
+++ trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-08-20 22:56:00 UTC (rev 5795)
@@ -19,6 +19,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Properties;
@@ -64,6 +67,9 @@
/** A place to keep the version after it has been generated. */
private static String squirrelsqlVersion = null;
+ /** A place to keep the rpm version after it has been generated from the squirrelsqlVersion */
+ private static String squirrelsqlRpmVersion = null;
+
/**
* The maven project in which this plugin is configured.
*
@@ -92,7 +98,7 @@
* @throws MojoExecutionException
* if the projectVersion isn't specified.
*/
- public void execute() throws MojoExecutionException
+ synchronized public void execute() throws MojoExecutionException
{
// Skip creating a new version if we have already done so in the past.
if (squirrelsqlVersion == null)
@@ -123,8 +129,15 @@
throw e;
}
}
+ // RPM requires that the version string have no dashes. So create a special RPM-safe version of the
+ // version string.
+ squirrelsqlRpmVersion = squirrelsqlVersion.replace('-', '_');
}
+ if (log.isInfoEnabled()) {
+ log.info("squirrelsqlVersion: "+squirrelsqlVersion);
+ }
+
// We set this as a property in the current project where the plugin is configured. This is probably
// unnecessary.
Properties props = project.getProperties();
@@ -134,6 +147,31 @@
// Also a global system property so that this is accessible from any pom as a pom property.
System.setProperty(VERSION_PROPERTY_KEY, squirrelsqlVersion);
System.setProperty(RPM_VERSION_PROPERTY_KEY, squirrelsqlVersion.replace('-', '_'));
+
+ //writeVersionToFile();
}
+
+ private void writeVersionToFile() {
+ File buildDir = new File(project.getBuild().getDirectory());
+ if (!buildDir.exists()) {
+ buildDir.mkdir();
+ }
+ File versionFile = new File(buildDir, "squirrelsql-version-plugin.log");
+ PrintWriter out = null;
+ try {
+ versionFile.createNewFile();
+ out = new PrintWriter(versionFile);
+ SimpleDateFormat sdf = new SimpleDateFormat(TIMESTAMP_PATTERN);
+ out.println(VERSION_PROPERTY_KEY+"="+squirrelsqlVersion);
+ out.println(RPM_VERSION_PROPERTY_KEY+"="+squirrelsqlRpmVersion);
+ out.println("Current Timestamp: "+sdf.format(new Date()));
+ } catch (IOException e) {
+ log.error("Unable to write version ("+squirrelsqlVersion+") to file: "+e.getMessage(), e);
+ } finally {
+ if (out != null) {
+ out.close();
+ }
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 5972
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5972&view=rev
Author: manningr
Date: 2010-11-20 01:17:09 +0000 (Sat, 20 Nov 2010)
Log Message:
-----------
Marked threadSafe to support parallel builds in Maven. The execute method is marked synchronized since it modifies global state.
Modified Paths:
--------------
trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
Modified: trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-11-20 01:07:45 UTC (rev 5971)
+++ trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-11-20 01:17:09 UTC (rev 5972)
@@ -46,6 +46,7 @@
*
* @goal set-version
* @phase initialize
+ * @threadSafe
*/
public class SquirrelSqlVersionMojo extends AbstractMojo
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6023
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6023&view=rev
Author: manningr
Date: 2010-12-18 20:22:28 +0000 (Sat, 18 Dec 2010)
Log Message:
-----------
Store the value of the change log header in a system property so that it can be filtered into the changes.txt file.
Modified Paths:
--------------
trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
Modified: trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-12-18 18:20:12 UTC (rev 6022)
+++ trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-12-18 20:22:28 UTC (rev 6023)
@@ -62,15 +62,36 @@
*/
public static String RPM_VERSION_PROPERTY_KEY = "squirrelsql.rpm.version";
+ /**
+ * If the version is a snapshot, then this is the contents of the header in changes.txt
+ */
+ public static String NOT_YET_RELEASED_HEADER_VALUE =
+ "Not yet released - available from SVN or in the latest snapshot:\n" +
+ "----------------------------------------------------------------\n";
+
+ /**
+ * The value of this property is what appears at the very top of the changelog
+ * (doc/src/main/resources/changes.txt)
+ */
+ public static String CHANGELOG_HEADER_KEY = "squirrelsql.changelog.header";
+
/** The format of the timestamp that follows the prefix SNAPSHOT- in the version string */
public static String TIMESTAMP_PATTERN = "yyyyMMdd_kkmm";
+ /**
+ * Format of the date that is displayed next to a non-snapshot release version
+ */
+ public static String CHANGELOG_DATE_FORMAT = "MM/dd/yyyy";
+
/** A place to keep the version after it has been generated. */
private static String squirrelsqlVersion = null;
/** A place to keep the rpm version after it has been generated from the squirrelsqlVersion */
private static String squirrelsqlRpmVersion = null;
+ /** A place to keep the changelog header after it has been generated. */
+ private static String changeLogHeader = null;
+
/**
* The maven project in which this plugin is configured.
*
@@ -106,6 +127,7 @@
{
if (project == null) { throw new MojoExecutionException("project cannot be null."); }
+ Date currentDate = new Date();
squirrelsqlVersion = project.getVersion();
// override the project's version with the value of "projectVersion" if it is configured
@@ -117,18 +139,11 @@
// If the squirrelsqlVersion ends with -snapshot, then we need to generate a timestamp
if (squirrelsqlVersion.toLowerCase().endsWith("-snapshot"))
{
- try
- {
- SimpleDateFormat sdf = new SimpleDateFormat(TIMESTAMP_PATTERN);
- String timestampStr = sdf.format(new Date());
- squirrelsqlVersion = "Snapshot-" + timestampStr;
- }
- catch (IllegalStateException e)
- {
-
- log.error("Could not convert date format pattern " + TIMESTAMP_PATTERN);
- throw e;
- }
+ squirrelsqlVersion = "Snapshot-" + getFormattedDate(currentDate, TIMESTAMP_PATTERN);
+ changeLogHeader = NOT_YET_RELEASED_HEADER_VALUE;
+ } else {
+ String releaseDateStr = getFormattedDate(currentDate, CHANGELOG_DATE_FORMAT);
+ changeLogHeader = getReleaseChangeLogHeader(squirrelsqlVersion, releaseDateStr);
}
// RPM requires that the version string have no dashes. So create a special RPM-safe version of the
// version string.
@@ -144,14 +159,42 @@
Properties props = project.getProperties();
props.put(VERSION_PROPERTY_KEY, squirrelsqlVersion);
props.put(RPM_VERSION_PROPERTY_KEY, squirrelsqlVersion.replace('-', '_'));
+ props.put(CHANGELOG_HEADER_KEY, changeLogHeader);
// Also a global system property so that this is accessible from any pom as a pom property.
System.setProperty(VERSION_PROPERTY_KEY, squirrelsqlVersion);
System.setProperty(RPM_VERSION_PROPERTY_KEY, squirrelsqlVersion.replace('-', '_'));
+ System.setProperty(CHANGELOG_HEADER_KEY, changeLogHeader);
//writeVersionToFile();
}
+ private String getReleaseChangeLogHeader(String version, String releaseDateStr) {
+ StringBuilder result = new StringBuilder();
+ result.append(version).append(" (").append(releaseDateStr).append(")");
+ int length = result.length();
+ result.append("\n");
+ for (int i = 0; i < length; i++) {
+ result.append("=");
+ }
+ return result.toString();
+ }
+
+ private String getFormattedDate(Date dateToFormat, String formatToApply) {
+ String result = null;
+ try
+ {
+ SimpleDateFormat sdf = new SimpleDateFormat(formatToApply);
+ result = sdf.format(dateToFormat);
+ }
+ catch (IllegalStateException e)
+ {
+ log.error("Could not convert date format pattern " + formatToApply);
+ throw e;
+ }
+ return result;
+ }
+
private void writeVersionToFile() {
File buildDir = new File(project.getBuild().getDirectory());
if (!buildDir.exists()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
