Up minor version ahead of release. For the version sanity-check, rede…

…fine sanity.

core/src/main/resources/version/net-hydromatic-optiq-jdbc.properties

@@ -3,8 +3,8 @@ driver.version=${pom.version}
 product.name=Optiq
 product.version=${pom.version}
 jdbc.compliant=true
-driver.version.major=0
-driver.version.minor=5
-database.version.major=0
-database.version.minor=5
+driver.version.major=${version.major}
+driver.version.minor=${version.minor}
+database.version.major=${version.major}
+database.version.minor=${version.minor}
 build.timestamp=${build.timestamp}

core/src/test/java/net/hydromatic/optiq/test/JdbcTest.java

@@ -427,7 +427,7 @@ public void onStatementClose(AvaticaStatement statement) {
     final int driverMajorVersion = metaData.getDriverMajorVersion();
     final int driverMinorVersion = metaData.getDriverMinorVersion();
     assertEquals(0, driverMajorVersion);
-    assertEquals(5, driverMinorVersion);
+    assertTrue(driverMinorVersion >= 5); // will work for the next few releases
 
     assertEquals("Optiq", metaData.getDatabaseProductName());
     final String databaseProductVersion =
@@ -439,7 +439,8 @@ public void onStatementClose(AvaticaStatement statement) {
 
     // Check how version is composed of major and minor version. Note that
     // version is stored in pom.xml; major and minor version are
-    // stored in net-hydromatic-optiq-jdbc.properties.
+    // stored in net-hydromatic-optiq-jdbc.properties, but derived from
+    // version.major and version.minor in pom.xml.
     if (!driverVersion.endsWith("-SNAPSHOT")) {
       assertTrue(driverVersion.startsWith("0."));
       String[] split = driverVersion.split("\\.");

pom.xml

@@ -51,6 +51,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <top.dir>${project.basedir}</top.dir>
+    <version.major>0</version.major>
+    <version.minor>6</version.minor>
   </properties>
 
   <!-- Environment settings. -->