|
From: <man...@us...> - 2011-05-08 23:00:38
|
Revision: 6249
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6249&view=rev
Author: manningr
Date: 2011-05-08 23:00:32 +0000 (Sun, 08 May 2011)
Log Message:
-----------
Use the same mechanism for building the update site artifacts that is also used by the installers.
Modified Paths:
--------------
trunk/sql12/installer/pom.xml
trunk/sql12/installer/squirrelsql-update-site/pom.xml
Modified: trunk/sql12/installer/pom.xml
===================================================================
--- trunk/sql12/installer/pom.xml 2011-05-08 22:56:38 UTC (rev 6248)
+++ trunk/sql12/installer/pom.xml 2011-05-08 23:00:32 UTC (rev 6249)
@@ -65,13 +65,17 @@
<module>squirrelsql-update-site</module>
</modules>
+ <properties>
+ <app-lib-output-dir>${staging.dir}/lib</app-lib-output-dir>
+ </properties>
+
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrelsql-dependency-plugin</artifactId>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
<executions>
<execution>
<id>application-libraries</id>
@@ -140,7 +144,7 @@
<includedArtifact>org.mod4j.org.eclipse:osgi</includedArtifact>
<includedArtifact>xml-apis:xml-apis</includedArtifact>
</includedArtifacts>
- <outputDirectory>${staging.dir}/lib</outputDirectory>
+ <outputDirectory>${app-lib-output-dir}</outputDirectory>
</configuration>
</execution>
</executions>
Modified: trunk/sql12/installer/squirrelsql-update-site/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-update-site/pom.xml 2011-05-08 22:56:38 UTC (rev 6248)
+++ trunk/sql12/installer/squirrelsql-update-site/pom.xml 2011-05-08 23:00:32 UTC (rev 6249)
@@ -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-update-site</artifactId>
@@ -55,8 +55,13 @@
<system>Hudson</system>
<url>https://www.squirrel-sql.org/hudson/</url>
</ciManagement>
+
+
+ <properties>
+ <app-lib-output-dir>${project.build.directory}/release/core</app-lib-output-dir>
+ </properties>
+
<dependencies>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>squirrelsql-installer-deps</artifactId>
@@ -77,8 +82,8 @@
</exclusion>
</exclusions>
</dependency>
-
</dependencies>
+
<build>
<plugins>
<!-- Set the squirrelsql.version property if it has not already been set. -->
@@ -96,25 +101,15 @@
</executions>
</plugin>
<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>
<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>
- <excludeArtifactIds>squirrelsql-installer-deps,squirrelsql-java-version-checker</excludeArtifactIds>
- </configuration>
- </execution>
- <execution>
<id>copy-plugin-artifacts</id>
<phase>process-resources</phase>
<goals>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
