|
From: <man...@us...> - 2010-05-02 17:48:25
|
Revision: 5611
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5611&view=rev
Author: manningr
Date: 2010-05-02 17:48:17 +0000 (Sun, 02 May 2010)
Log Message:
-----------
Fixed inheritance of test dependencies in generated plugins poms.
Modified Paths:
--------------
trunk/mavenize/mavenize.pl
trunk/mavenize/plugin-pom.xml
trunk/mavenize/squirrelsql-plugins-parent-pom/pom.xml
Modified: trunk/mavenize/mavenize.pl
===================================================================
--- trunk/mavenize/mavenize.pl 2010-05-01 18:15:31 UTC (rev 5610)
+++ trunk/mavenize/mavenize.pl 2010-05-02 17:48:17 UTC (rev 5611)
@@ -41,34 +41,27 @@
$onlyCopyPoms = 0;
$cache_deps = <<"EOF";
-<dependencies>
<dependency>
<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
<artifactId>CacheDB</artifactId>
<version>2008.2.0.526.0</version>
</dependency>
- </dependencies>
EOF
$firebirdmanager_deps = <<"EOF";
-<dependencies>
<dependency>
<groupId>org.firebirdsql.jdbc</groupId>
<artifactId>jaybird</artifactId>
<version>2.1.6</version>
</dependency>
- </dependencies>
EOF
$oracle_deps = <<"EOF";
-<dependencies>
<dependency>
<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
<artifactId>treetable</artifactId>
<version>20040121</version>
</dependency>
- </dependencies>
EOF
$sqlval_deps = <<"EOF";
-<dependencies>
<dependency>
<groupId>axis</groupId>
<artifactId>axis</artifactId>
@@ -89,10 +82,8 @@
<artifactId>axis-wsdl4j</artifactId>
<version>1.2</version>
</dependency>
- </dependencies>
EOF
$syntax_deps = <<"EOF";
-<dependencies>
<dependency>
<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>
<artifactId>com-fifesoft-common</artifactId>
@@ -143,7 +134,6 @@
<artifactId>ostermiller-syntax</artifactId>
<version>1.1.1</version>
</dependency>
- </dependencies>
EOF
#################################################################################################
@@ -259,6 +249,7 @@
else {
$dependencies = '';
}
+
print "Creating new pom: $newPomFile \n"
. "\t artifactId=$artifactId \n"
Modified: trunk/mavenize/plugin-pom.xml
===================================================================
--- trunk/mavenize/plugin-pom.xml 2010-05-01 18:15:31 UTC (rev 5610)
+++ trunk/mavenize/plugin-pom.xml 2010-05-02 17:48:17 UTC (rev 5611)
@@ -54,8 +54,32 @@
<url>https://www.squirrel-sql.org/hudson/</url>
</ciManagement>
+ <dependencies>
+
@@--$dependencies--@@
+ <dependency>
+ <groupId>gsbase</groupId>
+ <artifactId>gsbase</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
Modified: trunk/mavenize/squirrelsql-plugins-parent-pom/pom.xml
===================================================================
--- trunk/mavenize/squirrelsql-plugins-parent-pom/pom.xml 2010-05-01 18:15:31 UTC (rev 5610)
+++ trunk/mavenize/squirrelsql-plugins-parent-pom/pom.xml 2010-05-02 17:48:17 UTC (rev 5611)
@@ -55,25 +55,25 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>net.sf.squirrel-sql</groupId>
<artifactId>fw</artifactId>
- <version>${project.version}</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>${project.version}</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>net.sf.squirrel-sql</groupId>
<artifactId>fw</artifactId>
- <version>${project.version}</version>
+ <version>3.1.0-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>${project.version}</version>
+ <version>3.1.0-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
