Merge pull request #59 from B3Partners/geotools-upgrade

Bump GeoTools 20.5 -> 23.1
B3Partners · Jun 30, 2020 · 9e2f6c1 · 9e2f6c1
2 parents e8e2ae9 + c5c4f3f
commit 9e2f6c1
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 68 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -8,27 +8,47 @@ timestamps {
             numToKeepStr: '5']
         ]]);
 
+    final def jdks = ['OpenJDK11', 'JDK8']
+
     node {
-        withEnv(["JAVA_HOME=${ tool 'JDK8' }", "PATH+MAVEN=${tool 'Maven CURRENT'}/bin:${env.JAVA_HOME}/bin"]) {
+        jdks.eachWithIndex { jdk, indexOfJdk ->
+            final String jdkTestName = jdk.toString()
+            withEnv(["JAVA_HOME=${ tool jdkTestName }", "PATH+MAVEN=${tool 'Maven CURRENT'}/bin:${env.JAVA_HOME}/bin"]) {
 
-            stage('Prepare') {
-                checkout scm
-            }
+                echo "Using JDK: ${jdkTestName}"
 
-            stage('Build') {
-                echo "Building branch: ${env.BRANCH_NAME}"
-                sh "mvn install -B -V -e -fae -q"
-            }
+                stage('Prepare') {
+                    checkout scm
+                }
+
+                stage('Build') {
+                    echo "Building branch: ${env.BRANCH_NAME}"
+                    sh "mvn install -B -V -e -fae -q"
+                }
+
+                stage('Test') {
+                    echo "Running unit tests"
+                    sh "mvn -e test -B"
+                }
 
-            stage('Test') {
-                echo "Running unit tests"
-                sh "mvn -e test -B"
+                stage('Integration Test') {
+                    echo "Running unit tests"
+                    sh "mvn -e verify -B"
+                }
             }
+        }
+
+        withEnv(["JAVA_HOME=${ tool 'JDK8' }", "PATH+MAVEN=${tool 'Maven CURRENT'}/bin:${env.JAVA_HOME}/bin"]) {
 
             stage('Publish Test Results') {
                 junit allowEmptyResults: true, testResults: '**/target/surefire-reports/TEST-*.xml, **/target/failsafe-reports/TEST-*.xml'
             }
 
+            stage('Publish Test Coverage results') {
+                jacoco exclusionPattern: '**/*Test.class', execPattern: '**/target/**.exec'
+                sh "curl -s https://codecov.io/bash | bash"
+            }
+
             stage('OWASP Dependency Check') {
                 echo "Uitvoeren OWASP dependency check"
                 sh "mvn org.owasp:dependency-check-maven:aggregate"

diff --git a/b3p-gt2-csv/pom.xml b/b3p-gt2-csv/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>nl.b3p</groupId>
         <artifactId>b3p-gt2-modules</artifactId>
-        <version>5.2.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>nl.b3p</groupId>
     <artifactId>b3p-gt2-csv</artifactId>
-    <version>5.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/b3p-gt2-dxf/pom.xml b/b3p-gt2-dxf/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>nl.b3p</groupId>
         <artifactId>b3p-gt2-modules</artifactId>
-        <version>5.2.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>nl.b3p</groupId>
     <artifactId>b3p-gt2-dxf</artifactId>
-    <version>5.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/b3p-gt2-msaccess/pom.xml b/b3p-gt2-msaccess/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>nl.b3p</groupId>
         <artifactId>b3p-gt2-modules</artifactId>
-        <version>5.2.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>nl.b3p</groupId>
     <artifactId>b3p-gt2-msaccess</artifactId>
-    <version>5.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/b3p-gt2-msaccess/src/main/java/nl/b3p/geotools/data/msaccess/MsAccessFeatureReader.java b/b3p-gt2-msaccess/src/main/java/nl/b3p/geotools/data/msaccess/MsAccessFeatureReader.java
@@ -17,17 +17,14 @@
 import java.util.NoSuchElementException;
 import java.util.Set;
 import org.geotools.data.FeatureReader;
-import org.geotools.feature.IllegalAttributeException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.geotools.feature.simple.SimpleFeatureBuilder;
 import org.geotools.referencing.NamedIdentifier;
 import org.opengis.feature.Feature;
-import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.IllegalAttributeException;
 import org.opengis.feature.simple.SimpleFeatureType;
 import org.opengis.feature.type.AttributeDescriptor;
-import org.opengis.feature.type.AttributeType;
 import org.opengis.feature.type.FeatureType;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 

diff --git a/b3p-gt2-ogr/pom.xml b/b3p-gt2-ogr/pom.xml
@@ -5,23 +5,18 @@
     <parent>
         <groupId>nl.b3p</groupId>
         <artifactId>b3p-gt2-modules</artifactId>
-        <version>5.2.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>nl.b3p</groupId>
     <artifactId>b3p-gt2-ogr</artifactId>
-    <version>5.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.geotools</groupId>
-            <artifactId>gt-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.geotools</groupId>
             <artifactId>gt-main</artifactId>

diff --git a/b3p-gt2-sdl/pom.xml b/b3p-gt2-sdl/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>nl.b3p</groupId>
         <artifactId>b3p-gt2-modules</artifactId>
-        <version>5.2.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>nl.b3p</groupId>
     <artifactId>b3p-gt2-sdl</artifactId>
-    <version>5.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/b3p-gt2-sdl/src/main/java/nl/b3p/geotools/data/sdl/SDLFeatureReader.java b/b3p-gt2-sdl/src/main/java/nl/b3p/geotools/data/sdl/SDLFeatureReader.java
@@ -18,10 +18,10 @@
 import org.geotools.data.DataSourceException;
 import org.geotools.data.FeatureReader;
 import org.geotools.referencing.ReferencingFactoryFinder;
+import org.opengis.feature.IllegalAttributeException;
 import org.opengis.referencing.crs.CRSFactory;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.apache.commons.io.input.CountingInputStream;
-import org.geotools.feature.IllegalAttributeException;
 import org.geotools.feature.simple.SimpleFeatureBuilder;
 import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
 import org.geotools.referencing.CRS;

diff --git a/b3p-gt2-suf2/pom.xml b/b3p-gt2-suf2/pom.xml
@@ -5,12 +5,11 @@
     <parent>
         <groupId>nl.b3p</groupId>
         <artifactId>b3p-gt2-modules</artifactId>
-        <version>5.2.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>nl.b3p</groupId>
     <artifactId>b3p-gt2-suf2</artifactId>
-    <version>5.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -26,10 +25,6 @@
             <groupId>org.geotools</groupId>
             <artifactId>gt-epsg-hsql</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.geotools</groupId>
-            <artifactId>gt-data</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.locationtech.jts</groupId>
             <artifactId>jts-core</artifactId>

diff --git a/b3p-gt2-suf2/src/main/java/nl/b3p/geotools/data/suf2/SUF2FeatureReader.java b/b3p-gt2-suf2/src/main/java/nl/b3p/geotools/data/suf2/SUF2FeatureReader.java
@@ -22,9 +22,9 @@
 import org.geotools.data.DataSourceException;
 import org.geotools.data.FeatureReader;
 import org.geotools.referencing.ReferencingFactoryFinder;
+import org.opengis.feature.IllegalAttributeException;
 import org.opengis.referencing.crs.CRSFactory;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.geotools.feature.IllegalAttributeException;
 import org.geotools.feature.simple.SimpleFeatureBuilder;
 import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
 import org.geotools.referencing.CRS;

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>nl.b3p</groupId>
     <artifactId>b3p-gt2-modules</artifactId>
-    <version>5.2.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>b3p-gt2-modules</name>
@@ -70,13 +70,8 @@
         <maven.compiler.source>${project.build.sourceVersion}</maven.compiler.source>
         <maven.compiler.target>${project.build.targetVersion}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <netbeans.hint.jdkPlatform>JDK_${project.build.targetVersion}</netbeans.hint.jdkPlatform>
         <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
-        <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>1.7-web
-        </org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>
-        <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>Tomcat
-        </org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
-        <geotools.version>20.5</geotools.version>
+        <geotools.version>23.1</geotools.version>
         <slf4j.version>1.7.30</slf4j.version>
         <hibernate.version>3.6.10.Final</hibernate.version>
         <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
@@ -109,21 +104,11 @@
                 <artifactId>gt-main</artifactId>
                 <version>${geotools.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.geotools</groupId>
-                <artifactId>gt-api</artifactId>
-                <version>${geotools.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.geotools</groupId>
                 <artifactId>gt-epsg-hsql</artifactId>
                 <version>${geotools.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.geotools</groupId>
-                <artifactId>gt-data</artifactId>
-                <version>${geotools.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.geotools.jdbc</groupId>
                 <artifactId>gt-jdbc-postgis</artifactId>
@@ -139,6 +124,12 @@
                 <groupId>org.geotools.jdbc</groupId>
                 <artifactId>gt-jdbc-oracle</artifactId>
                 <version>${geotools.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.oracle.database.jdbc</groupId>
+                        <artifactId>ojdbc8</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -213,17 +204,13 @@
                     <artifactId>git-commit-id-plugin</artifactId>
                     <version>4.0.0</version>
                 </plugin>
-                <plugin>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>3.3.0</version>
-                </plugin>
                 <plugin>
                     <artifactId>maven-dependency-plugin</artifactId>
                     <version>3.1.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.3</version>
+                    <version>3.0.0-M1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>
@@ -304,15 +291,6 @@
                     <scmBranch>gh-pages</scmBranch>
                     <tryUpdate>true</tryUpdate>
                 </configuration>
-                <!--<executions>-->
-                    <!--<execution>-->
-                        <!--<id>scm-publish</id>-->
-                        <!--<phase>site-deploy</phase>-->
-                        <!--<goals>-->
-                            <!--<goal>publish-scm</goal>-->
-                        <!--</goals>-->
-                    <!--</execution>-->
-                <!--</executions>-->
             </plugin>
         </plugins>
     </build>