Finished Maven migration

10 files changed, 21 insertions, 405 deletions

diff --git a/.checkstyle b/.checkstyle
deleted file mode 100644
index 3eb52c0..0000000
--- a/.checkstyle
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="iciql" location="checkstyle.xml" type="project" description="">
-    <additional-data name="protect-config-file" value="false"/>
-  </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="iciql" local="true">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
-  </fileset>
-</fileset-config>
diff --git a/.classpath b/.classpath
deleted file mode 100644
index c7a5889..0000000
--- a/.classpath
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java" />
-	<classpathentry kind="src" path="src/test/java" output="bin/test-classes" />
-	<classpathentry kind="src" path="src/test/resources" output="bin/test-classes" />
-	<classpathentry kind="lib" path="ext/jcommander-1.17.jar" sourcepath="ext/src/jcommander-1.17.jar" />
-	<classpathentry kind="lib" path="ext/h2-1.4.191.jar" />
-	<classpathentry kind="lib" path="ext/hsqldb-2.3.3.jar" />
-	<classpathentry kind="lib" path="ext/derby-10.12.1.1.jar" />
-	<classpathentry kind="lib" path="ext/derbyclient-10.12.1.1.jar" />
-	<classpathentry kind="lib" path="ext/derbynet-10.12.1.1.jar" />
-	<classpathentry kind="lib" path="ext/mysql-connector-java-5.1.38.jar" />
-	<classpathentry kind="lib" path="ext/postgresql-9.4.1208.jar" />
-	<classpathentry kind="lib" path="ext/sqlite-jdbc-3.8.11.2.jar" />
-	<classpathentry kind="lib" path="ext/slf4j-api-1.7.20.jar" sourcepath="ext/src/slf4j-api-1.7.20.jar" />
-	<classpathentry kind="lib" path="ext/commons-pool-1.5.6.jar" sourcepath="ext/src/commons-pool-1.5.6.jar" />
-	<classpathentry kind="lib" path="ext/commons-dbcp-1.4.jar" sourcepath="ext/src/commons-dbcp-1.4.jar" />
-	<classpathentry kind="lib" path="ext/gson-2.3.jar" sourcepath="ext/src/gson-2.3.jar" />
-	<classpathentry kind="lib" path="ext/xstream-1.4.9.jar" sourcepath="ext/src/xstream-1.4.9.jar" />
-	<classpathentry kind="lib" path="ext/xmlpull-1.1.3.1.jar" />
-	<classpathentry kind="lib" path="ext/xpp3_min-1.1.4c.jar" sourcepath="ext/src/xpp3_min-1.1.4c.jar" />
-	<classpathentry kind="lib" path="ext/activation-1.1.1.jar" sourcepath="ext/src/activation-1.1.1.jar" />
-	<classpathentry kind="lib" path="ext/junit-4.11.jar" sourcepath="ext/src/junit-4.11.jar" />
-	<classpathentry kind="lib" path="ext/jmock-1.0.1.jar" sourcepath="ext/src/jmock-1.0.1.jar" />
-	<classpathentry kind="lib" path="ext/snakeyaml-1.17.jar" sourcepath="ext/src/snakeyaml-1.17.jar" />
-	<classpathentry kind="lib" path="ext/hamcrest-core-1.3.jar" sourcepath="ext/src/hamcrest-core-1.3.jar" />
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-	<classpathentry kind="output" path="bin/classes" />
-</classpath>
diff --git a/.gitignore b/.gitignore
index 637886e..181301d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,9 @@
 /.idea

+/.settings

 /bin

-/build

-/doclava

-/ext

-/javadoc

-/site

 /target

-/*.zip

-/*.jar

-/build.properties

-/derby.log

-/performance.txt

-/performance_db.txt

-/performance_sql.txt

+/*.log

 /testdbs

-/*.sh

-/*.ps1

 /*.iml

+/.classpoath

+/.project

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29..0000000
--- a/.gitmodules
+++ /dev/null
diff --git a/.project b/.project
deleted file mode 100644
index 1b602b8..0000000
--- a/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Iciql</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
-	</natures>
-</projectDescription>
diff --git a/README.md b/README.md
index 0bf1bda..465eb73 100644
--- a/README.md
+++ b/README.md
@@ -64,8 +64,6 @@ Issues & source code @ [GitHub](http://github.com/gitblit/iciql)
 Building iciql

 ----------------

 

-## Maven

-

 You may use Maven to build the project:

 

     mvn clean package

@@ -74,13 +72,6 @@ You may use Maven to run the test suite on the default database:
 

     mvn clean test

 

-## Ant

-

-You may use Ant to build this project:

-

-    ant clean build

-    

-You may execute the full test suite against all tested databases:

- 

-     ant testsuite

+You may use Maven to run the test suite on all tested databases:

 

+    mvn clean exec:exec

diff --git a/build.moxie b/build.moxie
deleted file mode 100644
index 15fe508..0000000
--- a/build.moxie
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# Iciql project descriptor
-#
-
-# Specify minimum Moxie version required to build
-requires: 0.9.2
-
-# Project Metadata
-name: Iciql
-description: 'a model-based database access wrapper for JDBC'
-groupId: com.gitblit.iciql
-artifactId: iciql
-version: 2.0.0
-packaging: jar+zip
-inceptionYear: 2011
-
-# Current stable release
-releaseVersion: 2.0.0
-releaseDate: 2016-04-04
-
-# Project urls
-url: 'http://iciql.com'
-issuesUrl: 'https://github.com/gitblit/iciql/issues'
-mavenUrl: 'http://gitblit.github.io/iciql/maven'
-
-licenses:
-- {
-    name: 'Apache ASL v2.0'
-    url: 'http://www.apache.org/licenses/LICENSE-2.0.html'
-  }
-
-developers:
-- {
-  id: james
-  name: 'James Moger'
-  email: 'james.moger@gmail.com'
-  organization: 'gitblit.com'
-  organizationUrl: 'https://github.com/gitblit'
-  }
-
-scm: {
-  connection: 'scm:git:git://github.com/gitblit/iciql.git'
-  developerConnection: 'scm:git:https://github.com/gitblit/iciql.git'
-  url: 'https://github.com/gitblit/iciql'
-  tag: HEAD
-  }
-
-# Model generation tool
-mainclass: com.iciql.util.GenerateModels
-
-sourceDirectories:
-- compile 'src/main/java'
-- test 'src/test/java'
-- site 'src/site'
-
-resourceDirectories:
-- test 'src/test/resources'
-- site 'src/site/resources'
-
-# compile for Java 6 class format
-tasks: {
-	'mx:javac' : {
-        source: 1.6
-        target: 1.6
-        compiler: javac1.6
-        encoding: UTF-8
-        # stop complaints about bootstrap classpath when compiling with Java 7
-        compilerArgs: '-Xlint:-options'
-    }
-}
-
-# Generate Eclipse project files.
-apply: eclipse
-
-# Copy all retrieved dependencies to the "ext" directory.
-# Generated IDE settings (.classpath, etc) will use the artifacts
-# from this project-relative directory. This allows the IDE settings
-# to be version-controlled and shared.
-dependencyDirectory: ext
-
-# Source all dependencies from the following repositories in the specified order
-repositories: central
-
-properties: {
-	h2.version : 1.4.191
-	hsqldb.version : 2.3.3
-	derby.version : 10.12.1.1
-	mysql.version : 5.6
-	postgresql.version : 9.5
-	sqlite.version : 3.8.11.2
-}
-
-dependencies:
-- provided 'com.beust:jcommander:1.17'
-- provided 'com.h2database:h2:${h2.version}'
-- provided 'org.hsqldb:hsqldb:${hsqldb.version}'
-- provided 'org.apache.derby:derby:${derby.version}'
-- provided 'org.apache.derby:derbyclient:${derby.version}'
-- provided 'org.apache.derby:derbynet:${derby.version}'
-- provided 'mysql:mysql-connector-java:5.1.38'
-- provided 'org.postgresql:postgresql:9.4.1208'
-- provided 'org.xerial:sqlite-jdbc:${sqlite.version}'
-- provided 'org.slf4j:slf4j-api:1.7.20'
-- provided 'commons-pool:commons-pool:1.5.6'
-- provided 'commons-dbcp:commons-dbcp:1.4'
-- provided 'com.google.code.gson:gson:2.3'
-- provided 'com.thoughtworks.xstream:xstream:1.4.9'
-- provided 'org.yaml:snakeyaml:1.17'
-- test 'junit'
-- build 'jacoco'
diff --git a/build.xml b/build.xml
deleted file mode 100644
index eabd62d..0000000
--- a/build.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="iciql" default="build" xmlns:mx="antlib:org.moxie">
-
-	<!--
-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		Retrieve Moxie Toolkit
-
-		documentation @ http://gitblit.github.io/moxie
-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	-->
-	<property name="moxie.version" value="0.9.2" />
-	<property name="moxie.url" value="http://gitblit.github.io/moxie/maven" />
-	<property name="moxie.jar" value="moxie-toolkit-${moxie.version}.jar" />
-	<property name="moxie.dir" value="${user.home}/.moxie" />
-
-	<!-- Download Moxie from it's Maven repository to user.home -->
-	<mkdir dir="${moxie.dir}" />
-	<get src="${moxie.url}/com/gitblit/moxie/moxie-toolkit/${moxie.version}/${moxie.jar}"
-		dest="${moxie.dir}" skipexisting="true" verbose="true" />
-
-	<!-- Register Moxie tasks -->
-	<taskdef uri="antlib:org.moxie">
-		<classpath location="${moxie.dir}/${moxie.jar}" />
-	</taskdef>
-
-
-	<!--
-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		Initialize Moxie and setup build properties
-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	-->
-	<target name="prepare"  description="Retrieves dependencies and sets up build properties">
-
-		<mx:init mxroot="${moxie.dir}" />
-
-	</target>
-
-
-	<!--
-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		Clean
-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	-->
-	<target name="clean" depends="prepare" description="Cleans build directory">
-
-		<mx:clean />
-
-	</target>
-
-
-	<!--
-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		Compile
-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	-->
-	<target name="compile" depends="prepare" description="Compiles iciql from source">
-
-		<mx:javac />
-
-	</target>
-
-
-	<!--
-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		TestSuite
-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	-->
-	<target name="testsuite" depends="compile" description="runs the benchmark test suite against all databases">
-		<echo/>
-		<echo>This will take a minute or two...</echo>
-		<echo/>
-		<mx:javac scope="test" />
-		<mx:run scope="test" classname="com.iciql.test.IciqlSuite">
-			<arg value="--dbFile" />
-			<arg value="${project.outputDirectory}/performance_db.txt" />
-
-			<arg value="--sqlFile" />
-			<arg value="${project.outputDirectory}/performance_sql.txt" />
-		</mx:run>
-	</target>
-
-
-	<!--
-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		Build
-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	-->
-	<target name="build" depends="compile" description="Packages iciql for deployment">
-
-		<!-- Package the jar, javadoc, sources, and zip distribution -->
-		<mx:package />
-
-		<!-- Deploy the artifacts into the version-controlled repository -->
-		<mx:deploy basedir="${basedir}/maven" allowSnapshots="false" />
-
-	</target>
-
-</project>
diff --git a/checkstyle.xml b/checkstyle.xml
deleted file mode 100644
index 49b091b..0000000
--- a/checkstyle.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
-<!--
-    This configuration file was written by the eclipse-cs plugin
-    configuration editor
--->
-<!--
-    Checkstyle-Configuration: iciql Description: none
--->
-<module name="Checker">
-    <property name="severity" value="warning" />
-    <module name="TreeWalker">
-        <property name="tabWidth" value="4" />
-        <module name="ConstantName" />
-        <module name="LocalFinalVariableName" />
-        <module name="LocalVariableName" />
-        <module name="MemberName" />
-        <module name="MethodName" />
-        <module name="PackageName" />
-        <module name="ParameterName" />
-        <module name="StaticVariableName" />
-        <module name="TypeName" />
-        <module name="AvoidStarImport" />
-        <module name="IllegalImport" />
-        <module name="RedundantImport" />
-        <module name="UnusedImports" />
-        <module name="EmptyForIteratorPad" />
-        <module name="MethodParamPad" />
-        <module name="NoWhitespaceAfter">
-            <property name="tokens"
-                value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS" />
-        </module>
-        <module name="NoWhitespaceBefore" />
-        <module name="OperatorWrap">
-            <property name="severity" value="ignore" />
-            <property name="tokens"
-                value="BAND,BOR,BSR,BXOR,COLON,DIV,EQUAL,GE,GT,LAND,LE,LITERAL_INSTANCEOF,LT,MINUS,MOD,NOT_EQUAL,SL,SR,STAR" />
-            <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity"
-                value="inherit" />
-        </module>
-        <module name="ParenPad" />
-        <module name="WhitespaceAfter" />
-        <module name="WhitespaceAround">
-            <property name="tokens"
-                value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS_ASSIGN,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND,WILDCARD_TYPE" />
-        </module>
-        <module name="ModifierOrder" />
-        <module name="RedundantModifier" />
-        <module name="LeftCurly">
-            <property name="tokens"
-                value="CTOR_DEF,INTERFACE_DEF,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,METHOD_DEF" />
-        </module>
-        <module name="NeedBraces" />
-        <module name="RightCurly" />
-        <module name="DoubleCheckedLocking" />
-        <module name="EmptyStatement" />
-        <module name="EqualsHashCode" />
-        <module name="IllegalInstantiation" />
-        <module name="RedundantThrows">
-            <property name="allowUnchecked" value="true" />
-            <property name="allowSubclasses" value="true" />
-            <property name="logLoadErrors" value="true" />
-            <property name="suppressLoadErrors" value="true" />
-        </module>
-        <module name="SimplifyBooleanExpression" />
-        <module name="SimplifyBooleanReturn" />
-        <module name="InterfaceIsType" />
-        <module name="ArrayTypeStyle" />
-        <module name="GenericIllegalRegexp">
-            <property name="severity" value="ignore" />
-            <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity"
-                value="inherit" />
-        </module>
-        <module name="TodoComment">
-            <property name="severity" value="ignore" />
-            <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity"
-                value="inherit" />
-        </module>
-        <module name="UpperEll" />
-        <module name="JavadocType" />
-        <module name="EmptyForInitializerPad" />
-        <module name="CovariantEquals" />
-        <module name="DefaultComesLast" />
-        <module name="DeclarationOrder" />
-        <module name="ExplicitInitialization" />
-        <module name="FallThrough" />
-        <module name="IllegalThrows" />
-        <module name="SuperClone" />
-        <module name="UnnecessaryParentheses" />
-        <module name="TrailingComment" />
-        <module name="PackageHtml">
-            <property name="severity" value="ignore" />
-            <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity"
-                value="inherit" />
-        </module>
-    </module>
-    <module name="FileTabCharacter">
-        <property name="severity" value="ignore" />
-        <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity"
-            value="inherit" />
-    </module>
-    <module name="NewlineAtEndOfFile">
-        <property name="severity" value="ignore" />
-        <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity"
-            value="inherit" />
-    </module>
-    <module name="Translation" />
-</module>
diff --git a/pom.xml b/pom.xml
index 3958b0b..8a584e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,13 +175,27 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12.4</version>
+                <version>2.19.1</version>
                 <configuration>
                     <includes>
                         <include>com/iciql/test/IciqlSuite.java</include>
                     </includes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.4.0</version>
+                <configuration>
+                    <executable>java</executable>
+                    <classpathScope>test</classpathScope>
+                    <arguments>
+                        <argument>-classpath</argument>
+                        <classpath/>
+                        <argument>com.iciql.test.IciqlSuite</argument>
+                    </arguments>
+                </configuration>
+            </plugin>
             <!-- Release plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>