You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(121) |
May
(188) |
Jun
(134) |
Jul
(115) |
Aug
(201) |
Sep
(22) |
Oct
(22) |
Nov
(15) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(20) |
Feb
(4) |
Mar
(1) |
Apr
(84) |
May
(107) |
Jun
(101) |
Jul
(131) |
Aug
(66) |
Sep
(55) |
Oct
(189) |
Nov
(164) |
Dec
(60) |
| 2006 |
Jan
(75) |
Feb
(107) |
Mar
(117) |
Apr
(115) |
May
(91) |
Jun
(91) |
Jul
(225) |
Aug
(151) |
Sep
(117) |
Oct
(165) |
Nov
(263) |
Dec
(233) |
| 2007 |
Jan
(244) |
Feb
(116) |
Mar
(185) |
Apr
(263) |
May
(149) |
Jun
(292) |
Jul
(260) |
Aug
(306) |
Sep
(130) |
Oct
(61) |
Nov
(103) |
Dec
(144) |
| 2008 |
Jan
(112) |
Feb
(55) |
Mar
(116) |
Apr
(76) |
May
(69) |
Jun
(130) |
Jul
(75) |
Aug
(56) |
Sep
(76) |
Oct
(87) |
Nov
(403) |
Dec
(410) |
| 2009 |
Jan
(132) |
Feb
(168) |
Mar
(197) |
Apr
(67) |
May
(8) |
Jun
(44) |
Jul
(144) |
Aug
(126) |
Sep
(88) |
Oct
(3) |
Nov
(81) |
Dec
(97) |
| 2010 |
Jan
(238) |
Feb
(41) |
Mar
(61) |
Apr
(37) |
May
(31) |
Jun
(22) |
Jul
(92) |
Aug
(105) |
Sep
(46) |
Oct
(45) |
Nov
(55) |
Dec
(92) |
| 2011 |
Jan
(51) |
Feb
(21) |
Mar
(57) |
Apr
(20) |
May
(32) |
Jun
(29) |
Jul
(26) |
Aug
(50) |
Sep
(59) |
Oct
(25) |
Nov
(79) |
Dec
(2) |
| 2012 |
Jan
(14) |
Feb
(31) |
Mar
(11) |
Apr
(9) |
May
(13) |
Jun
(9) |
Jul
(6) |
Aug
(12) |
Sep
(16) |
Oct
(37) |
Nov
(12) |
Dec
(7) |
| 2013 |
Jan
(9) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <man...@us...> - 2010-07-10 21:59:12
|
Revision: 5683
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5683&view=rev
Author: manningr
Date: 2010-07-10 21:59:06 +0000 (Sat, 10 Jul 2010)
Log Message:
-----------
Removed no longer required update-site module pom and removed the maven plugins from the mavenize script now that they have their own workspace.
Removed Paths:
-------------
trunk/mavenize/update-site/pom.xml
Deleted: trunk/mavenize/update-site/pom.xml
===================================================================
--- trunk/mavenize/update-site/pom.xml 2010-07-10 21:58:36 UTC (rev 5682)
+++ trunk/mavenize/update-site/pom.xml 2010-07-10 21:59:06 UTC (rev 5683)
@@ -1,78 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>net.sf.squirrel-sql</groupId>
- <artifactId>squirrel-root-pom</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>net.sf.squirrel-sql</groupId>
- <artifactId>update-site</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>Update Site Modules POM file</name>
- <description>
- This POM lists all of the update site modules.
- </description>
- <inceptionYear>2001</inceptionYear>
- <developers>
- <developer>
- <name>Gerd Wagner</name>
- <roles>
- <role>Administrator</role>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Rob Manning</name>
- <roles>
- <role>Developer</role>
- <role>Release Manager</role>
- </roles>
- </developer>
- </developers>
- <licenses>
- <license>
- <name>GNU Lesser General Public License</name>
- <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <url>http://www.squirrelsql.org/</url>
- <scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection>
- <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url>
- </scm>
- <issueManagement>
- <system>SourceForge Tracker</system>
- <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url>
- </issueManagement>
- <ciManagement>
- <system>Hudson</system>
- <url>https://www.squirrel-sql.org/hudson/</url>
- </ciManagement>
-
- <distributionManagement>
- <repository>
- <id>sonatype-squirrel-sql-releases</id>
- <name>SQuirreL-SQL Release Repository</name>
- <url>http://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
- </repository>
- <snapshotRepository>
- <id>sonatype-squirrel-sql-snapshots</id>
- <name>SQuirreL-SQL Snapshot Repository</name>
- <url>http://oss.sonatype.org/content/repositories/sourceforge-snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
-
- <modules>
- <module>squirrelsql-update-site</module>
- <module>squirrelsql-update-site-plugin</module>
- </modules>
-
-</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-07-10 21:58:42
|
Revision: 5682
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5682&view=rev
Author: manningr
Date: 2010-07-10 21:58:36 +0000 (Sat, 10 Jul 2010)
Log Message:
-----------
Removed no longer required update-site module pom and removed the maven plugins from the mavenize script now that they have their own workspace.
Modified Paths:
--------------
trunk/mavenize/mavenize.pl
trunk/mavenize/root-pom.xml
Modified: trunk/mavenize/mavenize.pl
===================================================================
--- trunk/mavenize/mavenize.pl 2010-07-10 21:54:54 UTC (rev 5681)
+++ trunk/mavenize/mavenize.pl 2010-07-10 21:58:36 UTC (rev 5682)
@@ -186,7 +186,7 @@
removeRemainingUnnecessaryFiles();
-copyVersionPluginProject();
+#copyVersionPluginProject();
# End of script; Begin Subroutines
@@ -766,46 +766,52 @@
print "Copying in update-site project\n";
- !$onlyCopyPoms && `rm -rf $topDir/update-site`;
- !$onlyCopyPoms && `svn mkdir --parents $topDir/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql`;
- !$onlyCopyPoms && `svn mkdir --parents $topDir/update-site/squirrelsql-update-site`;
+ #!$onlyCopyPoms && `rm -rf $topDir/update-site`;
+ #!$onlyCopyPoms && `svn mkdir --parents $topDir/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql`;
+ #!$onlyCopyPoms && `svn mkdir --parents $topDir/update-site/squirrelsql-update-site`;
+ !$onlyCopyPoms && `rm -rf $topDir/squirrelsql-update-site`;
+ !$onlyCopyPoms && `svn mkdir --parents $topDir/squirrelsql-update-site`;
- `cp $mavenizeDir/update-site/pom.xml $topDir/update-site/`;
- `cp $mavenizeDir/update-site/squirrelsql-update-site/pom.xml $topDir/update-site/squirrelsql-update-site/pom.xml`;
- `cp $mavenizeDir/update-site/squirrelsql-update-site-plugin/pom.xml $topDir/update-site/squirrelsql-update-site-plugin/pom.xml`;
- `cp $mavenizeDir/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/BuildUpdateSiteMojo.java $topDir/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/`;
+ #`cp $mavenizeDir/update-site/pom.xml $topDir/update-site/`;
+ #`cp $mavenizeDir/update-site/squirrelsql-update-site/pom.xml $topDir/update-site/squirrelsql-update-site/pom.xml`;
+ #`cp $mavenizeDir/update-site/squirrelsql-update-site-plugin/pom.xml $topDir/update-site/squirrelsql-update-site-plugin/pom.xml`;
+ #`cp $mavenizeDir/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/BuildUpdateSiteMojo.java $topDir/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/`;
+ `cp $mavenizeDir/update-site/squirrelsql-update-site/pom.xml $topDir/squirrelsql-update-site/pom.xml`;
return if $onlyCopyPoms;
- `svn add $topDir/update-site/pom.xml`;
- `svn add $topDir/update-site/squirrelsql-update-site/pom.xml`;
- `svn add $topDir/update-site/squirrelsql-update-site-plugin/pom.xml`;
- `svn add $topDir/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/BuildUpdateSiteMojo.java`;
+ #`svn add $topDir/update-site/pom.xml`;
+ #`svn add $topDir/update-site/squirrelsql-update-site/pom.xml`;
+ `svn add $topDir/squirrelsql-update-site/pom.xml`;
- setSvnIgnore("$topDir/update-site");
- setSvnIgnore("$topDir/update-site/squirrelsql-update-site");
- setSvnIgnore("$topDir/update-site/squirrelsql-update-site-plugin");
+ #`svn add $topDir/update-site/squirrelsql-update-site-plugin/pom.xml`;
+ #`svn add $topDir/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/BuildUpdateSiteMojo.java`;
+ #setSvnIgnore("$topDir/update-site");
+ #setSvnIgnore("$topDir/update-site/squirrelsql-update-site");
+ #setSvnIgnore("$topDir/update-site/squirrelsql-update-site-plugin");
+ setSvnIgnore("$topDir/squirrelsql-update-site");
+
chdirOrDie($mavenizeDir);
}
-sub copyVersionPluginProject {
- chdir($mavenizeDir) or die "Couldn't change directory to $mavenizeDir: $!\n";
+#sub copyVersionPluginProject {
+# chdir($mavenizeDir) or die "Couldn't change directory to $mavenizeDir: $!\n";
+#
+# print "Copying in version plugin project\n";
+#
+# `svn mkdir --parents $topDir/squirrelsql-version-plugin`;
+# `svn mkdir --parents $topDir/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql`;
+#
+# `cp $mavenizeDir/squirrelsql-version-plugin/pom.xml $topDir/squirrelsql-version-plugin`;
+# `cp $mavenizeDir/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java $topDir/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql`;
+#
+# `svn add $topDir/squirrelsql-version-plugin/pom.xml`;
+# `svn add $topDir/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java`;
+#
+# setSvnIgnore("$topDir/squirrelsql-version-plugin");
+#}
- print "Copying in version plugin project\n";
-
- `svn mkdir --parents $topDir/squirrelsql-version-plugin`;
- `svn mkdir --parents $topDir/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql`;
-
- `cp $mavenizeDir/squirrelsql-version-plugin/pom.xml $topDir/squirrelsql-version-plugin`;
- `cp $mavenizeDir/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java $topDir/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql`;
-
- `svn add $topDir/squirrelsql-version-plugin/pom.xml`;
- `svn add $topDir/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java`;
-
- setSvnIgnore("$topDir/squirrelsql-version-plugin");
-}
-
sub restructureDocModule {
print "Restructuring doc module\n";
Modified: trunk/mavenize/root-pom.xml
===================================================================
--- trunk/mavenize/root-pom.xml 2010-07-10 21:54:54 UTC (rev 5681)
+++ trunk/mavenize/root-pom.xml 2010-07-10 21:58:36 UTC (rev 5682)
@@ -121,11 +121,10 @@
<module>app</module>
<module>plugins</module>
<module>squirrelsql-translations</module>
- <module>squirrelsql-version-plugin</module>
<module>doc</module>
<module>web-site</module>
<module>installer</module>
- <module>update-site</module>
+ <module>squirrelsql-update-site</module>
</modules>
</profile>
<!--
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-07-10 21:55:01
|
Revision: 5681
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5681&view=rev
Author: manningr
Date: 2010-07-10 21:54:54 +0000 (Sat, 10 Jul 2010)
Log Message:
-----------
Moved update site maven plugin to maven plugin workspace
Added Paths:
-----------
trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/
Removed Paths:
-------------
trunk/mavenize/update-site/squirrelsql-update-site-plugin/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-07-10 21:53:42
|
Revision: 5680
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5680&view=rev
Author: manningr
Date: 2010-07-10 21:53:36 +0000 (Sat, 10 Jul 2010)
Log Message:
-----------
Moved version maven plugin to maven plugin workspace
Added Paths:
-----------
trunk/archive/
trunk/maven-plugin-workspace/squirrelsql-version-plugin/
Removed Paths:
-------------
trunk/mavenize/squirrelsql-version-plugin/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-07-10 19:48:25
|
Revision: 5679
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5679&view=rev
Author: manningr
Date: 2010-07-10 19:48:18 +0000 (Sat, 10 Jul 2010)
Log Message:
-----------
Separate source tree for custom maven plugins.
Added Paths:
-----------
trunk/maven-plugin-workspace/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-07-10 19:42:28
|
Revision: 5678
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5678&view=rev
Author: manningr
Date: 2010-07-10 19:42:22 +0000 (Sat, 10 Jul 2010)
Log Message:
-----------
Delete laf archives which are now brought in by dependencies.
Modified Paths:
--------------
trunk/mavenize/mavenize.pl
Modified: trunk/mavenize/mavenize.pl
===================================================================
--- trunk/mavenize/mavenize.pl 2010-07-10 19:41:38 UTC (rev 5677)
+++ trunk/mavenize/mavenize.pl 2010-07-10 19:42:22 UTC (rev 5678)
@@ -902,6 +902,10 @@
`svn add $lafPluginDir/src`;
`svn add $lafPluginDir/pom.xml`;
`svn add $targetFolder/laf-plugin-assembly.xml`;
+
+ `svn delete plugins/laf/lafs`;
+ `svn delete plugins/laf/oyoaha-theme-packs`;
+
chdir($lafPluginDir) or die "Couldn't change dir to ($lafPluginDir): $!\n";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-07-10 19:41:44
|
Revision: 5677
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5677&view=rev
Author: manningr
Date: 2010-07-10 19:41:38 +0000 (Sat, 10 Jul 2010)
Log Message:
-----------
Removed dependency on App module, which was never a dependency.
Modified Paths:
--------------
trunk/mavenize/squirrelsql-version-plugin/pom.xml
Modified: trunk/mavenize/squirrelsql-version-plugin/pom.xml
===================================================================
--- trunk/mavenize/squirrelsql-version-plugin/pom.xml 2010-07-10 19:41:01 UTC (rev 5676)
+++ trunk/mavenize/squirrelsql-version-plugin/pom.xml 2010-07-10 19:41:38 UTC (rev 5677)
@@ -62,11 +62,6 @@
</ciManagement>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>squirrel-sql</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${maven-plugin-api-version}</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-07-10 19:41:07
|
Revision: 5676
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5676&view=rev
Author: manningr
Date: 2010-07-10 19:41:01 +0000 (Sat, 10 Jul 2010)
Log Message:
-----------
Cache the version in case this plugin is executed twice in the same build (this would be bad for snapshot versions, to get a different version back on each execution).
Modified Paths:
--------------
trunk/mavenize/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
Modified: trunk/mavenize/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
===================================================================
--- trunk/mavenize/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-07-10 19:39:56 UTC (rev 5675)
+++ trunk/mavenize/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-07-10 19:41:01 UTC (rev 5676)
@@ -19,41 +19,25 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-import java.io.File;
-import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.HashSet;
-import java.util.Map;
import java.util.Properties;
-import java.util.Set;
-import java.util.Map.Entry;
-import net.sourceforge.squirrel_sql.client.update.UpdateUtil;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.ArtifactXmlBean;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.ChannelXmlBean;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.ModuleXmlBean;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.ReleaseXmlBean;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.UpdateXmlSerializer;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.UpdateXmlSerializerImpl;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.XmlBeanUtilities;
-import net.sourceforge.squirrel_sql.fw.util.IOUtilities;
-import net.sourceforge.squirrel_sql.fw.util.IOUtilitiesImpl;
-
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
/**
- * Goal which sets the System property "squirrelsql.version" based on the value of project version. Sets the
- * System property "squirrelsql.version" so that it can be used globally by the installers and the
- * update-site projects. It accepts the project version as an argument which it uses to decide what the
- * squirrelsql.version should be. If the project version ends with "-SNAPSHOT", then the squirrelsql.version
- * will be set to Snapshot-{timestamp} where {timestamp} is the current timestamp in the 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. This mojo should only be executed once during the
- * build since it manipulates globally-accessible properties. This is particularly important in the case
- * of snapshot project versions.
+ * Goal which sets the System property "squirrelsql.version" based on the value of project version. Sets the
+ * System property "squirrelsql.version" so that it can be used globally by the installers and the update-site
+ * projects. It accepts the project version optionally as an argument which it uses to decide what the
+ * squirrelsql.version should be. If this property is not configured, then the version of the project in which
+ * this plugin is configured will be used. If the project version ends with "-SNAPSHOT", then the
+ * squirrelsql.version will be set to Snapshot-{timestamp} where {timestamp} is the current timestamp in the
+ * 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.
*
* @goal set-version
* @phase initialize
@@ -63,23 +47,30 @@
private org.apache.maven.plugin.logging.Log log = getLog();
+ /** This is the property that will be set for use in the pom */
public static String VERSION_PROPERTY_KEY = "squirrelsql.version";
-
- /**
- * The maven project.
- *
- * @parameter expression="${project}"
- * @required
- * @readonly
- */
- private MavenProject project;
-
+
+ /** 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 version for the release.
+ * The maven project in which this plugin is configured.
*
- * @parameter expression="${projectVersion}"
+ * @parameter expression="${project}"
* @required
+ * @readonly
*/
+ private MavenProject project;
+
+ /**
+ * The version for the release. This is optional and if it is not specified then the project.version
+ * of the project in which this plugin is configured is used instead.
+ *
+ * @parameter expression="${projectVersion}"
+ */
private String projectVersion;
public void setprojectVersion(String projectVersion)
@@ -95,29 +86,43 @@
*/
public void execute() throws MojoExecutionException
{
- if (projectVersion == null) { throw new MojoExecutionException("projectVersion cannot be null."); }
+ // Skip creating a new version if we have already done so in the past.
+ if (squirrelsqlVersion == null)
+ {
+ if (project == null) { throw new MojoExecutionException("project cannot be null."); }
- String squirrelsqlVersion = projectVersion;
- String timestampPattern = "yyyyMMdd_kkmm";
-
- if (!projectVersion.toLowerCase().endsWith("-snapshot"))
- {
- SimpleDateFormat sdf = new SimpleDateFormat(timestampPattern);
- try
+ squirrelsqlVersion = project.getVersion();
+
+ // override the project's version with the value of "projectVersion" if it is configured
+ if (projectVersion != null && !"".equals(projectVersion))
{
- String date = sdf.format(new Date());
- squirrelsqlVersion = "Snapshot-" + date;
+ squirrelsqlVersion = projectVersion;
}
- catch (IllegalStateException e)
+
+ // If the squirrelsqlVersion ends with -snapshot, then we need to generate a timestamp
+ if (squirrelsqlVersion.toLowerCase().endsWith("-snapshot"))
{
-
- log.error("Could not convert date format pattern " + timestampPattern);
- throw e;
+ 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;
+ }
}
}
-
+
+ // We set this as a property in the current project where the plugin is configured. This is probably
+ // unnecessary.
Properties props = project.getProperties();
props.put(VERSION_PROPERTY_KEY, squirrelsqlVersion);
+
+ // Also a global system property so that this is accessible from any pom as a pom property.
System.setProperty(VERSION_PROPERTY_KEY, squirrelsqlVersion);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-07-10 19:40:03
|
Revision: 5675
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5675&view=rev
Author: manningr
Date: 2010-07-10 19:39:56 +0000 (Sat, 10 Jul 2010)
Log Message:
-----------
Added squirrelsql version plugin in case this project is built independently, and not part of a reactor build starting from the root pom.
Modified Paths:
--------------
trunk/mavenize/update-site/squirrelsql-update-site/pom.xml
Modified: trunk/mavenize/update-site/squirrelsql-update-site/pom.xml
===================================================================
--- trunk/mavenize/update-site/squirrelsql-update-site/pom.xml 2010-07-10 19:38:45 UTC (rev 5674)
+++ trunk/mavenize/update-site/squirrelsql-update-site/pom.xml 2010-07-10 19:39:56 UTC (rev 5675)
@@ -1,453 +1,442 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>net.sf.squirrel-sql</groupId>
- <artifactId>squirrel-root-pom</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>net.sf.squirrel-sql</groupId>
- <artifactId>squirrelsql-update-site</artifactId>
- <version>3.2.0-SNAPSHOT</version>
-
- <packaging>jar</packaging>
-
- <name>SQuirreLSQL Update Site Project</name>
- <description>
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrel-root-pom</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </parent>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrelsql-update-site</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>SQuirreLSQL Update Site Project</name>
+ <description>
This project is used to assemble the jars that produce the update site, and
run the update site plugin to generate the release.xml file. Finally, this
project can be used to deploy the update site to www.squirrel-sql.net
</description>
- <inceptionYear>2001</inceptionYear>
- <developers>
- <developer>
- <name>Gerd Wagner</name>
- <roles>
- <role>Administrator</role>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Rob Manning</name>
- <roles>
- <role>Developer</role>
- <role>Release Manager</role>
- </roles>
- </developer>
- </developers>
- <licenses>
- <license>
- <name>GNU Lesser</name>
- <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <url>http://www.squirrelsql.org/</url>
- <scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection>
- <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url>
- </scm>
- <issueManagement>
- <system>SourceForge Tracker</system>
- <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url>
- </issueManagement>
- <ciManagement>
- <system>Hudson</system>
- <url>https://www.squirrel-sql.org/hudson/</url>
- </ciManagement>
+ <inceptionYear>2001</inceptionYear>
+ <developers>
+ <developer>
+ <name>Gerd Wagner</name>
+ <roles>
+ <role>Administrator</role>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Rob Manning</name>
+ <roles>
+ <role>Developer</role>
+ <role>Release Manager</role>
+ </roles>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>GNU Lesser</name>
+ <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <url>http://www.squirrelsql.org/</url>
+ <scm>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection>
+ <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url>
+ </scm>
+ <issueManagement>
+ <system>SourceForge Tracker</system>
+ <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Hudson</system>
+ <url>https://www.squirrel-sql.org/hudson/</url>
+ </ciManagement>
+ <distributionManagement>
+ <repository>
+ <id>sonatype-squirrel-sql-releases</id>
+ <name>SQuirreL-SQL Release Repository</name>
+ <url>http://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+ </repository>
+ <snapshotRepository>
+ <id>sonatype-squirrel-sql-snapshots</id>
+ <name>SQuirreL-SQL Snapshot Repository</name>
+ <url>http://oss.sonatype.org/content/repositories/sourceforge-snapshots/</url>
+ </snapshotRepository>
+ </distributionManagement>
+ <dependencies>
+ <!-- SQuirreL Dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>fw</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>squirrel-sql</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <distributionManagement>
- <repository>
- <id>sonatype-squirrel-sql-releases</id>
- <name>SQuirreL-SQL Release Repository</name>
- <url>http://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
- </repository>
- <snapshotRepository>
- <id>sonatype-squirrel-sql-snapshots</id>
- <name>SQuirreL-SQL Snapshot Repository</name>
- <url>http://oss.sonatype.org/content/repositories/sourceforge-snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
+ <!-- Standard Plugins -->
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>codecompletion</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>editextras</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>graph</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>laf</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>sqlbookmark</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>sqlscript</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>syntax</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
- <dependencies>
- <!-- SQuirreL Dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>fw</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>squirrel-sql</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <!-- Optional Plugins -->
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>dataimport</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>dbcopy</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>db2</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>derby</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>firebird</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>firebirdmanager</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>h2</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>informix</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>mssql</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>mysql</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>oracle</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>postgres</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>refactoring</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>sessionscript</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>smarttools</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>sqlparam</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>sqlreplace</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>sqlval</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>sybase</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>i18n</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
- <!-- Standard Plugins -->
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>codecompletion</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>editextras</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>graph</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>laf</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>sqlbookmark</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>sqlscript</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>syntax</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <!-- Optional Plugins -->
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>dataimport</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>dbcopy</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>db2</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>derby</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>firebird</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>firebirdmanager</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>h2</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>hibernate</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>informix</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>mssql</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>mysql</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>oracle</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>postgres</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>refactoring</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>sessionscript</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>smarttools</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>sqlparam</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>sqlreplace</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>sqlval</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>sybase</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>i18n</artifactId>
- <version>${project.version}</version>
- <classifier>assembly</classifier>
- <type>zip</type>
- </dependency>
-
- <!-- Non-plugin dependencies -->
-
- <dependency>
- <groupId>net.sf.squirrel-sql.translations</groupId>
- <artifactId>squirrelsql-translations</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>squirrelsql-java-version-checker</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>${dependency-plugin-version}</version>
- <type>maven-plugin</type>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>${dependency-plugin-version}</version>
- <executions>
- <execution>
- <id>copy-core-artifacts</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <stripVersion>true</stripVersion>
- <outputDirectory>${project.build.directory}/release/core</outputDirectory>
- <excludeClassifiers>assembly</excludeClassifiers>
- <excludeTypes>zip</excludeTypes>
- </configuration>
- </execution>
- <execution>
- <id>copy-plugin-artifacts</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <stripVersion>true</stripVersion>
- <includeClassifiers>assembly</includeClassifiers>
- <includeTypes>zip</includeTypes>
- <excludeTransitive>true</excludeTransitive>
- <outputDirectory>${project.build.directory}/release/plugins</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>extract-translations</id>
- <phase>process-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>net.sf.squirrel-sql.translations</groupId>
- <artifactId>squirrelsql-translations</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <outputDirectory>${project.build.directory}/release/i18n</outputDirectory>
- <includes>**/*.jar</includes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>net.sf.squirrel-sql</groupId>
- <artifactId>squirrelsql-update-site-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <phase>prepare-package</phase>
- <goals>
- <goal>build-update-site</goal>
- </goals>
- <configuration>
- <releaseDirectory>${project.build.directory}/release</releaseDirectory>
- <releaseVersion>Snapshot-${release.timestamp}</releaseVersion>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <classesDirectory>${project.build.directory}/release</classesDirectory>
- <archive>
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- <includes>
- <include>**/*.jar</include>
- <include>**/*.zip</include>
- <include>release.xml</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>wagon-maven-plugin</artifactId>
- <version>1.0-beta-2</version>
- <configuration>
- <serverId>update-site-ftp-server</serverId>
- <!-- property update.site.ftp.server defined in settings.xml installer profile -->
- <url>ftp://${update.site.ftp.server}</url>
- </configuration>
- <executions>
- <execution>
- <id>ftp-upload-release</id>
- <phase>deploy</phase>
- <goals>
- <goal>upload</goal>
- </goals>
- <configuration>
- <fromDir>target/release</fromDir>
- <!-- property update.site.ftp.server defined in settings.xml installer profile -->
- <toDir>${update.site.path}</toDir>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ftp</artifactId>
- <version>1.0-beta-6</version>
- </extension>
- </extensions>
- </build>
-
-</project>
+ <!-- Non-plugin dependencies -->
+ <dependency>
+ <groupId>net.sf.squirrel-sql.translations</groupId>
+ <artifactId>squirrelsql-translations</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>squirrelsql-java-version-checker</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency-plugin-version}</version>
+ <type>maven-plugin</type>
+ </dependency>
+ </dependencies>
+ <properties>
+ <squirrelsql.version>test</squirrelsql.version>
+ </properties>
+ <build>
+ <plugins>
+ <!-- Set the squirrelsql.version property if it has not already been set. -->
+ <plugin>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrelsql-version-plugin</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>set-version</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>copy-core-artifacts</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <stripVersion>true</stripVersion>
+ <outputDirectory>${project.build.directory}/release/core</outputDirectory>
+ <excludeClassifiers>assembly</excludeClassifiers>
+ <excludeTypes>zip</excludeTypes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-plugin-artifacts</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <stripVersion>true</stripVersion>
+ <includeClassifiers>assembly</includeClassifiers>
+ <includeTypes>zip</includeTypes>
+ <excludeTransitive>true</excludeTransitive>
+ <outputDirectory>${project.build.directory}/release/plugins</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>extract-translations</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sf.squirrel-sql.translations</groupId>
+ <artifactId>squirrelsql-translations</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/release/i18n</outputDirectory>
+ <includes>**/*.jar</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrelsql-update-site-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>build-update-site</goal>
+ </goals>
+ <configuration>
+ <releaseDirectory>${project.build.directory}/release</releaseDirectory>
+ <releaseVersion>${squirrelsql.version}</releaseVersion>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <classesDirectory>${project.build.directory}/release</classesDirectory>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ <includes>
+ <include>**/*.jar</include>
+ <include>**/*.zip</include>
+ <include>release.xml</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>wagon-maven-plugin</artifactId>
+ <version>1.0-beta-2</version>
+ <configuration>
+ <serverId>update-site-ftp-server</serverId>
+ <!-- property update.site.ftp.server defined in settings.xml installer profile -->
+ <url>ftp://${update.site.ftp.server}</url>
+ </configuration>
+ <executions>
+ <execution>
+ <id>ftp-upload-release</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>upload</goal>
+ </goals>
+ <configuration>
+ <fromDir>target/release</fromDir>
+ <!-- property update.site.ftp.server defined in settings.xml installer profile -->
+ <toDir>${update.site.path}</toDir>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ftp</artifactId>
+ <version>1.0-beta-6</version>
+ </extension>
+ </extensions>
+ </build>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-07-10 19:38:52
|
Revision: 5674
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5674&view=rev
Author: manningr
Date: 2010-07-10 19:38:45 +0000 (Sat, 10 Jul 2010)
Log Message:
-----------
Replaced timestamp plugin with a custom version plugin that smartly determines what the squirrelsql version should be.
Modified Paths:
--------------
trunk/mavenize/root-pom.xml
Modified: trunk/mavenize/root-pom.xml
===================================================================
--- trunk/mavenize/root-pom.xml 2010-07-08 10:21:05 UTC (rev 5673)
+++ trunk/mavenize/root-pom.xml 2010-07-10 19:38:45 UTC (rev 5674)
@@ -99,23 +99,20 @@
<id>installer</id>
<build>
<plugins>
- <plugin>
- <groupId>com.keyboardsamurais.maven</groupId>
- <artifactId>maven-timestamp-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <propertyName>release.timestamp</propertyName>
- <timestampPattern>yyyyMMdd_kkmm</timestampPattern>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrelsql-version-plugin</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>set-version</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
<modules>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-07-08 10:21:11
|
Revision: 5673
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5673&view=rev
Author: manningr
Date: 2010-07-08 10:21:05 +0000 (Thu, 08 Jul 2010)
Log Message:
-----------
Fixed compile errors.
Modified Paths:
--------------
trunk/mavenize/squirrelsql-version-plugin/pom.xml
trunk/mavenize/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
Modified: trunk/mavenize/squirrelsql-version-plugin/pom.xml
===================================================================
--- trunk/mavenize/squirrelsql-version-plugin/pom.xml 2010-07-08 10:10:39 UTC (rev 5672)
+++ trunk/mavenize/squirrelsql-version-plugin/pom.xml 2010-07-08 10:21:05 UTC (rev 5673)
@@ -1,20 +1,19 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>net.sf.squirrel-sql</groupId>
- <artifactId>squirrel-root-pom</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>net.sf.squirrel-sql</groupId>
- <artifactId>squirrelsql-version-plugin</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <packaging>maven-plugin</packaging>
-
- <name>SQuirreLSQL Version Maven Mojo</name>
- <description>
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrel-root-pom</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </parent>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrelsql-version-plugin</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <packaging>maven-plugin</packaging>
+ <name>SQuirreLSQL Version Maven Mojo</name>
+ <description>
This project produces a maven mojo that can set the System property "squirrelsql.version" so that
it can be used globally by the installers and the update-site projects. It accepts the project
version as an argument which it uses to decide what the squirrelsql.version should be. If the
@@ -23,70 +22,77 @@
however, the project version does not end with "-SNAPSHOT", then squirrelsql.version will be set to
the value of the project version.
</description>
-
- <inceptionYear>2001</inceptionYear>
- <developers>
- <developer>
- <name>Gerd Wagner</name>
- <roles>
- <role>Administrator</role>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Rob Manning</name>
- <roles>
- <role>Developer</role>
- <role>Release Manager</role>
- </roles>
- </developer>
- </developers>
- <licenses>
- <license>
- <name>GNU Lesser</name>
- <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <url>http://www.squirrelsql.org/</url>
- <scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection>
- <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url>
- </scm>
- <issueManagement>
- <system>SourceForge Tracker</system>
- <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url>
- </issueManagement>
- <ciManagement>
- <system>Hudson</system>
- <url>https://www.squirrel-sql.org/hudson/</url>
- </ciManagement>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>squirrel-sql</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>${maven-plugin-api-version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://maven.apache.org/plugins/maven-compiler-plugin/ -->
- <source>${javac-source-version}</source>
- <target>${javac-target-version}</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <inceptionYear>2001</inceptionYear>
+ <developers>
+ <developer>
+ <name>Gerd Wagner</name>
+ <roles>
+ <role>Administrator</role>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Rob Manning</name>
+ <roles>
+ <role>Developer</role>
+ <role>Release Manager</role>
+ </roles>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>GNU Lesser</name>
+ <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <url>http://www.squirrelsql.org/</url>
+ <scm>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection>
+ <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url>
+ </scm>
+ <issueManagement>
+ <system>SourceForge Tracker</system>
+ <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Hudson</system>
+ <url>https://www.squirrel-sql.org/hudson/</url>
+ </ciManagement>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>squirrel-sql</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${maven-plugin-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>2.0.2</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- http://maven.apache.org/plugins/maven-compiler-plugin/ -->
+ <source>${javac-source-version}</source>
+ <target>${javac-target-version}</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Modified: trunk/mavenize/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
===================================================================
--- trunk/mavenize/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-07-08 10:10:39 UTC (rev 5672)
+++ trunk/mavenize/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-07-08 10:21:05 UTC (rev 5673)
@@ -21,9 +21,11 @@
import java.io.File;
import java.io.IOException;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashSet;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
import java.util.Map.Entry;
@@ -40,6 +42,7 @@
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
/**
* Goal which sets the System property "squirrelsql.version" based on the value of project version. Sets the
@@ -62,6 +65,15 @@
public static String VERSION_PROPERTY_KEY = "squirrelsql.version";
+ /**
+ * The maven project.
+ *
+ * @parameter expression="${project}"
+ * @required
+ * @readonly
+ */
+ private MavenProject project;
+
/**
* The version for the release.
*
@@ -86,10 +98,11 @@
if (projectVersion == null) { throw new MojoExecutionException("projectVersion cannot be null."); }
String squirrelsqlVersion = projectVersion;
+ String timestampPattern = "yyyyMMdd_kkmm";
if (!projectVersion.toLowerCase().endsWith("-snapshot"))
{
- SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_kkmm");
+ SimpleDateFormat sdf = new SimpleDateFormat(timestampPattern);
try
{
String date = sdf.format(new Date());
@@ -97,6 +110,7 @@
}
catch (IllegalStateException e)
{
+
log.error("Could not convert date format pattern " + timestampPattern);
throw e;
}
@@ -104,7 +118,7 @@
Properties props = project.getProperties();
props.put(VERSION_PROPERTY_KEY, squirrelsqlVersion);
- System.setProperty(VERSION_PROPERTY_KEY, squirrelsqlVersion)
+ System.setProperty(VERSION_PROPERTY_KEY, squirrelsqlVersion);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-07-08 10:10:45
|
Revision: 5672
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5672&view=rev
Author: manningr
Date: 2010-07-08 10:10:39 +0000 (Thu, 08 Jul 2010)
Log Message:
-----------
Fixed junit-version property format.
Modified Paths:
--------------
trunk/mavenize/squirrelsql-test-utils/pom.xml
Modified: trunk/mavenize/squirrelsql-test-utils/pom.xml
===================================================================
--- trunk/mavenize/squirrelsql-test-utils/pom.xml 2010-07-08 01:30:23 UTC (rev 5671)
+++ trunk/mavenize/squirrelsql-test-utils/pom.xml 2010-07-08 10:10:39 UTC (rev 5672)
@@ -69,7 +69,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <version>${junit-version}</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-07-08 01:30:33
|
Revision: 5671
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5671&view=rev
Author: manningr
Date: 2010-07-08 01:30:23 +0000 (Thu, 08 Jul 2010)
Log Message:
-----------
Add version plugin project to migration
Modified Paths:
--------------
trunk/mavenize/mavenize.pl
Modified: trunk/mavenize/mavenize.pl
===================================================================
--- trunk/mavenize/mavenize.pl 2010-07-07 22:17:06 UTC (rev 5670)
+++ trunk/mavenize/mavenize.pl 2010-07-08 01:30:23 UTC (rev 5671)
@@ -186,6 +186,8 @@
removeRemainingUnnecessaryFiles();
+copyVersionPluginProject();
+
# End of script; Begin Subroutines
sub wanted_for_create_plugin_poms {
@@ -800,6 +802,8 @@
`svn add $topDir/squirrelsql-version-plugin/pom.xml`;
`svn add $topDir/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java`;
+
+ setSvnIgnore("$topDir/squirrelsql-version-plugin");
}
sub restructureDocModule {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 5670
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5670&view=rev
Author: manningr
Date: 2010-07-07 22:17:06 +0000 (Wed, 07 Jul 2010)
Log Message:
-----------
removed accidentally added mojo.
Removed Paths:
-------------
trunk/mavenize/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
Deleted: trunk/mavenize/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
===================================================================
--- trunk/mavenize/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-07-07 22:16:39 UTC (rev 5669)
+++ trunk/mavenize/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-07-07 22:17:06 UTC (rev 5670)
@@ -1,111 +0,0 @@
-package net.sf.squirrel_sql;
-
-/*
- * Copyright (C) 2010 Rob Manning
- * man...@us...
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import net.sourceforge.squirrel_sql.client.update.UpdateUtil;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.ArtifactXmlBean;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.ChannelXmlBean;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.ModuleXmlBean;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.ReleaseXmlBean;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.UpdateXmlSerializer;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.UpdateXmlSerializerImpl;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.XmlBeanUtilities;
-import net.sourceforge.squirrel_sql.fw.util.IOUtilities;
-import net.sourceforge.squirrel_sql.fw.util.IOUtilitiesImpl;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-
-/**
- * Goal which sets the System property "squirrelsql.version" based on the value of project version. Sets the
- * System property "squirrelsql.version" so that it can be used globally by the installers and the
- * update-site projects. It accepts the project version as an argument which it uses to decide what the
- * squirrelsql.version should be. If the project version ends with "-SNAPSHOT", then the squirrelsql.version
- * will be set to Snapshot-{timestamp} where {timestamp} is the current timestamp in the 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. This mojo should only be executed once during the
- * build since it manipulates globally-accessible properties. This is particularly important in the case
- * of snapshot project versions.
- *
- * @goal set-version
- * @phase initialize
- */
-public class SquirrelSqlVersionMojo extends AbstractMojo
-{
-
- private org.apache.maven.plugin.logging.Log log = getLog();
-
- public static String VERSION_PROPERTY_KEY = "squirrelsql.version";
-
- /**
- * The version for the release.
- *
- * @parameter expression="${projectVersion}"
- * @required
- */
- private String projectVersion;
-
- public void setprojectVersion(String projectVersion)
- {
- this.projectVersion = projectVersion;
- }
-
- /**
- * Does the main work provided by this plugin.
- *
- * @throws MojoExecutionException
- * if the projectVersion isn't specified.
- */
- public void execute() throws MojoExecutionException
- {
- if (projectVersion == null) { throw new MojoExecutionException("projectVersion cannot be null."); }
-
- String squirrelsqlVersion = projectVersion;
-
- if (!projectVersion.toLowerCase().endsWith("-snapshot"))
- {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_kkmm");
- try
- {
- String date = sdf.format(new Date());
- squirrelsqlVersion = "Snapshot-" + date;
- }
- catch (IllegalStateException e)
- {
- log.error("Could not convert date format pattern " + timestampPattern);
- throw e;
- }
- }
-
- Properties props = project.getProperties();
- props.put(VERSION_PROPERTY_KEY, squirrelsqlVersion);
- System.setProperty(VERSION_PROPERTY_KEY, squirrelsqlVersion)
-
- }
-
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 5669
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5669&view=rev
Author: manningr
Date: 2010-07-07 22:16:39 +0000 (Wed, 07 Jul 2010)
Log Message:
-----------
re-added accidentally deleted mojo.
Added Paths:
-----------
trunk/mavenize/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/BuildUpdateSiteMojo.java
Added: trunk/mavenize/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/BuildUpdateSiteMojo.java
===================================================================
--- trunk/mavenize/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/BuildUpdateSiteMojo.java (rev 0)
+++ trunk/mavenize/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/BuildUpdateSiteMojo.java 2010-07-07 22:16:39 UTC (rev 5669)
@@ -0,0 +1,224 @@
+package net.sf.squirrel_sql;
+
+/*
+ * Copyright (C) 2009 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+
+import net.sourceforge.squirrel_sql.client.update.UpdateUtil;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.ArtifactXmlBean;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.ChannelXmlBean;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.ModuleXmlBean;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.ReleaseXmlBean;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.UpdateXmlSerializer;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.UpdateXmlSerializerImpl;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.XmlBeanUtilities;
+import net.sourceforge.squirrel_sql.fw.util.IOUtilities;
+import net.sourceforge.squirrel_sql.fw.util.IOUtilitiesImpl;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+
+/**
+ * Goal which builds the update site from a directory which is specified as an argument.
+ *
+ * @goal build-update-site
+ * @phase package
+ */
+public class BuildUpdateSiteMojo extends AbstractMojo
+{
+
+ private org.apache.maven.plugin.logging.Log log = getLog();
+
+ private IOUtilities _iou = new IOUtilitiesImpl();
+
+ /**
+ * Transitive dependencies that are not used directly by SQuirreL are excluded so that the update site
+ * doesn't become a poor man's maven repository. We only want artifacts that are used directly by SQuirreL
+ * or plugin code - no artifacts that are needed solely for build purposes should be included. Also, we
+ * exclude look and feel jars, since these need to be in a special directory beneath the LAF plugin
+ * directory. Lastly, we also exclude the translation jars artifact, since this is already unpacked by
+ * maven into the i18n directory, so they don't need to appear in core. Note: any files found in the
+ * release directory that match any pattern in this list will not be included and will also be deleted.
+ */
+ private static final String[] excludedPatterns =
+ new String[] { "maven", "plexus", "ant.jar", "ant-", "aopalliance", "axis", "classworlds",
+ "commons-beanutils", "commons-digester", "commons-lang", "commons-validator", "doxia", "ehcache",
+ "file-management", "tests", "hibernate-validator", "ilf-gpl", "javassist", "jboss", "jsch",
+ "jtidy", "junit", "kunststoff", "looks", "metouia", "napkinlaf", "nimrodlf", "oalnf", "oro.jar",
+ "persistence.jar", "skinlf", "squirrelsql-translations", "substance", "swingsetthemes",
+ "tinylaf", "toniclf", "velocity", "wagon", "xml-apis" };
+
+ /**
+ * Location of the directory which contains the release artifacts
+ *
+ * @parameter expression="${releaseDirectory}"
+ * @required
+ */
+ private String releaseDirectory;
+
+ public void setReleaseDirectory(String releaseDirectory)
+ {
+ this.releaseDirectory = releaseDirectory;
+ }
+
+ /**
+ * The version for the release.
+ *
+ * @parameter expression="${releaseVersion}"
+ * @required
+ */
+ private String releaseVersion;
+
+ public void setReleaseVersion(String releaseVersion)
+ {
+ this.releaseVersion = releaseVersion;
+ }
+
+ /**
+ * Does the main work provided by this plugin.
+ *
+ * @throws MojoExecutionException
+ * if the releaseDirectory isn't specified, doesn't exist or cannot be read.
+ */
+ public void execute() throws MojoExecutionException
+ {
+ String channelName = "snapshot";
+ String releaseName = "snapshot";
+
+ if (!releaseVersion.toLowerCase().startsWith("snapshot"))
+ {
+ channelName = "stable";
+ releaseName = "stable";
+ }
+
+ if (releaseDirectory == null) { throw new MojoExecutionException("releaseDirectory cannot be null."); }
+ File releaseDir = new File(releaseDirectory);
+ if (!releaseDir.exists()) { throw new MojoExecutionException("the specified releaseDirectory ("
+ + releaseDirectory + ") doesn't appear to exist."); }
+ if (!releaseDir.canRead()) { throw new MojoExecutionException(
+ "Cannot read the specified releaseDirectory: " + releaseDirectory); }
+
+ File f = new File(releaseDirectory, UpdateUtil.RELEASE_XML_FILENAME);
+
+ try
+ {
+ ChannelXmlBean channelBean =
+ buildChannelRelease(channelName, releaseName, releaseVersion, releaseDir.getAbsolutePath());
+ UpdateXmlSerializer serializer = new UpdateXmlSerializerImpl();
+ if (log.isInfoEnabled())
+ {
+ log.info("Writing channel release bean to " + f);
+ }
+ serializer.write(channelBean, f.getAbsolutePath());
+ }
+ catch (IOException e)
+ {
+ throw new MojoExecutionException("Failed to create update site", e);
+ }
+ }
+
+ /**
+ * This will create a ChannelXmlBean that describes a release as it is found in the specified directory,
+ * using the specified releaseName and version. This will excluded files that match any patterns in the
+ * excludePatterns array. Files that are excluded are also deleted from the release directory as they will
+ * not be shipped with the update site, and are therefore not required.
+ *
+ * @param channelName
+ * the name of the channel.
+ * @param releaseName
+ * the name of the release.
+ * @param version
+ * the version of the release.
+ * @param directory
+ * the directory to use as the top-level of the release.
+ * @return a ChannelXmlBean that represents the specified parameters and files found in the release
+ * directory that don't match any exclude pattern.
+ */
+ private ChannelXmlBean buildChannelRelease(String channelName,
+ String releaseName, String version, String directory)
+ throws IOException {
+ ChannelXmlBean result = new ChannelXmlBean();
+ result.setName(channelName);
+ ReleaseXmlBean releaseBean = new ReleaseXmlBean(releaseName, version);
+ releaseBean.setCreateTime(new Date());
+ File dir = new File(directory);
+ for (File f : dir.listFiles()) {
+ if (log.isInfoEnabled()) {
+ log.info("Processing module directory: " + f);
+ }
+ if (f.isDirectory()) {
+ // f is a module
+ ModuleXmlBean module = new ModuleXmlBean();
+ module.setName(f.getName());
+ for (File a : f.listFiles()) {
+ String filename = a.getName();
+ if (isExcluded(filename)) {
+ a.delete();
+ continue;
+ }
+ if (log.isDebugEnabled()) {
+ log.debug("Processing artifact file: " + filename);
+ }
+ String type = filename.substring(filename.indexOf(".") + 1);
+ ArtifactXmlBean artifact = new ArtifactXmlBean();
+ artifact.setName(a.getName());
+ artifact.setType(type);
+ artifact.setVersion(version);
+ artifact.setSize(a.length());
+ artifact.setChecksum(_iou.getCheckSum(a));
+ module.addArtifact(artifact);
+ }
+ releaseBean.addmodule(module);
+ }
+ }
+ result.setCurrentRelease(releaseBean);
+ return result;
+ }
+
+ /**
+ * Searches for the specified filename in the excludedPatterns array and compares to see if any pattern
+ * matches.
+ *
+ * @param filename
+ * the name of the artifact to look for.
+ * @return true if the filename matches any exclude pattern; false otherwise.
+ */
+ private boolean isExcluded(String filename) {
+ boolean result = false;
+ for (String pattern : excludedPatterns) {
+ if (filename.matches(".*" + pattern + ".*")) {
+ if (log.isDebugEnabled()) {
+ log.debug("Excluding filename (" + filename
+ + " because it matched an exclude pattern: "
+ + pattern);
+ }
+ result = true;
+ break;
+ }
+ }
+ return result;
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-07-07 22:14:56
|
Revision: 5668
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5668&view=rev
Author: manningr
Date: 2010-07-07 22:14:50 +0000 (Wed, 07 Jul 2010)
Log Message:
-----------
new maven mojo for calculating the version.
Added Paths:
-----------
trunk/mavenize/squirrelsql-version-plugin/src/
trunk/mavenize/squirrelsql-version-plugin/src/main/
trunk/mavenize/squirrelsql-version-plugin/src/main/java/
trunk/mavenize/squirrelsql-version-plugin/src/main/java/net/
trunk/mavenize/squirrelsql-version-plugin/src/main/java/net/sf/
trunk/mavenize/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/
trunk/mavenize/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
Added: trunk/mavenize/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
===================================================================
--- trunk/mavenize/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java (rev 0)
+++ trunk/mavenize/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-07-07 22:14:50 UTC (rev 5668)
@@ -0,0 +1,111 @@
+package net.sf.squirrel_sql;
+
+/*
+ * Copyright (C) 2010 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+
+import net.sourceforge.squirrel_sql.client.update.UpdateUtil;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.ArtifactXmlBean;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.ChannelXmlBean;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.ModuleXmlBean;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.ReleaseXmlBean;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.UpdateXmlSerializer;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.UpdateXmlSerializerImpl;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.XmlBeanUtilities;
+import net.sourceforge.squirrel_sql.fw.util.IOUtilities;
+import net.sourceforge.squirrel_sql.fw.util.IOUtilitiesImpl;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+
+/**
+ * Goal which sets the System property "squirrelsql.version" based on the value of project version. Sets the
+ * System property "squirrelsql.version" so that it can be used globally by the installers and the
+ * update-site projects. It accepts the project version as an argument which it uses to decide what the
+ * squirrelsql.version should be. If the project version ends with "-SNAPSHOT", then the squirrelsql.version
+ * will be set to Snapshot-{timestamp} where {timestamp} is the current timestamp in the 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. This mojo should only be executed once during the
+ * build since it manipulates globally-accessible properties. This is particularly important in the case
+ * of snapshot project versions.
+ *
+ * @goal set-version
+ * @phase initialize
+ */
+public class SquirrelSqlVersionMojo extends AbstractMojo
+{
+
+ private org.apache.maven.plugin.logging.Log log = getLog();
+
+ public static String VERSION_PROPERTY_KEY = "squirrelsql.version";
+
+ /**
+ * The version for the release.
+ *
+ * @parameter expression="${projectVersion}"
+ * @required
+ */
+ private String projectVersion;
+
+ public void setprojectVersion(String projectVersion)
+ {
+ this.projectVersion = projectVersion;
+ }
+
+ /**
+ * Does the main work provided by this plugin.
+ *
+ * @throws MojoExecutionException
+ * if the projectVersion isn't specified.
+ */
+ public void execute() throws MojoExecutionException
+ {
+ if (projectVersion == null) { throw new MojoExecutionException("projectVersion cannot be null."); }
+
+ String squirrelsqlVersion = projectVersion;
+
+ if (!projectVersion.toLowerCase().endsWith("-snapshot"))
+ {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_kkmm");
+ try
+ {
+ String date = sdf.format(new Date());
+ squirrelsqlVersion = "Snapshot-" + date;
+ }
+ catch (IllegalStateException e)
+ {
+ log.error("Could not convert date format pattern " + timestampPattern);
+ throw e;
+ }
+ }
+
+ Properties props = project.getProperties();
+ props.put(VERSION_PROPERTY_KEY, squirrelsqlVersion);
+ System.setProperty(VERSION_PROPERTY_KEY, squirrelsqlVersion)
+
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-07-07 22:12:57
|
Revision: 5667
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5667&view=rev
Author: manningr
Date: 2010-07-07 22:12:50 +0000 (Wed, 07 Jul 2010)
Log Message:
-----------
Changes to support new maven version plugin.
Modified Paths:
--------------
trunk/mavenize/app-pom.xml
trunk/mavenize/fw-pom.xml
trunk/mavenize/mavenize.pl
trunk/mavenize/plugin-pom.xml
trunk/mavenize/root-pom.xml
trunk/mavenize/squirrelsql-test-utils/pom.xml
Added Paths:
-----------
trunk/mavenize/squirrelsql-version-plugin/
trunk/mavenize/squirrelsql-version-plugin/pom.xml
trunk/mavenize/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
Removed Paths:
-------------
trunk/mavenize/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/BuildUpdateSiteMojo.java
Modified: trunk/mavenize/app-pom.xml
===================================================================
--- trunk/mavenize/app-pom.xml 2010-07-05 18:35:26 UTC (rev 5666)
+++ trunk/mavenize/app-pom.xml 2010-07-07 22:12:50 UTC (rev 5667)
@@ -105,6 +105,8 @@
<version>${surefire-plugin-version}</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <parallel>${surefire-parallel-type}</parallel>
+ <threadCount>${surefire-thread-count}</threadCount>
</configuration>
</plugin>
<plugin>
Modified: trunk/mavenize/fw-pom.xml
===================================================================
--- trunk/mavenize/fw-pom.xml 2010-07-05 18:35:26 UTC (rev 5666)
+++ trunk/mavenize/fw-pom.xml 2010-07-07 22:12:50 UTC (rev 5667)
@@ -224,6 +224,8 @@
<excludes>
<exclude>**/*ExternalTest.java</exclude>
</excludes>
+ <parallel>${surefire-parallel-type}</parallel>
+ <threadCount>${surefire-thread-count}</threadCount>
</configuration>
</plugin>
<plugin>
Modified: trunk/mavenize/mavenize.pl
===================================================================
--- trunk/mavenize/mavenize.pl 2010-07-05 18:35:26 UTC (rev 5666)
+++ trunk/mavenize/mavenize.pl 2010-07-07 22:12:50 UTC (rev 5667)
@@ -787,6 +787,21 @@
chdirOrDie($mavenizeDir);
}
+sub copyVersionPluginProject {
+ chdir($mavenizeDir) or die "Couldn't change directory to $mavenizeDir: $!\n";
+
+ print "Copying in version plugin project\n";
+
+ `svn mkdir --parents $topDir/squirrelsql-version-plugin`;
+ `svn mkdir --parents $topDir/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql`;
+
+ `cp $mavenizeDir/squirrelsql-version-plugin/pom.xml $topDir/squirrelsql-version-plugin`;
+ `cp $mavenizeDir/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java $topDir/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql`;
+
+ `svn add $topDir/squirrelsql-version-plugin/pom.xml`;
+ `svn add $topDir/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java`;
+}
+
sub restructureDocModule {
print "Restructuring doc module\n";
Modified: trunk/mavenize/plugin-pom.xml
===================================================================
--- trunk/mavenize/plugin-pom.xml 2010-07-05 18:35:26 UTC (rev 5666)
+++ trunk/mavenize/plugin-pom.xml 2010-07-07 22:12:50 UTC (rev 5667)
@@ -1,152 +1,135 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>@@--$artifactId--@@</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>@@--$pluginName--@@</name>
- <description>@@--$pluginDescription--@@</description>
- <inceptionYear>2001</inceptionYear>
- <developers>
- <developer>
- <name>Gerd Wagner</name>
- <roles>
- <role>Administrator</role>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Rob Manning</name>
- <roles>
- <role>Developer</role>
- <role>Release Manager</role>
- </roles>
- </developer>
- </developers>
- <licenses>
- <license>
- <name>GNU Lesser General Public License</name>
- <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <url>http://www.squirrelsql.org/</url>
- <scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection>
- <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url>
- </scm>
- <issueManagement>
- <system>SourceForge Tracker</system>
- <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url>
- </issueManagement>
- <ciManagement>
- <system>Hudson</system>
- <url>https://www.squirrel-sql.org/hudson/</url>
- </ciManagement>
-
- <dependencies>
- <dependency>
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>squirrelsql-plugins-parent-pom</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </parent>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>@@--$artifactId--@@</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>@@--$pluginName--@@</name>
+ <description>@@--$pluginDescription--@@</description>
+ <inceptionYear>2001</inceptionYear>
+ <developers>
+ <developer>
+ <name>Gerd Wagner</name>
+ <roles>
+ <role>Administrator</role>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Rob Manning</name>
+ <roles>
+ <role>Developer</role>
+ <role>Release Manager</role>
+ </roles>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <url>http://www.squirrelsql.org/</url>
+ <scm>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection>
+ <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url>
+ </scm>
+ <issueManagement>
+ <system>SourceForge Tracker</system>
+ <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Hudson</system>
+ <url>https://www.squirrel-sql.org/hudson/</url>
+ </ciManagement>
+ <dependencies>
+ <dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>fw</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>gsbase</groupId>
- <artifactId>gsbase</artifactId>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrelsql-test-utils</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <type>pom</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <scope>test</scope>
- </dependency>
-
@@--$dependencies--@@
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>${source-plugin-version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire-plugin-version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${jar-plugin-version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${assembly-plugin-version}</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs-plugin-version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>${pmd-plugin-version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle-plugin-version}</version>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <!--
- Since generating javadoc can be time-consuming, this is not done unless a "javadoc" profile
- is activated.
- -->
- <profile>
- <id>javadoc</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc-plugin-version}</version>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-
-</project>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${source-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire-plugin-version}</version>
+ <configuration>
+ <parallel>${surefire-parallel-type}</parallel>
+ <threadCount>${surefire-thread-count}</threadCount>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${jar-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${assembly-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>${findbugs-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>${pmd-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle-plugin-version}</version>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <!--
+ Since generating javadoc can be time-consuming, this is not done unless a "javadoc" profile is activated.
+ -->
+ <profile>
+ <id>javadoc</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc-plugin-version}</version>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
Modified: trunk/mavenize/root-pom.xml
===================================================================
--- trunk/mavenize/root-pom.xml 2010-07-05 18:35:26 UTC (rev 5666)
+++ trunk/mavenize/root-pom.xml 2010-07-07 22:12:50 UTC (rev 5667)
@@ -53,7 +53,7 @@
</ciManagement>
<properties>
- <!-- Maven plugin version -->
+ <!-- Maven plugin versions -->
<assembly-plugin-version>2.2-beta-2</assembly-plugin-version>
<checkstyle-plugin-version>2.2</checkstyle-plugin-version>
<compiler-plugin-version>2.0.2</compiler-plugin-version>
@@ -67,10 +67,19 @@
<maven-plugin-api-version>2.0</maven-plugin-api-version>
<pmd-plugin-version>2.4</pmd-plugin-version>
<source-plugin-version>2.1</source-plugin-version>
- <surefire-plugin-version>2.4</surefire-plugin-version>
+ <surefire-plugin-version>2.5</surefire-plugin-version>
+
<!-- Thirdparty Library Versions -->
+ <easymock-version>2.4</easymock-version>
+ <easymockclassextension-version>2.4</easymockclassextension-version>
+ <gsbase-version>2.0.1</gsbase-version>
<hibernate-annotations-version>3.3.0.ga</hibernate-annotations-version>
+ <junit-version>4.7</junit-version>
<spring-framework-version>2.5.2</spring-framework-version>
+
+ <!-- Other -->
+ <surefire-parallel-type>classes</surefire-parallel-type>
+ <surefire-thread-count>4</surefire-thread-count>
</properties>
<modules>
@@ -115,6 +124,7 @@
<module>app</module>
<module>plugins</module>
<module>squirrelsql-translations</module>
+ <module>squirrelsql-version-plugin</module>
<module>doc</module>
<module>web-site</module>
<module>installer</module>
Modified: trunk/mavenize/squirrelsql-test-utils/pom.xml
===================================================================
--- trunk/mavenize/squirrelsql-test-utils/pom.xml 2010-07-05 18:35:26 UTC (rev 5666)
+++ trunk/mavenize/squirrelsql-test-utils/pom.xml 2010-07-07 22:12:50 UTC (rev 5667)
@@ -64,22 +64,22 @@
<dependency>
<groupId>gsbase</groupId>
<artifactId>gsbase</artifactId>
- <version>2.0.1</version>
+ <version>${gsbase-version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.6</version>
+ <version>${junit.version}</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
+ <version>${easymock-version}</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.4</version>
+ <version>${easymockclassextension-version}</version>
</dependency>
</dependencies>
Added: trunk/mavenize/squirrelsql-version-plugin/pom.xml
===================================================================
--- trunk/mavenize/squirrelsql-version-plugin/pom.xml (rev 0)
+++ trunk/mavenize/squirrelsql-version-plugin/pom.xml 2010-07-07 22:12:50 UTC (rev 5667)
@@ -0,0 +1,92 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrel-root-pom</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrelsql-version-plugin</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <packaging>maven-plugin</packaging>
+
+ <name>SQuirreLSQL Version Maven Mojo</name>
+ <description>
+ This project produces a maven mojo that can set the System property "squirrelsql.version" so that
+ it can be used globally by the installers and the update-site projects. It accepts the project
+ version as an argument which it uses to decide what the squirrelsql.version should be. If the
+ project version ends with "-SNAPSHOT", then the squirrelsql.version will be set to
+ Snapshot-{timestamp} where {timestamp} is the current timestamp in the 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.
+ </description>
+
+ <inceptionYear>2001</inceptionYear>
+ <developers>
+ <developer>
+ <name>Gerd Wagner</name>
+ <roles>
+ <role>Administrator</role>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Rob Manning</name>
+ <roles>
+ <role>Developer</role>
+ <role>Release Manager</role>
+ </roles>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>GNU Lesser</name>
+ <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <url>http://www.squirrelsql.org/</url>
+ <scm>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/</connection>
+ <developerConnection>scm:svn:http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/</url>
+ </scm>
+ <issueManagement>
+ <system>SourceForge Tracker</system>
+ <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Hudson</system>
+ <url>https://www.squirrel-sql.org/hudson/</url>
+ </ciManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>squirrel-sql</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${maven-plugin-api-version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- http://maven.apache.org/plugins/maven-compiler-plugin/ -->
+ <source>${javac-source-version}</source>
+ <target>${javac-target-version}</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Deleted: trunk/mavenize/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/BuildUpdateSiteMojo.java
===================================================================
--- trunk/mavenize/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/BuildUpdateSiteMojo.java 2010-07-05 18:35:26 UTC (rev 5666)
+++ trunk/mavenize/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/BuildUpdateSiteMojo.java 2010-07-07 22:12:50 UTC (rev 5667)
@@ -1,224 +0,0 @@
-package net.sf.squirrel_sql;
-
-/*
- * Copyright (C) 2009 Rob Manning
- * man...@us...
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import net.sourceforge.squirrel_sql.client.update.UpdateUtil;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.ArtifactXmlBean;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.ChannelXmlBean;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.ModuleXmlBean;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.ReleaseXmlBean;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.UpdateXmlSerializer;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.UpdateXmlSerializerImpl;
-import net.sourceforge.squirrel_sql.client.update.xmlbeans.XmlBeanUtilities;
-import net.sourceforge.squirrel_sql.fw.util.IOUtilities;
-import net.sourceforge.squirrel_sql.fw.util.IOUtilitiesImpl;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-
-/**
- * Goal which builds the update site from a directory which is specified as an argument.
- *
- * @goal build-update-site
- * @phase package
- */
-public class BuildUpdateSiteMojo extends AbstractMojo
-{
-
- private org.apache.maven.plugin.logging.Log log = getLog();
-
- private IOUtilities _iou = new IOUtilitiesImpl();
-
- /**
- * Transitive dependencies that are not used directly by SQuirreL are excluded so that the update site
- * doesn't become a poor man's maven repository. We only want artifacts that are used directly by SQuirreL
- * or plugin code - no artifacts that are needed solely for build purposes should be included. Also, we
- * exclude look and feel jars, since these need to be in a special directory beneath the LAF plugin
- * directory. Lastly, we also exclude the translation jars artifact, since this is already unpacked by
- * maven into the i18n directory, so they don't need to appear in core. Note: any files found in the
- * release directory that match any pattern in this list will not be included and will also be deleted.
- */
- private static final String[] excludedPatterns =
- new String[] { "maven", "plexus", "ant.jar", "ant-", "aopalliance", "axis", "classworlds",
- "commons-beanutils", "commons-digester", "commons-lang", "commons-validator", "doxia", "ehcache",
- "file-management", "tests", "hibernate-validator", "ilf-gpl", "javassist", "jboss", "jsch",
- "jtidy", "junit", "kunststoff", "looks", "metouia", "napkinlaf", "nimrodlf", "oalnf", "oro.jar",
- "persistence.jar", "skinlf", "squirrelsql-translations", "substance", "swingsetthemes",
- "tinylaf", "toniclf", "velocity", "wagon", "xml-apis" };
-
- /**
- * Location of the directory which contains the release artifacts
- *
- * @parameter expression="${releaseDirectory}"
- * @required
- */
- private String releaseDirectory;
-
- public void setReleaseDirectory(String releaseDirectory)
- {
- this.releaseDirectory = releaseDirectory;
- }
-
- /**
- * The version for the release.
- *
- * @parameter expression="${releaseVersion}"
- * @required
- */
- private String releaseVersion;
-
- public void setReleaseVersion(String releaseVersion)
- {
- this.releaseVersion = releaseVersion;
- }
-
- /**
- * Does the main work provided by this plugin.
- *
- * @throws MojoExecutionException
- * if the releaseDirectory isn't specified, doesn't exist or cannot be read.
- */
- public void execute() throws MojoExecutionException
- {
- String channelName = "snapshot";
- String releaseName = "snapshot";
-
- if (!releaseVersion.toLowerCase().startsWith("snapshot"))
- {
- channelName = "stable";
- releaseName = "stable";
- }
-
- if (releaseDirectory == null) { throw new MojoExecutionException("releaseDirectory cannot be null."); }
- File releaseDir = new File(releaseDirectory);
- if (!releaseDir.exists()) { throw new MojoExecutionException("the specified releaseDirectory ("
- + releaseDirectory + ") doesn't appear to exist."); }
- if (!releaseDir.canRead()) { throw new MojoExecutionException(
- "Cannot read the specified releaseDirectory: " + releaseDirectory); }
-
- File f = new File(releaseDirectory, UpdateUtil.RELEASE_XML_FILENAME);
-
- try
- {
- ChannelXmlBean channelBean =
- buildChannelRelease(channelName, releaseName, releaseVersion, releaseDir.getAbsolutePath());
- UpdateXmlSerializer serializer = new UpdateXmlSerializerImpl();
- if (log.isInfoEnabled())
- {
- log.info("Writing channel release bean to " + f);
- }
- serializer.write(channelBean, f.getAbsolutePath());
- }
- catch (IOException e)
- {
- throw new MojoExecutionException("Failed to create update site", e);
- }
- }
-
- /**
- * This will create a ChannelXmlBean that describes a release as it is found in the specified directory,
- * using the specified releaseName and version. This will excluded files that match any patterns in the
- * excludePatterns array. Files that are excluded are also deleted from the release directory as they will
- * not be shipped with the update site, and are therefore not required.
- *
- * @param channelName
- * the name of the channel.
- * @param releaseName
- * the name of the release.
- * @param version
- * the version of the release.
- * @param directory
- * the directory to use as the top-level of the release.
- * @return a ChannelXmlBean that represents the specified parameters and files found in the release
- * directory that don't match any exclude pattern.
- */
- private ChannelXmlBean buildChannelRelease(String channelName,
- String releaseName, String version, String directory)
- throws IOException {
- ChannelXmlBean result = new ChannelXmlBean();
- result.setName(channelName);
- ReleaseXmlBean releaseBean = new ReleaseXmlBean(releaseName, version);
- releaseBean.setCreateTime(new Date());
- File dir = new File(directory);
- for (File f : dir.listFiles()) {
- if (log.isInfoEnabled()) {
- log.info("Processing module directory: " + f);
- }
- if (f.isDirectory()) {
- // f is a module
- ModuleXmlBean module = new ModuleXmlBean();
- module.setName(f.getName());
- for (File a : f.listFiles()) {
- String filename = a.getName();
- if (isExcluded(filename)) {
- a.delete();
- continue;
- }
- if (log.isDebugEnabled()) {
- log.debug("Processing artifact file: " + filename);
- }
- String type = filename.substring(filename.indexOf(".") + 1);
- ArtifactXmlBean artifact = new ArtifactXmlBean();
- artifact.setName(a.getName());
- artifact.setType(type);
- artifact.setVersion(version);
- artifact.setSize(a.length());
- artifact.setChecksum(_iou.getCheckSum(a));
- module.addArtifact(artifact);
- }
- releaseBean.addmodule(module);
- }
- }
- result.setCurrentRelease(releaseBean);
- return result;
- }
-
- /**
- * Searches for the specified filename in the excludedPatterns array and compares to see if any pattern
- * matches.
- *
- * @param filename
- * the name of the artifact to look for.
- * @return true if the filename matches any exclude pattern; false otherwise.
- */
- private boolean isExcluded(String filename) {
- boolean result = false;
- for (String pattern : excludedPatterns) {
- if (filename.matches(".*" + pattern + ".*")) {
- if (log.isDebugEnabled()) {
- log.debug("Excluding filename (" + filename
- + " because it matched an exclude pattern: "
- + pattern);
- }
- result = true;
- break;
- }
- }
- return result;
- }
-}
Copied: trunk/mavenize/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java (from rev 5647, trunk/mavenize/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/BuildUpdateSiteMojo.java)
===================================================================
--- trunk/mavenize/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java (rev 0)
+++ trunk/mavenize/update-site/squirrelsql-update-site-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-07-07 22:12:50 UTC (rev 5667)
@@ -0,0 +1,111 @@
+package net.sf.squirrel_sql;
+
+/*
+ * Copyright (C) 2010 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+
+import net.sourceforge.squirrel_sql.client.update.UpdateUtil;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.ArtifactXmlBean;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.ChannelXmlBean;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.ModuleXmlBean;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.ReleaseXmlBean;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.UpdateXmlSerializer;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.UpdateXmlSerializerImpl;
+import net.sourceforge.squirrel_sql.client.update.xmlbeans.XmlBeanUtilities;
+import net.sourceforge.squirrel_sql.fw.util.IOUtilities;
+import net.sourceforge.squirrel_sql.fw.util.IOUtilitiesImpl;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+
+/**
+ * Goal which sets the System property "squirrelsql.version" based on the value of project version. Sets the
+ * System property "squirrelsql.version" so that it can be used globally by the installers and the
+ * update-site projects. It accepts the project version as an argument which it uses to decide what the
+ * squirrelsql.version should be. If the project version ends with "-SNAPSHOT", then the squirrelsql.version
+ * will be set to Snapshot-{timestamp} where {timestamp} is the current timestamp in the 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. This mojo should only be executed once during the
+ * build since it manipulates globally-accessible properties. This is particularly important in the case
+ * of snapshot project versions.
+ *
+ * @goal set-version
+ * @phase initialize
+ */
+public class SquirrelSqlVersionMojo extends AbstractMojo
+{
+
+ private org.apache.maven.plugin.logging.Log log = getLog();
+
+ public static String VERSION_PROPERTY_KEY = "squirrelsql.version";
+
+ /**
+ * The version for the release.
+ *
+ * @parameter expression="${projectVersion}"
+ * @required
+ */
+ private String projectVersion;
+
+ public void setprojectVersion(String projectVersion)
+ {
+ this.projectVersion = projectVersion;
+ }
+
+ /**
+ * Does the main work provided by this plugin.
+ *
+ * @throws MojoExecutionException
+ * if the projectVersion isn't specified.
+ */
+ public void execute() throws MojoExecutionException
+ {
+ if (projectVersion == null) { throw new MojoExecutionException("projectVersion cannot be null."); }
+
+ String squirrelsqlVersion = projectVersion;
+
+ if (!projectVersion.toLowerCase().endsWith("-snapshot"))
+ {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_kkmm");
+ try
+ {
+ String date = sdf.format(new Date());
+ squirrelsqlVersion = "Snapshot-" + date;
+ }
+ catch (IllegalStateException e)
+ {
+ log.error("Could not convert date format pattern " + timestampPattern);
+ throw e;
+ }
+ }
+
+ Properties props = project.getProperties();
+ props.put(VERSION_PROPERTY_KEY, squirrelsqlVersion);
+ System.setProperty(VERSION_PROPERTY_KEY, squirrelsqlVersion)
+
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-07-05 18:35:32
|
Revision: 5666
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5666&view=rev
Author: manningr
Date: 2010-07-05 18:35:26 +0000 (Mon, 05 Jul 2010)
Log Message:
-----------
added missing skinlf-readme.txt file.
Modified Paths:
--------------
trunk/mavenize/laf-plugin/laf-plugin-assembly.xml
Modified: trunk/mavenize/laf-plugin/laf-plugin-assembly.xml
===================================================================
--- trunk/mavenize/laf-plugin/laf-plugin-assembly.xml 2010-07-05 18:29:44 UTC (rev 5665)
+++ trunk/mavenize/laf-plugin/laf-plugin-assembly.xml 2010-07-05 18:35:26 UTC (rev 5666)
@@ -53,6 +53,13 @@
<include>**</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>src/main/resources/skinlf-theme-packs</directory>
+ <outputDirectory>${artifact.artifactId}/skinlf-theme-packs</outputDirectory>
+ <includes>
+ <include>skinlf-readme.txt</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-07-05 18:29:51
|
Revision: 5665
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5665&view=rev
Author: manningr
Date: 2010-07-05 18:29:44 +0000 (Mon, 05 Jul 2010)
Log Message:
-----------
Added readme.txt file for lafs.
Modified Paths:
--------------
trunk/mavenize/laf-plugin/laf-plugin-assembly.xml
Added Paths:
-----------
trunk/mavenize/laf-plugin/src/main/resources/readme.txt
Modified: trunk/mavenize/laf-plugin/laf-plugin-assembly.xml
===================================================================
--- trunk/mavenize/laf-plugin/laf-plugin-assembly.xml 2010-07-05 18:23:35 UTC (rev 5664)
+++ trunk/mavenize/laf-plugin/laf-plugin-assembly.xml 2010-07-05 18:29:44 UTC (rev 5665)
@@ -40,6 +40,13 @@
</includes>
</fileSet>
<fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>${artifact.artifactId}/lafs</outputDirectory>
+ <includes>
+ <include>readme.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>${project.build.directory}/skinlf-theme-packs</directory>
<outputDirectory>${artifact.artifactId}/skinlf-theme-packs</outputDirectory>
<includes>
Added: trunk/mavenize/laf-plugin/src/main/resources/readme.txt
===================================================================
--- trunk/mavenize/laf-plugin/src/main/resources/readme.txt (rev 0)
+++ trunk/mavenize/laf-plugin/src/main/resources/readme.txt 2010-07-05 18:29:44 UTC (rev 5665)
@@ -0,0 +1,2 @@
+This directory contains the standard Look and Feels
+supplied with the Look and Feel plugin.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-07-05 18:23:41
|
Revision: 5664
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5664&view=rev
Author: manningr
Date: 2010-07-05 18:23:35 +0000 (Mon, 05 Jul 2010)
Log Message:
-----------
Added missing appsubpath and polish translation jar.
Modified Paths:
--------------
trunk/mavenize/squirrelsql-other-installer/src/main/resources/izpack-other.xml
Modified: trunk/mavenize/squirrelsql-other-installer/src/main/resources/izpack-other.xml
===================================================================
--- trunk/mavenize/squirrelsql-other-installer/src/main/resources/izpack-other.xml 2010-07-05 15:09:21 UTC (rev 5663)
+++ trunk/mavenize/squirrelsql-other-installer/src/main/resources/izpack-other.xml 2010-07-05 18:23:35 UTC (rev 5664)
@@ -2,6 +2,7 @@
<info>
<appname>SQuirreL SQL Client</appname>
+ <appsubpath>squirrel-sql-${squirrel.version}</appsubpath>
<appversion>${squirrel.version}</appversion>
<authors>
<author email="ger...@us..." name="Gerd Wagner" />
@@ -351,6 +352,13 @@
<file targetdir="$INSTALL_PATH/lib" src="translations/squirrel-sql_ko_KR.jar" />
</pack>
+ <pack required="no" preselected="no" installGroups="Translations" name="Optional Translation - Polish">
+ <description>
+ Provides native labels and user messages for use in a Polish locale (Miron Sadziak)
+ </description>
+ <file targetdir="$INSTALL_PATH/lib" src="translations/squirrel-sql_pl.jar" />
+ </pack>
+
<pack required="no" preselected="no" installGroups="Translations" name="Optional Translation - Russian">
<description>
Provides native labels and user messages for use in a Russian locale (Dmitry Matyukhin)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-07-05 15:09:27
|
Revision: 5663
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5663&view=rev
Author: manningr
Date: 2010-07-05 15:09:21 +0000 (Mon, 05 Jul 2010)
Log Message:
-----------
Added syntax dep on openide-loaders
Modified Paths:
--------------
trunk/mavenize/mavenize.pl
trunk/mavenize/squirrelsql-other-installer/pom.xml
Modified: trunk/mavenize/mavenize.pl
===================================================================
--- trunk/mavenize/mavenize.pl 2010-07-05 01:41:12 UTC (rev 5662)
+++ trunk/mavenize/mavenize.pl 2010-07-05 15:09:21 UTC (rev 5663)
@@ -95,6 +95,11 @@
<version>4.0</version>
</dependency>
<dependency>
+ <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
+ <artifactId>openide-loaders</artifactId>
+ <version>4.0</version>
+ </dependency>
+ <dependency>
<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
<artifactId>org-netbeans-modules-editor</artifactId>
<version>4.0</version>
Modified: trunk/mavenize/squirrelsql-other-installer/pom.xml
===================================================================
--- trunk/mavenize/squirrelsql-other-installer/pom.xml 2010-07-05 01:41:12 UTC (rev 5662)
+++ trunk/mavenize/squirrelsql-other-installer/pom.xml 2010-07-05 15:09:21 UTC (rev 5663)
@@ -360,7 +360,7 @@
that we are including jars that are never used (only transitively) -->
<!-- Can we make this list smaller by using groupIds ? -->
- <includeArtifactIds>antlr,asm,asm-attrs,autocomplete,cglib,common,commons-cli,commons-codec,commons-collections,commons-httpclient,commons-logging,dom4j,ejb-persistence,forms,fw,hibernate-annotations,hibernate-commons-annotations,hibernate-entitymanager,hibernate,jxl,log4j,nanoxml,openide,org-netbeans-modules-editor-fold,org-netbeans-modules-editor-lib,org-netbeans-modules-editor-util,org-netbeans-modules-editor,rsyntaxtextarea,rtext,spring-beans,squirrel-sql,spring-context-support,spring-context,spring-core</includeArtifactIds>
+ <includeArtifactIds>antlr,asm,asm-attrs,autocomplete,cglib,common,commons-cli,commons-codec,commons-collections,commons-httpclient,commons-logging,forms,fw,hibernate-annotations,hibernate-commons-annotations,hibernate-entitymanager,hibernate,jxl,log4j,nanoxml,openide,openide-loaders,org-netbeans-modules-editor-fold,org-netbeans-modules-editor-lib,org-netbeans-modules-editor-util,org-netbeans-modules-editor,ostermiller-syntax,rsyntaxtextarea,rtext,spring-beans,squirrel-sql,spring-context-support,spring-context,spring-core</includeArtifactIds>
<excludeGroupIds>net.sf.squirrel-sql.plugins</excludeGroupIds>
<outputDirectory>${staging.dir}/lib</outputDirectory>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-07-05 01:41:19
|
Revision: 5662
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5662&view=rev
Author: manningr
Date: 2010-07-05 01:41:12 +0000 (Mon, 05 Jul 2010)
Log Message:
-----------
Fixed groupId for translations.
Modified Paths:
--------------
trunk/mavenize/squirrelsql-other-installer/pom.xml
Modified: trunk/mavenize/squirrelsql-other-installer/pom.xml
===================================================================
--- trunk/mavenize/squirrelsql-other-installer/pom.xml 2010-06-29 02:15:13 UTC (rev 5661)
+++ trunk/mavenize/squirrelsql-other-installer/pom.xml 2010-07-05 01:41:12 UTC (rev 5662)
@@ -296,7 +296,7 @@
<type>zip</type>
</dependency>
<dependency>
- <groupId>net.sf.squirrel-sql.translation</groupId>
+ <groupId>net.sf.squirrel-sql.translations</groupId>
<artifactId>squirrelsql-translations</artifactId>
<version>${project.version}</version>
<type>jar</type>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2010-06-29 02:15:19
|
Revision: 5661
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5661&view=rev
Author: gerdwagner
Date: 2010-06-29 02:15:13 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
Overview:
This makes sure that null or empty string can be separated from other strings.
Before this was done null or empty string could not be in their own interval.
null still cant be separated from empty string.
Modified Paths:
--------------
trunk/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/CharRange.java
Modified: trunk/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/CharRange.java
===================================================================
--- trunk/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/CharRange.java 2010-06-27 18:06:54 UTC (rev 5660)
+++ trunk/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/CharRange.java 2010-06-29 02:15:13 UTC (rev 5661)
@@ -7,6 +7,7 @@
private boolean _isInit;
private boolean _initializing;
+ private boolean _hasNullOrEmptyString;
public char getRange()
{
@@ -22,6 +23,7 @@
if(null == s || 0 == s.length())
{
+ _hasNullOrEmptyString = true;
return;
}
@@ -51,7 +53,17 @@
public char getMinChar()
{
- return (char) _minChar;
+ if (_hasNullOrEmptyString && 0 < _minChar)
+ {
+ // This makes sure that null or empty string can be separated from other strings.
+ // Before this was done null or empty string could not be in their own interval.
+ // null still cant be separated from empty string.
+ return (char) (_minChar-1);
+ }
+ else
+ {
+ return (char) _minChar;
+ }
}
public char getMaxChar()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-06-27 18:07:00
|
Revision: 5660
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5660&view=rev
Author: manningr
Date: 2010-06-27 18:06:54 +0000 (Sun, 27 Jun 2010)
Log Message:
-----------
Fixed translations groupId.
Modified Paths:
--------------
trunk/mavenize/update-site/squirrelsql-update-site/pom.xml
Modified: trunk/mavenize/update-site/squirrelsql-update-site/pom.xml
===================================================================
--- trunk/mavenize/update-site/squirrelsql-update-site/pom.xml 2010-06-27 16:34:17 UTC (rev 5659)
+++ trunk/mavenize/update-site/squirrelsql-update-site/pom.xml 2010-06-27 18:06:54 UTC (rev 5660)
@@ -371,7 +371,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>net.sf.squirrel-sql</groupId>
+ <groupId>net.sf.squirrel-sql.translations</groupId>
<artifactId>squirrelsql-translations</artifactId>
<version>${project.version}</version>
<type>jar</type>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-06-27 16:34:23
|
Revision: 5659
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5659&view=rev
Author: manningr
Date: 2010-06-27 16:34:17 +0000 (Sun, 27 Jun 2010)
Log Message:
-----------
use property for uniformity of dependency plugin version.
Modified Paths:
--------------
trunk/mavenize/squirrelsql-macosx-installer/pom.xml
trunk/mavenize/squirrelsql-other-installer/pom.xml
Modified: trunk/mavenize/squirrelsql-macosx-installer/pom.xml
===================================================================
--- trunk/mavenize/squirrelsql-macosx-installer/pom.xml 2010-06-27 16:33:31 UTC (rev 5658)
+++ trunk/mavenize/squirrelsql-macosx-installer/pom.xml 2010-06-27 16:34:17 UTC (rev 5659)
@@ -375,7 +375,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
+ <version>${dependency-plugin-version}</version>
<executions>
<execution>
<id>application-libraries</id>
Modified: trunk/mavenize/squirrelsql-other-installer/pom.xml
===================================================================
--- trunk/mavenize/squirrelsql-other-installer/pom.xml 2010-06-27 16:33:31 UTC (rev 5658)
+++ trunk/mavenize/squirrelsql-other-installer/pom.xml 2010-06-27 16:34:17 UTC (rev 5659)
@@ -344,7 +344,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.1</version>
+ <version>${dependency-plugin-version}</version>
<executions>
<execution>
<id>application-libraries</id>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
