|
From: <man...@us...> - 2010-11-09 22:45:40
|
Revision: 5959
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5959&view=rev
Author: manningr
Date: 2010-11-09 22:45:33 +0000 (Tue, 09 Nov 2010)
Log Message:
-----------
There is no compelling reason to user the module pom (installer) as the parent for any of these projects, since there is nothing in the installer pom that is worth inheriting (aside from it's root pom inheritance). Therefore, until that changes, all projects will inherit directly from the root pom. This fixes the incorrect relativePath in several of the pom files (Maven 3 is more strict with regard to this relative path being correct).
Modified Paths:
--------------
trunk/sql12/installer/squirrelsql-installer-deps/pom.xml
trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml
trunk/sql12/installer/squirrelsql-launcher/pom.xml
trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml
trunk/sql12/installer/squirrelsql-other-installer/pom.xml
trunk/sql12/installer/squirrelsql-source/pom.xml
trunk/sql12/installer/squirrelsql-update-site/pom.xml
Modified: trunk/sql12/installer/squirrelsql-installer-deps/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2010-11-07 11:52:53 UTC (rev 5958)
+++ trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2010-11-09 22:45:33 UTC (rev 5959)
@@ -1,13 +1,17 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>installer</artifactId>
<groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrel-root-pom</artifactId>
<version>3.2.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
+
<artifactId>squirrelsql-installer-deps</artifactId>
<packaging>pom</packaging>
+
<name>Installer Dependencies</name>
<description>This pom collects all of the common dependencies shared by each the installers.</description>
<inceptionYear>2001</inceptionYear>
@@ -49,7 +53,7 @@
<url>https://www.squirrel-sql.org/hudson/</url>
</ciManagement>
<dependencies>
-
+
<!-- SQuirreL Dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
@@ -314,6 +318,6 @@
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>website</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml 2010-11-07 11:52:53 UTC (rev 5958)
+++ trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml 2010-11-09 22:45:33 UTC (rev 5959)
@@ -1,80 +1,81 @@
<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>
+ 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>
-
- <artifactId>squirrelsql-java-version-checker</artifactId>
- <packaging>jar</packaging>
-
- <name>SQuirreL-SQL Java Version Checker</name>
- <description>
+ <parent>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrel-root-pom</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>squirrelsql-java-version-checker</artifactId>
+ <packaging>jar</packaging>
+
+ <name>SQuirreL-SQL Java Version Checker</name>
+ <description>
This project provides a jar which contains a utility to verify the version of Java
being used. The classes in this jar have been built with javac 1.2.2 to enable it to
be run by any JRE 1.2.2 and higher.
</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>
- <!-- This is blatant copy/paste from squirrelsql-launcher pom.xml -->
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <!-- This is blatant copy/paste from squirrelsql-launcher pom.xml -->
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Modified: trunk/sql12/installer/squirrelsql-launcher/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-launcher/pom.xml 2010-11-07 11:52:53 UTC (rev 5958)
+++ trunk/sql12/installer/squirrelsql-launcher/pom.xml 2010-11-09 22:45:33 UTC (rev 5959)
@@ -6,6 +6,7 @@
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
<version>3.2.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>squirrelsql-launcher</artifactId>
Modified: trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2010-11-07 11:52:53 UTC (rev 5958)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2010-11-09 22:45:33 UTC (rev 5959)
@@ -1,16 +1,17 @@
-<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>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
<version>3.2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
+
<artifactId>squirrelsql-macosx-installer</artifactId>
<packaging>jar</packaging>
+
<name>SQuirreL-SQL Mac OS X Installer</name>
<description>This project is used to build the installer for Mac OS X</description>
<inceptionYear>2001</inceptionYear>
@@ -54,7 +55,7 @@
<properties>
<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>
+ <upload-server-path>${file.release.path}/${squirrelsql.version}/squirrelsql-${squirrelsql.version}-MacOSX-install.jar</upload-server-path>
</properties>
<dependencies>
<dependency>
@@ -67,7 +68,7 @@
<groupId>${project.groupId}</groupId>
<artifactId>squirrelsql-update-site</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>macosx</artifactId>
@@ -87,9 +88,9 @@
<testResources>
<testResource>
<directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<plugins>
<!-- Set the squirrelsql.version property if it has not already been set. -->
<plugin>
@@ -119,9 +120,10 @@
<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)
+ 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 ? -->
@@ -199,7 +201,7 @@
<!-- <includes>*.jar</includes>-->
<outputDirectory>${staging.dir}/update-site</outputDirectory>
</configuration>
- </execution>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -244,7 +246,7 @@
<goals>
<goal>exec</goal>
</goals>
- <phase>integration-test</phase>
+ <phase>integration-test</phase>
</execution>
</executions>
</plugin>
@@ -279,7 +281,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</build>
</profile>
Modified: trunk/sql12/installer/squirrelsql-other-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2010-11-07 11:52:53 UTC (rev 5958)
+++ trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2010-11-09 22:45:33 UTC (rev 5959)
@@ -1,16 +1,17 @@
-<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>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>installer</artifactId>
<version>3.2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
+
<artifactId>squirrelsql-other-installer</artifactId>
<packaging>jar</packaging>
+
<name>SQuirreL-SQL Generic Installer</name>
<description>This project is used to build the generic installer</description>
<inceptionYear>2001</inceptionYear>
@@ -67,7 +68,7 @@
<groupId>${project.groupId}</groupId>
<artifactId>squirrelsql-update-site</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
</dependencies>
<build>
<defaultGoal>package</defaultGoal>
@@ -112,9 +113,10 @@
<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)
+ 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 ? -->
@@ -221,8 +223,8 @@
</executions>
</plugin>
<!--
- This plugin configuration performs a test of the installer by running it with an autoinstall configuraion
- file.
+ This plugin configuration performs a test of the installer by running it with an autoinstall
+ configuraion file.
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -311,8 +313,8 @@
<mappings>
<mapping>
<!--
- The "/opt" prefix is necessary here. It is where we install by default, when the rpm is installed
- without being relocated.
+ The "/opt" prefix is necessary here. It is where we install by default, when the rpm is
+ installed without being relocated.
-->
<directory>/opt/SQuirreLSQLClient/doc</directory>
<filemode>777</filemode>
@@ -332,53 +334,53 @@
<sources>
<source>
<location>target/squirrel-sql-${squirrelsql.version}-base/icons</location>
- </source>
- </sources>
+ </source>
+ </sources>
</mapping>
<mapping>
<directory>/opt/SQuirreLSQLClient/lib</directory>
<filemode>777</filemode>
<username>root</username>
- <groupname>root</groupname>
+ <groupname>root</groupname>
<sources>
<source>
<location>target/squirrel-sql-${squirrelsql.version}-base/lib</location>
- </source>
+ </source>
</sources>
</mapping>
<mapping>
<directory>/opt/SQuirreLSQLClient/plugins</directory>
<filemode>777</filemode>
<username>root</username>
- <groupname>root</groupname>
+ <groupname>root</groupname>
<sources>
<source>
<location>target/squirrel-sql-${squirrelsql.version}-base/plugins</location>
- </source>
+ </source>
</sources>
</mapping>
<mapping>
<directory>/opt/SQuirreLSQLClient</directory>
<filemode>777</filemode>
<username>root</username>
- <groupname>root</groupname>
+ <groupname>root</groupname>
<sources>
<source>
<location>target/squirrel-sql-${squirrelsql.version}-base/squirrel-sql.sh</location>
- </source>
+ </source>
</sources>
</mapping>
<mapping>
<directory>/opt/SQuirreLSQLClient/update</directory>
<filemode>777</filemode>
<username>root</username>
- <groupname>root</groupname>
+ <groupname>root</groupname>
<sources>
<source>
<location>target/squirrel-sql-${squirrelsql.version}-base/update</location>
- </source>
+ </source>
</sources>
- </mapping>
+ </mapping>
<mapping>
<directory>/opt/SQuirreLSQLClient</directory>
<filemode>666</filemode>
@@ -411,7 +413,7 @@
<location>target/squirrel-sql-${squirrelsql.version}-base/update-log4j.properties</location>
</source>
</sources>
- </mapping>
+ </mapping>
</mappings>
<postinstallScriptlet>
<scriptFile>src/main/resources/postinstall.sh</scriptFile>
Modified: trunk/sql12/installer/squirrelsql-source/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-source/pom.xml 2010-11-07 11:52:53 UTC (rev 5958)
+++ trunk/sql12/installer/squirrelsql-source/pom.xml 2010-11-09 22:45:33 UTC (rev 5959)
@@ -1,11 +1,12 @@
<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>
- <artifactId>installer</artifactId>
<groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrel-root-pom</artifactId>
<version>3.2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>squirrelsql-source</artifactId>
Modified: trunk/sql12/installer/squirrelsql-update-site/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-update-site/pom.xml 2010-11-07 11:52:53 UTC (rev 5958)
+++ trunk/sql12/installer/squirrelsql-update-site/pom.xml 2010-11-09 22:45:33 UTC (rev 5959)
@@ -1,16 +1,17 @@
-<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>
<groupId>net.sf.squirrel-sql</groupId>
- <artifactId>installer</artifactId>
+ <artifactId>squirrel-root-pom</artifactId>
<version>3.2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
+
<artifactId>squirrelsql-update-site</artifactId>
<packaging>jar</packaging>
+
<name>SQuirreL-SQL Update Site Project</name>
<description>
This project is used to assemble the jars that produce the update site, and
@@ -56,7 +57,7 @@
<url>https://www.squirrel-sql.org/hudson/</url>
</ciManagement>
<dependencies>
-
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>squirrelsql-installer-deps</artifactId>
@@ -127,7 +128,7 @@
<stripVersion>true</stripVersion>
<includeClassifiers>assembly</includeClassifiers>
<includeTypes>zip</includeTypes>
-<!-- <excludeTransitive>true</excludeTransitive>-->
+ <!-- <excludeTransitive>true</excludeTransitive>-->
<outputDirectory>${project.build.directory}/release/plugin</outputDirectory>
</configuration>
</execution>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
