doc updates (#175)

* bouwen op Java 11 en update docs * update OWASP scanner config * update scripts ook in CI omgeving draaien
B3Partners · Jul 10, 2020 · 2464f86 · 2464f86
1 parent 520497e
commit 2464f86
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 46 deletions.
diff --git a/.mvn/owasp-suppression.xml b/.mvn/owasp-suppression.xml
@@ -1,42 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:schemaLocation="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
+<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
     <suppress>
         <notes><![CDATA[
-      ignore gt-coverage jar, false positive wrt jpeg thumbnail disclosure.
-      ]]></notes>
-        <gav regex="true">^org\.geotools:gt-coverage:.*$</gav>
+        ignore gt-coverage jar, false positive wrt jpeg thumbnail disclosure.
+        ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.geotools/gt\-coverage@.*$</packageUrl>
         <cpe>cpe:/a:image_processing_software:image_processing_software</cpe>
         <cpe>cpe:/a:processing:processing</cpe>
-        <!--<cve>CVE-2005-0406</cve>-->
     </suppress>
     <suppress>
         <notes><![CDATA[
-      ignore gt-jdbc jar false positive for "data-tools"
-      ]]></notes>
-        <gav regex="true">^org\.geotools:gt-jdbc:.*$</gav>
-        <cpe>cpe:/a:data-tools_project:data_tools</cpe>
+        ignore gt-jdbc jar false positive for "data-tools"
+        ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.geotools/gt\-jdbc@.*$</packageUrl>
+        <cpe>cpe:/a:data_tools_project:data_tools</cpe>
     </suppress>
     <suppress>
         <notes><![CDATA[
-      ignore gt-jdbc-sqlserver jar false positive "data-tools"
-      ]]></notes>
-        <gav regex="true">^org\.geotools\.jdbc:gt-jdbc-sqlserver:.*$</gav>
-        <cpe>cpe:/a:data-tools_project:data_tools</cpe>
+        ignore gt-jdbc-sqlserver jar false positive "data-tools"
+        ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.geotools\.jdbc/gt\-jdbc\-sqlserver@.*$</packageUrl>
+        <cpe>cpe:/a:data_tools_project:data_tools</cpe>
     </suppress>
     <suppress>
         <notes><![CDATA[
-      ignore gt-main jar false positive "data-tools"
-      ]]></notes>
-        <gav regex="true">^org\.geotools:gt-main:.*$</gav>
+        ignore gt-data jar false positive "data-tools"
+        ]]></notes>
+        <gav regex="true">^org\.geotools:gt-data:.*$</gav>
         <cpe>cpe:/a:data-tools_project:data_tools</cpe>
     </suppress>
     <suppress>
         <notes><![CDATA[
-      ignore gt-data jar false positive "data-tools"
+        Log4J SocketServer is not used, so not vulnerable
         ]]></notes>
-        <gav regex="true">^org\.geotools:gt-data:.*$</gav>
-        <cpe>cpe:/a:data-tools_project:data_tools</cpe>
+        <packageUrl regex="true">^pkg:maven/log4j/log4j@.*$</packageUrl>
+        <cpe>cpe:/a:apache:log4j</cpe>
     </suppress>
 </suppressions>
diff --git a/.travis.yml b/.travis.yml
@@ -23,6 +23,8 @@ before_install:
   - psql -U postgres -d ibis -c 'SELECT PostGIS_full_version();'
   - ls -l ./src/main/ddl/
   - psql -U postgres -w -d ibis -a -f ./src/main/ddl/create_ibis_database.sql
+  - psql -U postgres -w -d ibis -a -f ./src/main/ddl/upgrade3.1-4.0-views.sql
+  - psql -U postgres -w -d ibis -a -f ./src/main/ddl/upgrade4.0-4.1-views.sql
 
 install:
   # install without any testing

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,32 +4,38 @@ timestamps {
         properties([
             [$class: 'jenkins.model.BuildDiscarderProperty', strategy: [$class: 'LogRotator',
                 artifactDaysToKeepStr: '5',
-                artifactNumToKeepStr: '3',
-                daysToKeepStr: '10',
-                numToKeepStr: '3']
+                artifactNumToKeepStr: '5',
+                daysToKeepStr: '15',
+                numToKeepStr: '5']
             ]]);
 
-        withEnv(["JAVA_HOME=${ tool 'JDK8' }", "PATH+MAVEN=${tool 'Maven CURRENT'}/bin:${env.JAVA_HOME}/bin"]) {
+        stage('Prepare') {
+             checkout scm
+        }
 
-            stage('Prepare') {
-                 checkout scm
-            }
+        final def jdks = ['OpenJDK11','JDK8']
 
-            stage('Build') {
-                echo "Building branch: ${env.BRANCH_NAME}"
-                sh "mvn install -Dmaven.test.skip=true -B -V -fae -q -pl '!dist'"
-            }
+        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("Build ${jdkTestName}") {
+                    echo "Building branch: ${env.BRANCH_NAME}"
+                    sh "mvn install -Dmaven.test.skip=true -B -V -fae -q -pl '!dist'"
+                }
 
-            stage('Test') {
-                echo "Running unit tests"
-                sh "mvn -e test verify -B -pl '!dist'"
+                stage("Test ${jdkTestName}") {
+                    echo "Running unit tests"
+                    sh "mvn -e test verify -B -pl '!dist'"
+                }
             }
+        }
 
-            stage('Publish Test Results'){
-                junit allowEmptyResults: true, testResults: '**/target/surefire-reports/TEST-*.xml, **/target/failsafe-reports/TEST-*.xml'
-                jacoco classPattern: '**/target/classes', execPattern: '**/target/**.exec'
-            }
+        stage('Publish Test Results'){
+            junit allowEmptyResults: true, testResults: '**/target/surefire-reports/TEST-*.xml, **/target/failsafe-reports/TEST-*.xml'
+            jacoco classPattern: '**/target/classes', execPattern: '**/target/**.exec'
+        }
 
+        withEnv(["JAVA_HOME=${ tool 'JDK8' }", "PATH+MAVEN=${tool 'Maven CURRENT'}/bin:${env.JAVA_HOME}/bin"]) {
             stage('Check Javadocs') {
                 sh "mvn javadoc:javadoc"
             }

diff --git a/README.md b/README.md
@@ -3,7 +3,6 @@
 A war overlay project for ibis 2.
 
 [![Travis-CI Build Status (linux)](https://travis-ci.org/B3Partners/flamingo-ibis.svg?branch=master)](https://travis-ci.org/B3Partners/flamingo-ibis)
-[![AppVeyor Build status (windows)](https://ci.appveyor.com/api/projects/status/q1ot2g75acadrbw0/branch/master?svg=true)](https://ci.appveyor.com/project/mprins/flamingo-ibis/branch/master)
 [![Total alerts](https://img.shields.io/lgtm/alerts/g/B3Partners/flamingo-ibis.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/B3Partners/flamingo-ibis/alerts/)
 [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/B3Partners/flamingo-ibis.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/B3Partners/flamingo-ibis/context:java)
 [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/B3Partners/flamingo-ibis.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/B3Partners/flamingo-ibis/context:javascript)
diff --git a/src/site/apt/releasenotes.apt.vm b/src/site/apt/releasenotes.apt.vm
@@ -32,17 +32,17 @@ ${project.name} ${project.version} Release Notes
 
 ** Verbeteringen en oplossingen
 
- * maak label breedte op editformulieren instelbaar  ({{{https://github.com/B3Partners/flamingo-ibis/issues/168}#168}})
+  * Hernoem kolommen van tabel <<<bedrijventerrein>>> met prijzen zodat ze in aparte editor tab kunnen worden geladen  ({{{https://github.com/B3Partners/flamingo-ibis/pull/174}#174}})
 
- * Fix ophalen van kaartlaag voor IbisFactsheet config component ({{{https://github.com/B3Partners/flamingo-ibis/issues/165}#165}})
+  * Maak label breedte op editformulieren instelbaar  ({{{https://github.com/B3Partners/flamingo-ibis/issues/168}#168}})
 
- * Fix tonen tabbladen zonder inhoud ({{{https://github.com/B3Partners/flamingo-ibis/issues/169}#169}})
+  * Fix ophalen van kaartlaag voor IbisFactsheet config component ({{{https://github.com/B3Partners/flamingo-ibis/issues/165}#165}})
 
- * Codestyle verbeteringen ({{{https://github.com/B3Partners/flamingo-ibis/issues/166}#166}})
+  * Fix tonen tabbladen zonder inhoud ({{{https://github.com/B3Partners/flamingo-ibis/issues/169}#169}})
 
- * SVG ikoon voor IbisEditHistorisch component ({{{https://github.com/B3Partners/flamingo-ibis/pull/171}#171}})
+  * Codestyle verbeteringen ({{{https://github.com/B3Partners/flamingo-ibis/issues/166}#166}})
 
- * Hernoem kolommen van bedrijventerrein met prijzen zodat ze in aparte editor tab kunnen worden geladen  ({{{https://github.com/B3Partners/flamingo-ibis/pull/174}#174}})
+  * SVG ikoon voor IbisEditHistorisch component ({{{https://github.com/B3Partners/flamingo-ibis/pull/171}#171}})
 
  []