|
From: <man...@us...> - 2011-05-18 00:41:37
|
Revision: 6265
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6265&view=rev
Author: manningr
Date: 2011-05-18 00:41:30 +0000 (Wed, 18 May 2011)
Log Message:
-----------
moved duplicate izpack plugin configuration from installer poms into the installer module pom. This is done in preparation for updating to use the new version of izpack plugin/compiler.
Modified Paths:
--------------
trunk/sql12/installer/pom.xml
trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml
trunk/sql12/installer/squirrelsql-other-installer/pom.xml
Modified: trunk/sql12/installer/pom.xml
===================================================================
--- trunk/sql12/installer/pom.xml 2011-05-17 01:23:40 UTC (rev 6264)
+++ trunk/sql12/installer/pom.xml 2011-05-18 00:41:30 UTC (rev 6265)
@@ -85,10 +85,8 @@
</goals>
<configuration>
<stripVersion>true</stripVersion>
- <!--
- This is a scaled down list of artifacts that we need at runtime, minus any that are not
- needed
- -->
+ <!-- This is a scaled down list of artifacts that we need at runtime, minus
+ any that are not needed -->
<excludeGroupIds>net.sf.squirrel-sql.plugins</excludeGroupIds>
<includedArtifacts>
<includedArtifact>antlr:antlr</includedArtifact>
@@ -149,17 +147,40 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.izpack</groupId>
+ <artifactId>izpack-maven-plugin</artifactId>
+ <version>${izpack-plugin-version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.izpack</groupId>
+ <artifactId>izpack-standalone-compiler</artifactId>
+ <version>${izpack-standalone.version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <izpackBasedir>${staging.dir}</izpackBasedir>
+ <descriptor>${staging.dir}/classes/${izpack-config-filename}</descriptor>
+ </configuration>
+ <executions>
+ <execution>
+ <id>standard-installer</id>
+ <phase>package</phase>
+ <goals>
+ <goal>izpack</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
<profiles>
- <!--
- The only difference here is that we want to include the squirrelsql-source project as a module
- when the uploadInstallers property is set. Since the squirrelsql-source project takes some time
- to export the source from subversion, and there is very little use for it except when uploading
- the installers (uploadInstallers property is set), we exclude it for now in the default build.
- -->
+ <!-- The only difference here is that we want to include the squirrelsql-source project as a module
+ when the uploadInstallers property is set. Since the squirrelsql-source project takes some time to export
+ the source from subversion, and there is very little use for it except when uploading the installers
+ (uploadInstallers property is set), we exclude it for now in the default build. -->
<profile>
<id>export-source</id>
<activation>
Modified: trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2011-05-17 01:23:40 UTC (rev 6264)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2011-05-18 00:41:30 UTC (rev 6265)
@@ -55,6 +55,7 @@
<squirrel.version>3.1.0</squirrel.version>
<staging.dir>${project.build.directory}</staging.dir>
<upload-server-path>${file.release.path}/${squirrelsql.version}/squirrelsql-${squirrelsql.version}-MacOSX-install.jar</upload-server-path>
+ <izpack-config-filename>izpack-mac.xml</izpack-config-filename>
</properties>
<dependencies>
<dependency>
@@ -196,30 +197,11 @@
</execution>
</executions>
</plugin>
+ <!-- The property izpack-config-filename must be defined so that it can be used in the plugin
+ configuration which is inherited from the installer module pom. -->
<plugin>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-maven-plugin</artifactId>
- <version>1.0-alpha-4</version>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.izpack</groupId>
- <artifactId>izpack-standalone-compiler</artifactId>
- <version>${izpack-standalone.version}</version>
- </dependency>
- </dependencies>
- <configuration>
- <izpackBasedir>${staging.dir}</izpackBasedir>
- <descriptor>${staging.dir}/classes/izpack-mac.xml</descriptor>
- </configuration>
- <executions>
- <execution>
- <id>standard-installer</id>
- <phase>package</phase>
- <goals>
- <goal>izpack</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: trunk/sql12/installer/squirrelsql-other-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2011-05-17 01:23:40 UTC (rev 6264)
+++ trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2011-05-18 00:41:30 UTC (rev 6265)
@@ -56,6 +56,7 @@
<squirrel.version>3.1.0</squirrel.version>
<staging.dir>${project.build.directory}</staging.dir>
<upload-server-path>${file.release.path}/${squirrelsql.version}/squirrel-sql-${squirrelsql.version}-install.jar</upload-server-path>
+ <izpack-config-filename>izpack-other.xml</izpack-config-filename>
</properties>
<dependencies>
<dependency>
@@ -201,30 +202,11 @@
</execution>
</executions>
</plugin>
+ <!-- The property izpack-config-filename must be defined so that it can be used in the plugin
+ configuration which is inherited from the installer module pom. -->
<plugin>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-maven-plugin</artifactId>
- <version>1.0-alpha-4</version>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.izpack</groupId>
- <artifactId>izpack-standalone-compiler</artifactId>
- <version>${izpack-standalone.version}</version>
- </dependency>
- </dependencies>
- <configuration>
- <izpackBasedir>${staging.dir}</izpackBasedir>
- <descriptor>${staging.dir}/classes/izpack-other.xml</descriptor>
- </configuration>
- <executions>
- <execution>
- <id>standard-installer</id>
- <phase>package</phase>
- <goals>
- <goal>izpack</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<!--
This plugin configuration performs a test of the installer by running it with an autoinstall
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
