Merge branch 'master' into semver_update

.travis.yml

@@ -7,6 +7,7 @@ services:
 addons:
   postgresql: "9.3"
 install:
+  - ./travis/maven.sh
   - sh -c 'cd querydsl-root && mvn -B -q install -Dmaven.javadoc.skip=true -DskipTests=true'
 before_script:
   - mysql -u root -e "source travis/mysql.sql"

querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/SpatialSupport.java

@@ -13,7 +13,6 @@
  */
 package com.mysema.query.sql.codegen;
 
-import java.awt.Polygon;
 import java.util.Map;
 import java.util.Set;
 
@@ -25,6 +24,7 @@ import org.geolatte.geom.MultiLineString;
 import org.geolatte.geom.MultiPoint;
 import org.geolatte.geom.MultiPolygon;
 import org.geolatte.geom.Point;
+import org.geolatte.geom.Polygon;
 import org.geolatte.geom.PolyHedralSurface;
 
 import com.google.common.collect.ImmutableSet;

querydsl-sql/pom.xml

@@ -320,10 +320,12 @@
 
   <repositories>
     <!--for cubrid:cubrid-jdbc -->
+    <!--
     <repository>
       <id>CUBRID</id>
       <url>http://maven.cubrid.org</url>
     </repository>
+    -->
     <!-- for oracle -->
     <repository>
       <id>datanucleus</id>

travis/maven.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+wget http://ftp.cubrid.org/CUBRID_Drivers/JDBC_Driver/CUBRID-8.4.0_jdbc.jar
+mvn install:install-file -Dfile=CUBRID-8.4.0_jdbc.jar -DgroupId=cubrid -DartifactId=cubrid-jdbc -Dversion=8.4.0 -Dpackaging=jar
+