|
From: <man...@us...> - 2010-09-06 16:56:43
|
Revision: 5874
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5874&view=rev
Author: manningr
Date: 2010-09-06 16:56:33 +0000 (Mon, 06 Sep 2010)
Log Message:
-----------
1) Removed squirrelsql-test-utils as this doesn't appear to work consistently in all plugins and I misunderstood the best practice listed here: http://www.sonatype.com/books/mvnex-book/reference/optimizing-sect-dependencies.html. This pattern had the effect of causing 'mvn dependency:analyze' to complain about used non-declared dependencies and also caused some plugin tests to fail to compile when pluginManagement section in the parent pom was in use. Replaced this with direct plugin-managed dependencies.
2) Removed versionId/groupId wherever they could be inherited by the parent pom.
3) Removed dependency versions wherever they could be inherited by the parent pom.
4) Removed plugin versions wherever they could be inherited by the parent pom.
4) Added parent relative path.
5) Replaced hard-coded version for shared third-party dependencies with variable set in parent pom.
Modified Paths:
--------------
trunk/sql12/app/pom.xml
trunk/sql12/doc/pom.xml
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/pom.xml
trunk/sql12/installer/pom.xml
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
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/example/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/laf/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-plugins-assembly-descriptor/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
trunk/sql12/squirrelsql-integration-environment/pom.xml
trunk/sql12/squirrelsql-translations/pom.xml
trunk/sql12/web-site/pom.xml
Removed Paths:
-------------
trunk/sql12/squirrelsql-test-utils/
Property Changed:
----------------
trunk/sql12/app/
Property changes on: trunk/sql12/app
___________________________________________________________________
Modified: svn:ignore
- target
.settings
.project
.classpath
+ target
.settings
.project
.classpath
update
Modified: trunk/sql12/app/pom.xml
===================================================================
--- trunk/sql12/app/pom.xml 2010-09-05 11:22:45 UTC (rev 5873)
+++ trunk/sql12/app/pom.xml 2010-09-06 16:56:33 UTC (rev 5874)
@@ -5,16 +5,15 @@
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
<version>3.2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.sf.squirrel-sql</groupId>
+
<artifactId>squirrel-sql</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
+
<name>SQuirreL Main Application Jar</name>
<description>
- This is the jar that contains the main application classes
- which are very
- specific to SQuirreLSQL.
+ This is the jar that contains the main application classes which are very specific to SQuirreLSQL.
</description>
<inceptionYear>2001</inceptionYear>
<developers>
@@ -69,7 +68,6 @@
<dependency>
<groupId>jgoodies</groupId>
<artifactId>forms</artifactId>
- <version>1.0.5</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -78,17 +76,30 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>squirrelsql-test-utils</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
+ <groupId>gsbase</groupId>
+ <artifactId>gsbase</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ </dependency>
</dependencies>
<build>
<!--
- Filter in the version from the version-plugin below, into
- Version.properties. Turn off filtering for all other files here
+ Filter in the version from the version-plugin below, into Version.properties. Turn off filtering
+ for all other files here
-->
<resources>
<resource>
@@ -173,31 +184,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <!--
- Since generating javadoc can be time-consuming, this is not done
- unless a "javadoc" profile is activated.
- -->
- <profile>
- <id>javadoc</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc-plugin-version}</version>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
Modified: trunk/sql12/doc/pom.xml
===================================================================
--- trunk/sql12/doc/pom.xml 2010-09-05 11:22:45 UTC (rev 5873)
+++ trunk/sql12/doc/pom.xml 2010-09-06 16:56:33 UTC (rev 5874)
@@ -6,11 +6,10 @@
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
<version>3.2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.sf.squirrel-sql</groupId>
<artifactId>doc</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SQuirreL-SQL Documentation</name>
@@ -66,7 +65,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${jar-plugin-version}</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
@@ -75,32 +73,5 @@
</plugin>
</plugins>
</build>
- <profiles>
- <!--
- Since signing jars is probably only useful for releasing, this is not done unless the "sign-jar" profile
- is activated
- -->
- <profile>
- <id>sign-jar</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>${gpg-plugin-version}</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
\ No newline at end of file
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2010-09-05 11:22:45 UTC (rev 5873)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2010-09-06 16:56:33 UTC (rev 5874)
@@ -21,6 +21,8 @@
Incorporated patch which provides a node under each table in the object tree that lists all of the
constraints for that table. (Thanks to Bogdan Cristian Paulon)
+Netezza Plugin: Added support for displaying external tables in the object tree.
+
Bug-fixes:
Firebird Manger Plugin: Removed dialog (that pointed out missig Firebird driver) from startup routines.
Modified: trunk/sql12/fw/pom.xml
===================================================================
--- trunk/sql12/fw/pom.xml 2010-09-05 11:22:45 UTC (rev 5873)
+++ trunk/sql12/fw/pom.xml 2010-09-06 16:56:33 UTC (rev 5874)
@@ -1,293 +1,275 @@
<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>
+ <parent>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrel-root-pom</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <groupId>net.sf.squirrel-sql</groupId>
- <artifactId>fw</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <artifactId>fw</artifactId>
+ <packaging>jar</packaging>
- <name>Framework Library</name>
- <description>
+ <name>Framework Library</name>
+ <description>
The framework library contains utility classes that are generic and useful for building applications
that introspect a database via JDBC. These are not intended to be SQuirreLSQL-specific and could be
used by other projects JDBC front-end applications. This project is guaranteed to have no code
dependencies on other SQuirreLSQL projects and could therefore be used when building a different
JDBC front-end application.
</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 General Public License</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 General Public License</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>
- <dependencies>
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>2.7.5</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-attrs</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>${hibernate-annotations-version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-commons-annotations</artifactId>
- <version>${hibernate-annotations-version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>3.3.1.ga</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.4.sp1</version>
- <exclusions>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
+ <dependencies>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.5</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>1.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>${hibernate-annotations-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <version>${hibernate-annotations-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>3.3.1.ga</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.4.sp1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.jexcelapi</groupId>
- <artifactId>jxl</artifactId>
- <version>2.6.10</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.15</version>
- <exclusions>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>be.cyberelf.nanoxml</groupId>
- <artifactId>nanoxml</artifactId>
- <version>2.2.3</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring-framework-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring-framework-version}</version>
- <exclusions>
- <exclusion>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>${spring-framework-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring-framework-version}</version>
- </dependency>
- <dependency>
- <groupId>org.antlr</groupId>
- <artifactId>stringtemplate</artifactId>
- <version>3.1-b1</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>squirrelsql-test-utils</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${compiler-plugin-version}</version>
- <configuration>
- <!-- http://maven.apache.org/plugins/maven-compiler-plugin/ -->
- <source>${javac-source-version}</source>
- <target>${javac-target-version}</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire-plugin-version}</version>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <!-- This is temporarily disabled because it prevents any tests from running for some
- unknown reason -->
-<!-- <parallel>${surefire-parallel-type}</parallel>-->
-<!-- <threadCount>${surefire-thread-count}</threadCount>-->
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${jar-plugin-version}</version>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>${source-plugin-version}</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <!--
- Since generating javadoc can be time-consuming, this is not done unless a "javadoc" profile is
- activated.
- -->
- <profile>
- <id>javadoc</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc-plugin-version}</version>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jexcelapi</groupId>
+ <artifactId>jxl</artifactId>
+ <version>2.6.10</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.15</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>be.cyberelf.nanoxml</groupId>
+ <artifactId>nanoxml</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring-framework-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring-framework-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>${spring-framework-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring-framework-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>stringtemplate</artifactId>
+ <version>3.1-b1</version>
+ </dependency>
+ <dependency>
+ <groupId>gsbase</groupId>
+ <artifactId>gsbase</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- http://maven.apache.org/plugins/maven-compiler-plugin/ -->
+ <source>${javac-source-version}</source>
+ <target>${javac-target-version}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <!--
+ This is temporarily disabled because it prevents any tests from running for some unknown
+ reason
+ -->
+ <!-- <parallel>${surefire-parallel-type}</parallel>-->
+ <!-- <threadCount>${surefire-thread-count}</threadCount>-->
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/sql12/installer/pom.xml
===================================================================
--- trunk/sql12/installer/pom.xml 2010-09-05 11:22:45 UTC (rev 5873)
+++ trunk/sql12/installer/pom.xml 2010-09-06 16:56:33 UTC (rev 5874)
@@ -6,11 +6,10 @@
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
<version>3.2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.sf.squirrel-sql</groupId>
<artifactId>installer</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Installer Module Pom</name>
Modified: trunk/sql12/installer/squirrelsql-installer-deps/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2010-09-05 11:22:45 UTC (rev 5873)
+++ trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2010-09-06 16:56:33 UTC (rev 5874)
@@ -6,9 +6,7 @@
<groupId>net.sf.squirrel-sql</groupId>
<version>3.2.0-SNAPSHOT</version>
</parent>
- <groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrelsql-installer-deps</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Installer Dependencies</name>
<description>This pom collects all of the common dependencies shared by each the installers.</description>
@@ -302,7 +300,7 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>net.sf.squirrel-sql</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>squirrelsql-java-version-checker</artifactId>
<version>${project.version}</version>
<type>jar</type>
Modified: trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml 2010-09-05 11:22:45 UTC (rev 5873)
+++ trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml 2010-09-06 16:56:33 UTC (rev 5874)
@@ -8,9 +8,7 @@
<version>3.2.0-SNAPSHOT</version>
</parent>
- <groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrelsql-java-version-checker</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SQuirreL-SQL Java Version Checker</name>
@@ -69,7 +67,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${jar-plugin-version}</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
Modified: trunk/sql12/installer/squirrelsql-launcher/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-launcher/pom.xml 2010-09-05 11:22:45 UTC (rev 5873)
+++ trunk/sql12/installer/squirrelsql-launcher/pom.xml 2010-09-06 16:56:33 UTC (rev 5874)
@@ -8,9 +8,7 @@
<version>3.2.0-SNAPSHOT</version>
</parent>
- <groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrelsql-launcher</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SQuirrel-SQL Launcher Scripts</name>
@@ -64,7 +62,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${jar-plugin-version}</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
Modified: trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2010-09-05 11:22:45 UTC (rev 5873)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2010-09-06 16:56:33 UTC (rev 5874)
@@ -7,10 +7,9 @@
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
<version>3.2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrelsql-macosx-installer</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<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>
@@ -60,15 +59,15 @@
</properties>
<dependencies>
<dependency>
- <groupId>net.sf.squirrel-sql</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>squirrelsql-installer-deps</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
- <groupId>net.sf.squirrel-sql</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>squirrelsql-update-site</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql.plugins</groupId>
Modified: trunk/sql12/installer/squirrelsql-other-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2010-09-05 11:22:45 UTC (rev 5873)
+++ trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2010-09-06 16:56:33 UTC (rev 5874)
@@ -5,12 +5,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sf.squirrel-sql</groupId>
- <artifactId>squirrel-root-pom</artifactId>
+ <artifactId>installer</artifactId>
<version>3.2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrelsql-other-installer</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SQuirreL-SQL Generic Installer</name>
<description>This project is used to build the generic installer</description>
@@ -59,15 +58,15 @@
</properties>
<dependencies>
<dependency>
- <groupId>net.sf.squirrel-sql</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>squirrelsql-installer-deps</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
- <groupId>net.sf.squirrel-sql</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>squirrelsql-update-site</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<build>
@@ -103,7 +102,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>${dependency-plugin-version}</version>
<executions>
<execution>
<id>application-libraries</id>
Modified: trunk/sql12/installer/squirrelsql-source/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-source/pom.xml 2010-09-05 11:22:45 UTC (rev 5873)
+++ trunk/sql12/installer/squirrelsql-source/pom.xml 2010-09-06 16:56:33 UTC (rev 5874)
@@ -5,10 +5,12 @@
<artifactId>installer</artifactId>
<groupId>net.sf.squirrel-sql</groupId>
<version>3.2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.sf.squirrel-sql</groupId>
+
<artifactId>squirrelsql-source</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
<name>SQuirreL SQL Client Source Archive (Aggregate)</name>
<description>
This is a project to create a single source archive of the entire source tree as a
@@ -63,7 +65,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
- <version>1.4</version>
<executions>
<execution>
<configuration>
@@ -80,7 +81,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${assembly-plugin-version}</version>
<executions>
<execution>
<id>create-source-archive</id>
@@ -111,7 +111,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
<configuration>
Modified: trunk/sql12/installer/squirrelsql-update-site/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-update-site/pom.xml 2010-09-05 11:22:45 UTC (rev 5873)
+++ trunk/sql12/installer/squirrelsql-update-site/pom.xml 2010-09-06 16:56:33 UTC (rev 5874)
@@ -7,10 +7,9 @@
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>installer</artifactId>
<version>3.2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrelsql-update-site</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SQuirreL-SQL Update Site Project</name>
<description>
Modified: trunk/sql12/plugins/cache/pom.xml
===================================================================
--- trunk/sql12/plugins/cache/pom.xml 2010-09-05 11:22:45 UTC (rev 5873)
+++ trunk/sql12/plugins/cache/pom.xml 2010-09-06 16:56:33 UTC (rev 5874)
@@ -7,10 +7,9 @@
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
<version>3.2.0-SNAPSHOT</version>
+ <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>cache</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Cache Plugin</name>
<description>Cache Plugin</description>
@@ -56,28 +55,38 @@
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>fw</artifactId>
- <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.sf.squirrel-sql</groupId>
- <artifactId>squirrelsql-test-utils</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <type>pom</type>
- <scope>test</scope>
+ <groupId>gsbase</groupId>
+ <artifactId>gsbase</artifactId>
</dependency>
- <dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <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>
@@ -87,54 +96,21 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>${source-plugin-version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire-plugin-version}</version>
- <configuration>
- <parallel>${surefire-parallel-type}</parallel>
- <threadCount>${surefire-thread-count}</threadCount>
- </configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${jar-plugin-version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${assembly-plugin-version}</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs-plugin-version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>${pmd-plugin-version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle-plugin-version}</version>
- </plugin>
</plugins>
</build>
- <profiles>
- <!--
- Since generating javadoc can be time-consuming, this is not done unless a "javadoc" profile is activated.
- -->
- <profile>
- <id>javadoc</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc-plugin-version}</version>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
\ No newline at end of file
Modified: trunk/sql12/plugins/codecompletion/pom.xml
===================================================================
--- trunk/sql12/plugins/codecompletion/pom.xml 2010-09-05 11:22:45 UTC (rev 5873)
+++ trunk/sql12/plugins/codecompletion/pom.xml 2010-09-06 16:56:33 UTC (rev 5874)
@@ -7,10 +7,9 @@
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
<version>3.2.0-SNAPSHOT</version>
+ <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>codecompletion</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Codecompletion Plugin</name>
<description>Codecompletion Plugin</description>
@@ -56,27 +55,37 @@
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>fw</artifactId>
- <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.sf.squirrel-sql</groupId>
- <artifactId>squirrelsql-test-utils</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <type>pom</type>
- <scope>test</scope>
+ <groupId>gsbase</groupId>
+ <artifactId>gsbase</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ </dependency>
</dependencies>
<properties>
<pluginClassName>net.sourceforge.squirrel_sql.plugins.codecompletion.CodeCompletionPlugin</pluginClassName>
@@ -84,54 +93,21 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>${source-plugin-version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire-plugin-version}</version>
- <configuration>
- <parallel>${surefire-parallel-type}</parallel>
- <threadCount>${surefire-thread-count}</threadCount>
- </configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${jar-plugin-version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${assembly-plugin-version}</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs-plugin-version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>${pmd-plugin-version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle-plugin-version}</version>
- </plugin>
</plugins>
</build>
- <profiles>
- <!--
- Since generating javadoc can be time-consuming, this is not done unless a "javadoc" profile is activated.
- -->
- <profile>
- <id>javadoc</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc-plugin-version}</version>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
\ No newline at end of file
Modified: trunk/sql12/plugins/dataimport/pom.xml
===================================================================
--- trunk/sql12/plugins/dataimport/pom.xml 2010-09-05 11:22:45 UTC (rev 5873)
+++ trunk/sql12/plugins/dataimport/pom.xml 2010-09-06 16:56:33 UTC (rev 5874)
@@ -7,10 +7,9 @@
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
<version>3.2.0-SNAPSHOT</version>
+ <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>dataimport</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Dataimport Plugin</name>
<description>Dataimport Plugin</description>
@@ -56,27 +55,37 @@
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>fw</artifactId>
- <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.sf.squirrel-sql</groupId>
- <artifactId>squirrelsql-test-utils</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <type>pom</type>
- <scope>test</scope>
+ <groupId>gsbase</groupId>
+ <artifactId>gsbase</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ </dependency>
</dependencies>
<properties>
<pluginClassName>net.sourceforge.squirrel_sql.plugins.dataimport.DataImportPlugin</pluginClassName>
@@ -84,54 +93,21 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>${source-plugin-version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire-plugin-version}</version>
- <configuration>
- <parallel>${surefire-parallel-type}</parallel>
- <threadCount>${surefire-thread-count}</threadCount>
- </configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${jar-plugin-version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${assembly-plugin-version}</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs-plugin-version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>${pmd-plugin-version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle-plugin-version}</version>
- </plugin>
</plugins>
</build>
- <profiles>
- <!--
- Since generating javadoc can be time-consuming, this is not done unless a "javadoc" profile is activated.
- -->
- <profile>
- <id>javadoc</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc-plugin-version}</version>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
\ No newline at end of file
Modified: trunk/sql12/plugins/db2/pom.xml
===================================================================
--- trunk/sql12/plugins/db2/pom.xml 2010-09-05 11:22:45 UTC (rev 5873)
+++ trunk/sql12/plugins/db2/pom.xml 2010-09-06 16:56:33 UTC (rev 5874)
@@ -7,11 +7,12 @@
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
<version>3.2.0-SNAPSHOT</version>
+ <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
+
<artifactId>db2</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
+
<name>Db2 Plugin</name>
<description>Db2 Plugin</description>
<inceptionYear>2001</inceptionYear>
@@ -56,27 +57,43 @@
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>fw</artifactId>
- <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>fw</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>gsbase</groupId>
+ <artifactId>gsbase</artifactId>
</dependency>
<dependency>
- <groupId>net.sf.squirrel-sql</groupId>
- <artifactId>squirrelsql-test-utils</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <type>pom</type>
- <scope>test</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ </dependency>
</dependencies>
<properties>
<pluginClassName>net.sourceforge.squirrel_sql.plugins.db2.DB2Plugin</pluginClassName>
@@ -84,54 +101,21 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>${source-plugin-version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire-plugin-version}</version>
- <configuration>
- <parallel>${surefire-parallel-type}</parallel>
- <threadCount>${surefire-thread-count}</threadCount>
- </configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${jar-plugin-version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${assembly-plugin-version}</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs-plugin-version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>${pmd-plugin-version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle-plugin-version}</version>
- </plugin>
</plugins>
</build>
- <profiles>
- <!--
- Since generating javadoc can be time-consuming, this is not done unless a "javadoc" profile is activated.
- -->
- <profile>
- <id>javadoc</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc-plugin-version}</version>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
\ No newline at end of file
Modified: trunk/sql12/plugins/dbcopy/pom.xml
===================================================================
--- trunk/sql12/plugins/dbcopy/pom.xml 2010-09-05 11:22:45 UTC (rev 5873)
+++ trunk/sql12/plugins/dbcopy/pom.xml 2010-09-06 16:56:33 UTC (rev 5874)
@@ -7,10 +7,9 @@
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
<version>3.2.0-SNAPSHOT</version>
+ <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>dbcopy</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Dbcopy Plugin</name>
<description>Dbcopy Plugin</description>
@@ -56,27 +55,37 @@
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>fw</artifactId>
- <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.sf.squirrel-sql</groupId>
- <artifactId>squirrelsql-test-utils</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <type>pom</type>
- <scope>test</scope>
+ <groupId>gsbase</groupId>
+ <artifactId>gsbase</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ </dependency>
</dependencies>
<properties>
<pluginClassName>net.sourceforge.squirrel_sql.plugins.dbcopy.DBCopyPlugin</pluginClassName>
@@ -84,54 +93,21 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>${source-plugin-version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire-plugin-version}</version>
- <configuration>
- <parallel>${surefire-parallel-type}</parallel>
- <threadCount>${surefire-thread-count}</threadCount>
- </configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${jar-plugin-version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${assembly-plugin-version}</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs-plugin-version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>${pmd-plugin-version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle-plugin-version}</version>
- </plugin>
</plugins>
</build>
- <profiles>
- <!--
- Since generating javadoc can be time-consuming, this is not done unless a "javadoc" profile is activated.
- -->
- <profile>
- <id>javadoc</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc-plugin-version}</version>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
\ No newline at end of file
Modified: trunk/sql12/plugins/dbdiff/pom.xml
===================================================================
--- trunk/sql12/plugins/dbdiff/pom.xml 2010-09-05 11:22:45 UTC (rev 5873)
+++ trunk/sql12/plugins/dbdiff/pom.xml 2010-09-06 16:56:33 UTC (rev 5874)
@@ -7,10 +7,9 @@
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
<version>3.2.0-SNAPSHOT</version>
+ <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>dbdiff</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Dbdiff Plugin</name>
<description>Dbdiff Plugin</description>
@@ -56,27 +55,37 @@
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>fw</artifactId>
- <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.sf.squirrel-sql</groupId>
- <artifactId>squirrelsql-test-utils</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- <type>pom</type>
- <scope>test</scope>
+ <groupId>gsbase</groupId>
+ <artifactId>gsbase</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ </dependency>
</dependencies>
<properties>
<pluginClassName>net.sourceforge.squirrel_sql.plugins.dbdiff.DBDiffPlugin</pluginClassName>
@@ -84,54 +93,21 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>${source-plugin-version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire-plugin-version}</version>
- <configuration>
- <parallel>${surefire-parallel-type}</parallel>
- <threadCount>${surefire-thread-count}</threadCount>
- </configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>${jar-plugin-version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${assembly-plugin-version}</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs-plugin-version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>${pmd-plugin-version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle-plugin-version}</version>
- </plugin>
</plugins>
</build>
- <profiles>
- <!--
- Since generating javadoc can be time-consuming, this is not done unless a "javadoc" profile is activated.
- -->
- <profile>
- <id>javadoc</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc-plugin-version}</version>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</p...
[truncated message content] |
