Merge pull request #18 from B3Partners/geotools21

update GeoTools 20.x -> 21.0
B3Partners · Mar 7, 2019 · 5e2c0a3 · 5e2c0a3
2 parents dda9ac5 + c7c11f7
commit 5e2c0a3
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 15 deletions.
diff --git a/.mvn/owasp-suppression.xml b/.mvn/owasp-suppression.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.2.xsd">
+    <suppress>
+        <notes><![CDATA[
+      Negeer melding mbt gt-main jar, false positive mbt integer overflow in data-tools
+      ]]></notes>
+        <gav regex="true">^org\.geotools:gt-main:.*$</gav>
+        <cpe>cpe:/a:data-tools_project:data_tools</cpe>
+    </suppress>
+</suppressions>
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -0,0 +1,50 @@
+timestamps {
+
+    properties([
+        [$class: 'jenkins.model.BuildDiscarderProperty', strategy: [$class: 'LogRotator',
+            artifactDaysToKeepStr: '8',
+            artifactNumToKeepStr: '3',
+            daysToKeepStr: '15',
+            numToKeepStr: '5']
+        ]]);
+
+    node {
+        withEnv(["JAVA_HOME=${ tool 'JDK8' }", "PATH+MAVEN=${tool 'Maven 3.6.0'}/bin:${env.JAVA_HOME}/bin"]) {
+
+            stage('Prepare') {
+                sh "ulimit -a"
+                sh "free -m"
+                checkout scm
+            }
+
+            stage('Build') {
+                echo "Building branch: ${env.BRANCH_NAME}"
+                sh "mvn install -Dmaven.test.skip=true -B -V -e -fae -q"
+            }
+
+            stage('Test') {
+                echo "Running unit tests"
+                sh "mvn -e test -B"
+            }
+
+            stage('Check Javadocs') {
+                sh "mvn javadoc:javadoc"
+            }
+
+            stage('Check Test Javadocs') {
+                sh "mvn javadoc:test-javadoc"
+            }
+
+            stage('Publish Test Results') {
+                junit allowEmptyResults: true, testResults: '**/target/surefire-reports/TEST-*.xml, **/target/failsafe-reports/TEST-*.xml'
+            }
+
+            stage('OWASP Dependency Check') {
+                echo "Uitvoeren OWASP dependency check"
+                sh "mvn org.owasp:dependency-check-maven:check -DskipSystemScope=true -DnodeAuditAnalyzerEnabled=false -DnodeAnalyzerEnabled=false -Dformat=XML -DsuppressionFile=./.mvn/owasp-suppression.xml"
+
+                dependencyCheckPublisher canComputeNew: false, defaultEncoding: '', healthy: '85', pattern: '**/dependency-check-report.xml', shouldDetectModules: true, unHealthy: ''
+            }
+        }
+    }
+}
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>nl.b3p</groupId>
     <artifactId>b3p-commons-csw</artifactId>
-    <version>5.1.3-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <url>https://github.com/B3Partners/${project.artifactId}/</url>
@@ -47,57 +47,55 @@
         <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>
-        <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
+        <geotools.version>21.0</geotools.version>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>nl.b3p</groupId>
-                <artifactId>datastorelinker-bom</artifactId>
-                <version>5.1.2</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
+            <version>1.2</version>
         </dependency>
         <dependency>
             <groupId>org.jdom</groupId>
             <artifactId>jdom2</artifactId>
+            <version>2.0.6</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>b3p-commons-core</artifactId>
-            <version>5.0.1</version>
+            <version>5.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.locationtech.jts</groupId>
             <artifactId>jts-core</artifactId>
+            <version>1.16.1</version>
         </dependency>
         <dependency>
             <groupId>org.geotools</groupId>
             <artifactId>gt-opengis</artifactId>
+            <version>${geotools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.geotools</groupId>
             <artifactId>gt-main</artifactId>
+            <version>${geotools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.geotools.xsd</groupId>
             <artifactId>gt-xsd-core</artifactId>
+            <version>${geotools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.geotools.xsd</groupId>
             <artifactId>gt-xsd-gml3</artifactId>
+            <version>${geotools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.geotools</groupId>
             <artifactId>gt-epsg-hsql</artifactId>
+            <version>${geotools.version}</version>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
@@ -123,6 +121,15 @@
         </repository>
     </repositories>
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.owasp</groupId>
+                    <artifactId>dependency-check-maven</artifactId>
+                    <version>4.0.2</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
                 <artifactId>maven-release-plugin</artifactId>

diff --git a/src/main/java/nl/b3p/csw/util/Util.java b/src/main/java/nl/b3p/csw/util/Util.java
@@ -26,7 +26,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.geotools.geometry.jts.WKTReader2;
-import org.geotools.xml.Encoder;
+import org.geotools.xsd.Encoder;
 import org.jdom2.JDOMException;
 import org.opengis.referencing.FactoryException;
 import org.opengis.referencing.NoSuchAuthorityCodeException;