From 0eaa458fe2b85986a6fb4124b98f8c665d6c9392 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 4 Apr 2016 14:56:06 -0400
Subject: [PATCH] Update documentation and tested databases

---
 .classpath      | 23 ++++++++++++-----------
 README.markdown | 32 +++++++++++++++++++++++---------
 build.moxie     | 27 +++++++++++++--------------
 pom.xml         | 22 +++++++++++-----------
 4 files changed, 59 insertions(+), 45 deletions(-)

diff --git a/.classpath b/.classpath
index 8d28b2d..c7a5889 100644
--- a/.classpath
+++ b/.classpath
@@ -4,24 +4,25 @@
 	<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.187.jar" sourcepath="ext/src/h2-1.4.187.jar" />
-	<classpathentry kind="lib" path="ext/hsqldb-2.3.2.jar" sourcepath="ext/src/hsqldb-2.3.2.jar" />
-	<classpathentry kind="lib" path="ext/derby-10.11.1.1.jar" />
-	<classpathentry kind="lib" path="ext/derbyclient-10.11.1.1.jar" />
-	<classpathentry kind="lib" path="ext/derbynet-10.11.1.1.jar" />
-	<classpathentry kind="lib" path="ext/mysql-connector-java-5.1.33.jar" />
-	<classpathentry kind="lib" path="ext/postgresql-9.4-1201-jdbc41.jar" sourcepath="ext/src/postgresql-9.4-1201-jdbc41.jar" />
-	<classpathentry kind="lib" path="ext/sqlite-jdbc-3.8.10.1.jar" sourcepath="ext/src/sqlite-jdbc-3.8.10.1.jar" />
-	<classpathentry kind="lib" path="ext/slf4j-api-1.7.12.jar" sourcepath="ext/src/slf4j-api-1.7.12.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.8.jar" sourcepath="ext/src/xstream-1.4.8.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.15.jar" sourcepath="ext/src/snakeyaml-1.15.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" />
diff --git a/README.markdown b/README.markdown
index caf1b99..9a513e6 100644
--- a/README.markdown
+++ b/README.markdown
@@ -19,10 +19,10 @@ Supported Databases (Unit-Tested)
 -------
 - [H2](http://h2database.com) 1.4
 - [HSQLDB](http://hsqldb.org) 2.3
-- [Derby](http://db.apache.org/derby) 10.11
+- [Derby](http://db.apache.org/derby) 10.12
 - [MySQL](http://mysql.com) 5.6
-- [PostgreSQL](http://postgresql.org) 9.3
-- [SQLite](http://www.sqlite.org) 3.10
+- [PostgreSQL](http://postgresql.org) 9.5
+- [SQLite](http://www.sqlite.org) 3.8
 
 Support for others is possible and may only require creating a simple "dialect" class.
 
@@ -43,10 +43,24 @@ Binaries @ [Iciql Maven Repository](http://gitblit.github.io/iciql/maven/)
 
 Building iciql
 ----------------
-[Eclipse](http://eclipse.org) is recommended for development as the project settings are preconfigured.
 
-1. Import the iciql project into your Eclipse workspace.<br/>
-*There will be lots of build errors.*
-2. Using Ant, execute the `build.xml` script in the project root.<br/>
-*This will download all necessary build dependencies.*
-3. Select your iciql project root and **Refresh** the project, this should correct all build problems.
+## Maven
+
+You may use Maven to build the project:
+
+    mvn clean package
+    
+You may use Maven to run the test suite on the default database:
+
+    mvn clean test
+
+## Ant
+
+You may also use Ant to build this project.
+
+    ant clean build
+    
+You execute the full test suite against all tested databases:
+ 
+     ant testsuite
+
diff --git a/build.moxie b/build.moxie
index e2aacbd..7357aac 100644
--- a/build.moxie
+++ b/build.moxie
@@ -33,10 +33,9 @@ developers:
 - {
   id: james
   name: 'James Moger'
-  url: 'https://plus.google.com/u/0/116428776452027956920'
-  organization: VAS
-  organizationUrl: 'http://www.vas.com'
-  roles: developer
+  email: 'james.moger@gmail.com'
+  organization: 'gitblit.com'
+  organizationUrl: 'https://github.com/gitblit'
   }
 
 scm: {
@@ -83,12 +82,12 @@ dependencyDirectory: ext
 repositories: central
 
 properties: {
-	h2.version : 1.4.187
-	hsqldb.version : 2.3.2
-	derby.version : 10.11.1.1
+	h2.version : 1.4.191
+	hsqldb.version : 2.3.3
+	derby.version : 10.12.1.1
 	mysql.version : 5.6
-	postgresql.version : 9.3
-	sqlite.version : 3.8.10.1
+	postgresql.version : 9.5
+	sqlite.version : 3.8.11.2
 }
 
 dependencies:
@@ -98,14 +97,14 @@ dependencies:
 - 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.33'
-- provided 'org.postgresql:postgresql:9.4-1201-jdbc41'
+- 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.12'
+- 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.8'
-- provided 'org.yaml:snakeyaml:1.15'
+- provided 'com.thoughtworks.xstream:xstream:1.4.9'
+- provided 'org.yaml:snakeyaml:1.17'
 - test 'junit'
 - build 'jacoco'
diff --git a/pom.xml b/pom.xml
index 7024082..afb82bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,63 +57,63 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.187</version>
+            <version>1.4.191</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>2.3.2</version>
+            <version>2.3.3</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
-            <version>10.11.1.1</version>
+            <version>10.12.1.1</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derbyclient</artifactId>
-            <version>10.11.1.1</version>
+            <version>10.12.1.1</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derbynet</artifactId>
-            <version>10.11.1.1</version>
+            <version>10.12.1.1</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.33</version>
+            <version>5.1.38</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>9.4-1201-jdbc41</version>
+            <version>9.4.1208</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.8.10.1</version>
+            <version>3.8.11.2</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.12</version>
+            <version>1.7.20</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
@@ -141,14 +141,14 @@
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
-            <version>1.4.8</version>
+            <version>1.4.9</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.15</version>
+            <version>1.17</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
-- 
2.39.5