|
From: <man...@us...> - 2010-12-29 20:27:05
|
Revision: 6075
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6075&view=rev
Author: manningr
Date: 2010-12-29 20:26:57 +0000 (Wed, 29 Dec 2010)
Log Message:
-----------
Switched to using a more reliable way of resolving the plugin assembly descriptor file in the plugin projects. This should hopefully remove any reliance on a particular version of maven, the dependency/assembly plugin or any combination thereof.
Modified Paths:
--------------
trunk/sql12/plugins/cache/pom.xml
trunk/sql12/plugins/codecompletion/pom.xml
trunk/sql12/plugins/dataimport/pom.xml
trunk/sql12/plugins/db2/pom.xml
trunk/sql12/plugins/dbcopy/pom.xml
trunk/sql12/plugins/dbdiff/pom.xml
trunk/sql12/plugins/derby/pom.xml
trunk/sql12/plugins/editextras/pom.xml
trunk/sql12/plugins/exportconfig/pom.xml
trunk/sql12/plugins/favs/pom.xml
trunk/sql12/plugins/firebird/pom.xml
trunk/sql12/plugins/firebirdmanager/pom.xml
trunk/sql12/plugins/graph/pom.xml
trunk/sql12/plugins/h2/pom.xml
trunk/sql12/plugins/hibernate/pom.xml
trunk/sql12/plugins/i18n/pom.xml
trunk/sql12/plugins/informix/pom.xml
trunk/sql12/plugins/macosx/pom.xml
trunk/sql12/plugins/mssql/pom.xml
trunk/sql12/plugins/mysql/pom.xml
trunk/sql12/plugins/netezza/pom.xml
trunk/sql12/plugins/oracle/pom.xml
trunk/sql12/plugins/postgres/pom.xml
trunk/sql12/plugins/refactoring/pom.xml
trunk/sql12/plugins/sessionscript/pom.xml
trunk/sql12/plugins/smarttools/pom.xml
trunk/sql12/plugins/sqlbookmark/pom.xml
trunk/sql12/plugins/sqlparam/pom.xml
trunk/sql12/plugins/sqlreplace/pom.xml
trunk/sql12/plugins/sqlscript/pom.xml
trunk/sql12/plugins/sqlval/pom.xml
trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml
trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml
trunk/sql12/plugins/sybase/pom.xml
trunk/sql12/plugins/syntax/pom.xml
trunk/sql12/plugins/userscript/pom.xml
trunk/sql12/pom.xml
Modified: trunk/sql12/plugins/cache/pom.xml
===================================================================
--- trunk/sql12/plugins/cache/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/cache/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -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>
@@ -87,16 +85,20 @@
<artifactId>mockito-all</artifactId>
</dependency>
<dependency>
- <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
- <artifactId>CacheDB</artifactId>
- <version>2008.2.0.526.0</version>
- </dependency>
+ <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
+ <artifactId>CacheDB</artifactId>
+ <version>2008.2.0.526.0</version>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/codecompletion/pom.xml
===================================================================
--- trunk/sql12/plugins/codecompletion/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/codecompletion/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/dataimport/pom.xml
===================================================================
--- trunk/sql12/plugins/dataimport/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/dataimport/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/db2/pom.xml
===================================================================
--- trunk/sql12/plugins/db2/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/db2/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -99,6 +99,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/dbcopy/pom.xml
===================================================================
--- trunk/sql12/plugins/dbcopy/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/dbcopy/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/dbdiff/pom.xml
===================================================================
--- trunk/sql12/plugins/dbdiff/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/dbdiff/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/derby/pom.xml
===================================================================
--- trunk/sql12/plugins/derby/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/derby/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/editextras/pom.xml
===================================================================
--- trunk/sql12/plugins/editextras/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/editextras/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/exportconfig/pom.xml
===================================================================
--- trunk/sql12/plugins/exportconfig/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/exportconfig/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/favs/pom.xml
===================================================================
--- trunk/sql12/plugins/favs/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/favs/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/firebird/pom.xml
===================================================================
--- trunk/sql12/plugins/firebird/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/firebird/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/firebirdmanager/pom.xml
===================================================================
--- trunk/sql12/plugins/firebirdmanager/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/firebirdmanager/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -106,6 +106,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/graph/pom.xml
===================================================================
--- trunk/sql12/plugins/graph/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/graph/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/h2/pom.xml
===================================================================
--- trunk/sql12/plugins/h2/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/h2/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/hibernate/pom.xml
===================================================================
--- trunk/sql12/plugins/hibernate/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/hibernate/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/i18n/pom.xml
===================================================================
--- trunk/sql12/plugins/i18n/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/i18n/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/informix/pom.xml
===================================================================
--- trunk/sql12/plugins/informix/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/informix/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -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>
<groupId>net.sf.squirrel-sql.plugins</groupId>
@@ -91,6 +92,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/macosx/pom.xml
===================================================================
--- trunk/sql12/plugins/macosx/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/macosx/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/mssql/pom.xml
===================================================================
--- trunk/sql12/plugins/mssql/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/mssql/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/mysql/pom.xml
===================================================================
--- trunk/sql12/plugins/mysql/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/mysql/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/netezza/pom.xml
===================================================================
--- trunk/sql12/plugins/netezza/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/netezza/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/oracle/pom.xml
===================================================================
--- trunk/sql12/plugins/oracle/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/oracle/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -96,6 +96,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/postgres/pom.xml
===================================================================
--- trunk/sql12/plugins/postgres/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/postgres/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/refactoring/pom.xml
===================================================================
--- trunk/sql12/plugins/refactoring/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/refactoring/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/sessionscript/pom.xml
===================================================================
--- trunk/sql12/plugins/sessionscript/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/sessionscript/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/smarttools/pom.xml
===================================================================
--- trunk/sql12/plugins/smarttools/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/smarttools/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/sqlbookmark/pom.xml
===================================================================
--- trunk/sql12/plugins/sqlbookmark/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/sqlbookmark/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/sqlparam/pom.xml
===================================================================
--- trunk/sql12/plugins/sqlparam/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/sqlparam/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/sqlreplace/pom.xml
===================================================================
--- trunk/sql12/plugins/sqlreplace/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/sqlreplace/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/sqlscript/pom.xml
===================================================================
--- trunk/sql12/plugins/sqlscript/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/sqlscript/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/sqlval/pom.xml
===================================================================
--- trunk/sql12/plugins/sqlval/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/sqlval/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -111,6 +111,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -99,6 +99,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -207,15 +207,33 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>copy-assembly-descriptor-file</id>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>squirrelsql-plugins-assembly-descriptor</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <includes>**\/*.xml</includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${assembly-plugin-version}</version>
- <dependencies>
- <dependency>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>squirrelsql-plugins-assembly-descriptor</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
<executions>
<execution>
<id>create-plugin-archives</id>
@@ -224,9 +242,9 @@
<goal>single</goal>
</goals>
<configuration>
- <descriptorRefs>
- <descriptorRef>squirrelsql-plugin-assembly</descriptorRef>
- </descriptorRefs>
+ <descriptors>
+ <descriptor>${project.build.directory}/assemblies/squirrelsql-plugin-assembly.xml</descriptor>
+ </descriptors>
<!--
This must be true, or else it will cause this to become the main artifact for each plugin
project
Modified: trunk/sql12/plugins/sybase/pom.xml
===================================================================
--- trunk/sql12/plugins/sybase/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/sybase/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/syntax/pom.xml
===================================================================
--- trunk/sql12/plugins/syntax/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/syntax/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -141,6 +141,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/plugins/userscript/pom.xml
===================================================================
--- trunk/sql12/plugins/userscript/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/plugins/userscript/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -91,6 +91,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
Modified: trunk/sql12/pom.xml
===================================================================
--- trunk/sql12/pom.xml 2010-12-29 19:01:10 UTC (rev 6074)
+++ trunk/sql12/pom.xml 2010-12-29 20:26:57 UTC (rev 6075)
@@ -60,12 +60,7 @@
<assembly-plugin-version>2.2</assembly-plugin-version>
<checkstyle-plugin-version>2.2</checkstyle-plugin-version>
<compiler-plugin-version>2.3.2</compiler-plugin-version>
- <!-- The following build error is encountered in each plugin project when using 2.1 version of this
- plugin with Maven 2.2.1:
- Error reading assemblies: Descriptor with ID 'squirrelsql-plugin-assembly' not found
- So, until everyone is using Maven 3, keep this version at 2.0.
- -->
- <dependency-plugin-version>2.0</dependency-plugin-version>
+ <dependency-plugin-version>2.1</dependency-plugin-version>
<exec-plugin-version>1.2</exec-plugin-version>
<findbugs-plugin-version>2.1</findbugs-plugin-version>
<gpg-plugin-version>1.1</gpg-plugin-version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
