Change h2 to version 1.4.196

#reference:SME-1974
shruda · Nov 20, 2017 · a9c956e · a9c956e
2 parents 792ffed + 2cecd41
commit a9c956e
Show file tree

Hide file tree

Showing 5 changed files with 2,921 additions and 2,911 deletions.
diff --git a/h2/pom.xml b/h2/pom.xml
@@ -4,16 +4,21 @@
 
   <groupId>com.h2database</groupId>
   <artifactId>h2</artifactId>
-  <version>1.4.195-SNAPSHOT</version>
+  <version>1.4.196-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>H2 Database Engine</name>
   <url>http://www.h2database.com</url>
   <description>H2 Database Engine</description>
 
   <licenses>
     <license>
-      <name>MPL 2.0 or EPL 1.0</name>
-      <url>http://h2database.com/html/license.html</url>
+      <name>MPL 2.0</name>
+      <url>https://www.mozilla.org/en-US/MPL/2.0/</url>
+      <distribution>repo</distribution>
+    </license>
+    <license>
+      <name>EPL 1.0</name>
+      <url>https://opensource.org/licenses/eclipse-1.0.php</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
@@ -133,7 +138,7 @@
       <artifactId>tools</artifactId>
       <version>1.7</version>
       <scope>system</scope>
-      <systemPath>c:/Program Files/Java/jdk1.7.0_67/lib/tools.jar</systemPath>
+      <systemPath>${tools.jar}</systemPath>
     </dependency>
   </dependencies>
 
@@ -178,6 +183,7 @@
           <include>**/*.ico</include>
           <include>**/*.gif</include>
           <include>**/*.css</include>
+          <include>**/*.js</include>
           <include>org/h2/res/help.csv</include>
           <include>org/h2/res/javadoc.properties</include>
           <include>org/h2/server/pg/pg_catalog.sql</include>
@@ -200,11 +206,13 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.10</version>
+        <version>3.0.0</version>
         <executions>
           <execution>
             <phase>generate-test-sources</phase>
-            <goals><goal>add-test-source</goal></goals>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
             <configuration>
               <sources>
                 <source>src/tools</source>
@@ -213,53 +221,51 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Maven requires at least JRE 1.7 but we want to build with JDK 1.6 -->
+      <!-- Make sure neither we nor one of our dependencies uses anything outside JDK 1.7 -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-toolchains-plugin</artifactId>
-        <version>1.1</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>toolchain</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <toolchains>
-            <jdk>
-              <version>1.6</version>
-            </jdk>
-          </toolchains>
-        </configuration>
-      </plugin>
-      <!-- Make sure we are not using anything outside JDK 1.6 -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <version>1.15</version>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>3.0.0-M1</version>
         <executions>
           <execution>
-            <id>check-java-api</id>
-            <phase>test</phase>
+            <id>check-java-version</id>
             <goals>
-              <goal>check</goal>
+              <goal>enforce</goal>
             </goals>
+            <configuration>
+              <rules>
+                <enforceBytecodeVersion>
+                  <maxJdkVersion>1.7</maxJdkVersion>
+                </enforceBytecodeVersion>
+                <checkSignatureRule implementation="org.codehaus.mojo.animal_sniffer.enforcer.CheckSignatureRule">
+                  <signature>
+                    <groupId>org.codehaus.mojo.signature</groupId>
+                    <artifactId>java17</artifactId>
+                    <version>1.0</version>
+                  </signature>
+                </checkSignatureRule>
+              </rules>
+              <fail>true</fail>
+            </configuration>
           </execution>
         </executions>
-        <configuration>
-          <signature>
-            <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java16</artifactId>
-            <version>1.1</version>
-          </signature>
-        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>extra-enforcer-rules</artifactId>
+            <version>1.0-beta-6</version>
+          </dependency>
+          <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>animal-sniffer-enforcer-rule</artifactId>
+            <version>1.16</version>
+          </dependency>
+        </dependencies>
       </plugin>
-      <!-- Disable surefire since we don't use Junit -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.19.1</version>
+        <version>2.20.1</version>
         <configuration>
           <includes>
             <include>TestAllJunit.java</include>
@@ -271,4 +277,4 @@
   </build>
 
 
-</project>
+</project>
diff --git a/h2/src/main/org/h2/jdbc/JdbcResultSet.java b/h2/src/main/org/h2/jdbc/JdbcResultSet.java
@@ -3802,7 +3802,7 @@ private <T> T extractObjectOfType(Class<T> type, Value value) throws SQLExceptio
             return type.cast(value == ValueNull.INSTANCE ? null : new JdbcArray(conn, value, id));
         } else if (type == TimestampWithTimeZone.class) {
             return type.cast(value.getObject());
-        } else if (DataType.isGeometryClass(type)) {
+        } else if (Value.getGeometryFactory().getGeometryType().isAssignableFrom(type)) {
             return type.cast(value.getObject());
         } else if (LocalDateTimeUtils.isLocalDate(type)) {
             return type.cast(LocalDateTimeUtils.valueToLocalDate(value));