[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6178] trunk/sql12/installer
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
Menu
▾
▴
[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6178] trunk/sql12/installer
|
From: <man...@us...> - 2011-03-06 20:15:48
|
Revision: 6178
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6178&view=rev
Author: manningr
Date: 2011-03-06 20:15:41 +0000 (Sun, 06 Mar 2011)
Log Message:
-----------
Pulled the configuration of included library artifacts up into the parent pom (installer) so that :
1. The duplication of what libraries to include in the installer is now gone
2. The included artifacts can be more precisely specified using both the groupId and artifactId of each artifact.
(The squirrelsql-dependency-plugin was released previously to make this configuration possible.)
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-03-06 15:57:38 UTC (rev 6177)
+++ trunk/sql12/installer/pom.xml 2011-03-06 20:15:41 UTC (rev 6178)
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -64,6 +65,85 @@
<module>squirrelsql-update-site</module>
</modules>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrelsql-dependency-plugin</artifactId>
+ <version>1.0.7</version>
+ <executions>
+ <execution>
+ <id>application-libraries</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <stripVersion>true</stripVersion>
+ <!--
+ 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>
+ <includedArtifact>asm:asm</includedArtifact>
+ <includedArtifact>asm:asm-attrs</includedArtifact>
+ <includedArtifact>com.fifesoft:autocomplete</includedArtifact>
+ <includedArtifact>axis:axis</includedArtifact>
+ <includedArtifact>axis:axis-jaxrpc</includedArtifact>
+ <includedArtifact>cglib:cglib</includedArtifact>
+ <includedArtifact>com.fifesoft.rtext:common</includedArtifact>
+ <includedArtifact>commons-cli:commons-cli</includedArtifact>
+ <includedArtifact>commons-codec:commons-codec</includedArtifact>
+ <includedArtifact>commons-collections:commons-collections</includedArtifact>
+ <includedArtifact>commons-httpclient:commons-httpclient</includedArtifact>
+ <includedArtifact>commons-logging:commons-logging</includedArtifact>
+ <includedArtifact>com.jgoodies:forms</includedArtifact>
+ <includedArtifact>net.sf.squirrel-sql:fw</includedArtifact>
+ <includedArtifact>org.hibernate:hibernate-annotations</includedArtifact>
+ <includedArtifact>org.hibernate:hibernate-commons-annotations</includedArtifact>
+ <includedArtifact>org.hibernate:hibernate-entitymanager</includedArtifact>
+ <includedArtifact>org.hibernate:hibernate</includedArtifact>
+ <includedArtifact>net.sourceforge.jexcelapi:jxl</includedArtifact>
+ <includedArtifact>log4j:log4j</includedArtifact>
+ <includedArtifact>be.cyberelf.nanoxml:nanoxml</includedArtifact>
+ <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:openide</includedArtifact>
+ <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:openide-loaders</includedArtifact>
+ <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor</includedArtifact>
+ <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor-fold</includedArtifact>
+ <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor-lib</includedArtifact>
+ <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor-util</includedArtifact>
+ <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:ostermiller-syntax</includedArtifact>
+ <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:ostermiller-bte</includedArtifact>
+ <includedArtifact>com.fifesoft:rsyntaxtextarea</includedArtifact>
+ <includedArtifact>com.fifesoft.rtext</includedArtifact>
+ <includedArtifact>org.springframework:spring-beans</includedArtifact>
+ <includedArtifact>net.sf.squirrel-sql:squirrel-sql</includedArtifact>
+ <includedArtifact>org.springframework:spring-context-support</includedArtifact>
+ <includedArtifact>org.springframework:spring-context</includedArtifact>
+ <includedArtifact>org.springframework:spring-core</includedArtifact>
+ <includedArtifact>org.antlr:stringtemplate</includedArtifact>
+ <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:treetable</includedArtifact>
+ <includedArtifact>org.eclipse.swt.win32.win32:x86</includedArtifact>
+ <includedArtifact>org.mod4j.org.eclipse.compare:core</includedArtifact>
+ <includedArtifact>org.jmeld:jmeld</includedArtifact>
+ <includedArtifact>javax.help:javahelp</includedArtifact>
+ <includedArtifact>com.jidesoft:jide-oss</includedArtifact>
+ <includedArtifact>org.swinglabs:swing-worker</includedArtifact>
+ <includedArtifact>com.ibm.icu:icu4j</includedArtifact>
+ <includedArtifact>org.mod4j.org.eclipse:osgi</includedArtifact>
+ </includedArtifacts>
+ <outputDirectory>${staging.dir}/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<profiles>
<!--
The only difference here is that we want to include the squirrelsql-source project as a module
Modified: trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2011-03-06 15:57:38 UTC (rev 6177)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2011-03-06 20:15:41 UTC (rev 6178)
@@ -3,9 +3,9 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
- <artifactId>squirrel-root-pom</artifactId>
+ <artifactId>installer</artifactId>
<version>3.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>squirrelsql-macosx-installer</artifactId>
@@ -117,31 +117,14 @@
</plugin>
<!-- prepare dependencies so that izpack jar tag to pickup at compile time -->
<plugin>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrelsql-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>application-libraries</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <stripVersion>true</stripVersion>
- <!--
- This is a pain in the butt, but it beats the list that would specify what to exclude. Also,
- if we miss an artifact here, then running the installer and launching SQuirreL as a test
- will find it. However, we may never know 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,axis,axis-jaxrpc,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,stringtemplate,treetable,x86,core,jmeld,javahelp,jide-oss,swing-worker,icu4j,osgi</includeArtifactIds>
- <excludeGroupIds>net.sf.squirrel-sql.plugins</excludeGroupIds>
- <outputDirectory>${staging.dir}/lib</outputDirectory>
- </configuration>
- </execution>
- <execution>
<id>unpack-launcher-scripts</id>
<phase>process-resources</phase>
<goals>
Modified: trunk/sql12/installer/squirrelsql-other-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2011-03-06 15:57:38 UTC (rev 6177)
+++ trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2011-03-06 20:15:41 UTC (rev 6178)
@@ -3,9 +3,9 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
- <artifactId>squirrel-root-pom</artifactId>
+ <artifactId>installer</artifactId>
<version>3.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>squirrelsql-other-installer</artifactId>
@@ -100,31 +100,14 @@
</plugin>
<!-- prepare dependencies so that izpack jar tag to pickup at compile time -->
<plugin>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrelsql-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>application-libraries</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <stripVersion>true</stripVersion>
- <!--
- This is a pain in the butt, but it beats the list that would specify what to exclude. Also,
- if we miss an artifact here, then running the installer and launching SQuirreL as a test
- will find it. However, we may never know 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,axis,axis-jaxrpc,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,stringtemplate,treetable,x86,core,jmeld,javahelp,jide-oss,swing-worker,icu4j,osgi</includeArtifactIds>
- <excludeGroupIds>net.sf.squirrel-sql.plugins</excludeGroupIds>
- <outputDirectory>${staging.dir}/lib</outputDirectory>
- </configuration>
- </execution>
- <execution>
<id>unpack-launcher-scripts</id>
<phase>process-resources</phase>
<goals>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|