[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5863] trunk/sql12/installer

[<man...@us...>]

Revision: 5863
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5863&view=rev
Author:   manningr
Date:     2010-09-02 00:39:18 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
Changed binding of the installer upload profile to fire at install, rather than deploy.  This allows upload to be tested or even done without also deploying to Nexus.  Also, settled on a standard for the installer artifacts which matches the naming convention we used previously (and fixed batch upload files to be correct).

Modified Paths:
--------------
    trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml
    trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/batch.txt
    trunk/sql12/installer/squirrelsql-other-installer/pom.xml
    trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/batch.txt
    trunk/sql12/installer/squirrelsql-source/pom.xml
    trunk/sql12/installer/squirrelsql-source/src/main/resources/batch.txt

Modified: trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml	2010-09-01 02:38:54 UTC (rev 5862)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml	2010-09-02 00:39:18 UTC (rev 5863)
@@ -525,7 +525,7 @@
 										<argument>${file.release.server}</argument>
 									</arguments>
 								</configuration>
-								<phase>deploy</phase>
+								<phase>install</phase>
 								<goals>
 									<goal>exec</goal>
 								</goals>

Modified: trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/batch.txt
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/batch.txt	2010-09-01 02:38:54 UTC (rev 5862)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/batch.txt	2010-09-02 00:39:18 UTC (rev 5863)
@@ -1 +1 @@
-put target/${project.build.finalName}-standard.jar ${file.release.path}/${squirrelsql.version}/squirrelsql-${squirrelsql.version}-MacOSX-install.jar
+put target/${project.build.finalName}-standard.jar ${file.release.path}/${squirrelsql.version}/squirrel-sql-${squirrelsql.version}-MacOSX-install.jar

Modified: trunk/sql12/installer/squirrelsql-other-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/pom.xml	2010-09-01 02:38:54 UTC (rev 5862)
+++ trunk/sql12/installer/squirrelsql-other-installer/pom.xml	2010-09-02 00:39:18 UTC (rev 5863)
@@ -567,6 +567,7 @@
 				<executions>
 					<execution>
 						<configuration>
+							<name>squirrel-sql</name>
 							<version>${squirrelsql.rpm.version}</version>
 							<copyright>LGPL</copyright>
 							<distribution>Red Hat Linux</distribution>
@@ -728,7 +729,7 @@
 										<argument>${file.release.server}</argument>
 									</arguments>
 								</configuration>
-								<phase>deploy</phase>
+								<phase>install</phase>
 								<goals>
 									<goal>exec</goal>
 								</goals>

Modified: trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/batch.txt
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/batch.txt	2010-09-01 02:38:54 UTC (rev 5862)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/batch.txt	2010-09-02 00:39:18 UTC (rev 5863)
@@ -1,12 +1,12 @@
 cd ${file.release.path}
 mkdir ${squirrelsql.version}-plainzip
 cd ${squirrelsql.version}-plainzip
-put target/squirrelsql-${squirrelsql.version}-base.tar.gz
-put target/squirrelsql-${squirrelsql.version}-standard.tar.gz
-put target/squirrelsql-${squirrelsql.version}-optional.tar.gz
+put target/squirrel-sql-${squirrelsql.version}-base.tar.gz
+put target/squirrel-sql-${squirrelsql.version}-standard.tar.gz
+put target/squirrel-sql-${squirrelsql.version}-optional.tar.gz
 cd ${file.release.path}
 mkdir ${squirrelsql.version}
 cd ${squirrelsql.version}
 put target/${project.build.finalName}-standard.jar ${upload-server-path} 
-put target/rpm/squirrelsql-other-installer/RPMS/noarch/squirrelsql-other-installer-${squirrelsql.rpm.version}-1.noarch.rpm
+put target/rpm/squirrel-sql/RPMS/noarch/squirrel-sql-${squirrelsql.rpm.version}-1.noarch.rpm
 

Modified: trunk/sql12/installer/squirrelsql-source/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-source/pom.xml	2010-09-01 02:38:54 UTC (rev 5862)
+++ trunk/sql12/installer/squirrelsql-source/pom.xml	2010-09-02 00:39:18 UTC (rev 5863)
@@ -1,6 +1,4 @@
-<project
-	xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
@@ -55,6 +53,12 @@
 		<url>https://www.squirrel-sql.org/hudson/</url>
 	</ciManagement>
 	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -118,7 +122,7 @@
 										<argument>${file.release.server}</argument>
 									</arguments>
 								</configuration>
-								<phase>deploy</phase>
+								<phase>install</phase>
 								<goals>
 									<goal>exec</goal>
 								</goals>

Modified: trunk/sql12/installer/squirrelsql-source/src/main/resources/batch.txt
===================================================================
--- trunk/sql12/installer/squirrelsql-source/src/main/resources/batch.txt	2010-09-01 02:38:54 UTC (rev 5862)
+++ trunk/sql12/installer/squirrelsql-source/src/main/resources/batch.txt	2010-09-02 00:39:18 UTC (rev 5863)
@@ -1 +1 @@
-put target/squirrel-sql-source.zip ${file.release.path}/${squirrelsql.version}/squirrelsql-${squirrelsql.version}-source.zip 
+put target/squirrel-sql-source.zip ${file.release.path}/${squirrelsql.version}/squirrel-sql-${squirrelsql.version}-source.zip 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.