Merge remote-tracking branch "deegree/master" into geoJson-5322

deegree · copierrj · Jun 15, 2022 · Nov 8, 2018 · Nov 8, 2018 · Nov 8, 2018
commit bb30ff99b3e1bf311a2faf6240c3f2160a5a6101
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -0,0 +1,17 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Maven
+      run: mvn -B verify -Pintegration-tests --file pom.xml
diff --git a/.travis.yml b/.travis.yml
@@ -5,10 +5,9 @@
 sudo: false
 language: java
 jdk:
-  - oraclejdk8
   - openjdk8
-install: "travis_retry mvn install -Pintegration-tests -DskipTests=true -B -V"
-script: "travis_retry mvn verify -Pintegration-tests -B -V"
+install: "travis_retry mvn install -Pintegration-tests -DskipTests=true -B -V -C -q"
+script: "travis_retry mvn verify -Pintegration-tests -B -V -C -q"
 env: MAVEN_OPTS="-XX:MaxPermSize=256m"
 cache:
   directories:

diff --git a/CONTRIB.md b/CONTRIB.md
@@ -24,14 +24,14 @@ If you are interested in making a code contribution and would like to learn more
 Never made an open source contribution before? Wondering how contributions work in the in our project? Here's a quick rundown!
 
 - Find an issue that you are interested in addressing or a feature that you would like to add.
-- Fork the repository associated with the issue to your local GitHub organization. This means that you will have a copy of the repository under your-GitHub-username/repository-name.
-- Clone the repository to your local machine using `git clone https://github.com/github-username/repository-name.git`.
-- Create a new branch for your fix using `git checkout -b branch-name-here`.
+- Fork the repository associated with the issue to your GitHub organization or user account. This means that you will have a copy of the repository under `your-github-username/deegree3`.
+- Clone the repository to your local machine using `git clone https://github.com/your-github-username/deegree3.git`.
+- Create a new branch for your change using `git checkout -b your-branch-name-here`.
 - Make the appropriate changes for the issue you are trying to address or the feature that you want to add.
 - Use `git add insert-paths-of-changed-files-here` to add the file contents of the changed files to the "snapshot" git uses to manage the state of the project, also known as the index.
-- Use `git commit -m "Insert a short message of the changes made here"` to store the contents of the index with a descriptive message.
-- Push the changes to the remote repository using `git push origin branch-name-here`.
-- Submit a pull request to the upstream repository.
+- Use `git commit -m "Insert a short message of the changes made here with reference to github issue"` to store the contents of the index with a descriptive message.
+- Push the changes to the remote repository using `git push origin your-branch-name-here`.
+- Submit a pull request to the upstream repository using the github functionality.
 - Title the pull request with a short description of the changes made and the issue or bug number associated with your change. For example, you can title an issue like so "Fixes #42: WFS returns valid GML for GetFeature with BBOX parameter".
 - In the description of the pull request, explain the changes that you made, any issues you think exist with the pull request you made, and any questions you have for the maintainer. It's OK if your pull request is not perfect (no pull request is), the reviewer will be able to help you fix any problems and improve it!
 - Wait for the pull request to be reviewed by a TMC member.
@@ -163,7 +163,7 @@ If for any reason a committee member is not able to fully participate then they
 
 The technical infrastructure of the deegree initiative is described in [Infrastructure](https://github.com/deegree/deegree3/wiki/Infrastructure).
 
-If a member of the initiative needs access to one of the infrastructure components, the TMC decides upon tracker request and provides access to the Infrastructure.
+If a member of the initiative needs access to one of the infrastructure components, the TMC decides upon request and provides access to the infrastructure.
 
 #### Ownership of github organisation and projects 
 
@@ -184,6 +184,31 @@ code. For the committer themselves understanding about the license is hopefully
 committer should verify the understanding unless the committer is very comfortable that the contributor understands the 
 license (for instance frequent contributors).
 
-All committers are responsible for having read, and understood this document. And please confirm acceptance to these 
+If the contribution was developed on behalf of an employer (on work time, as part of a work project, etc) then it is 
+important that an appropriate representative of the employer understand that the code will be contributed under the 
+LGPL license. The arrangement should be cleared with an authorized supervisor, manager, or director.
+
+The code should be developed by the contributor, or the code should be from a source which can be rightfully contributed
+such as from the public domain, or from an open source project under a compatible license. All unusual situations need 
+to be discussed with the committee members and documented.
+
+Committers should adhere to the following guidelines, and may be personally legally liable for improperly contributing 
+code to the source repository:
+
+- Make sure the contributor (and possibly employer) is aware of the contribution terms.
+- Code coming from a source other than the contributor (such as adapted from another project) should be clearly marked 
+as to the original source, copyright holders, license terms and so forth. This information can be in the file headers, 
+but should also be added to the project licensing file if not exactly matching normal project licensing (LICENSE.txt).
+- Existing copyright headers and license text should never be stripped from a file. If a copyright holder wishes to give
+ up copyright they must do so in writing to the committees before copyright messages are removed. If license terms are 
+ changed it has to be by agreement (written in email is ok) of the copyright holders.
+- Code with licenses requiring credit, or disclosure to users should be added to LICENSE.TXT.
+- When substantial contributions are added to a file (such as substantial patches) the author/contributor should be added
+ to the list of copyright holders for the file.
+- If there is uncertainty about whether a change it proper to contribute to the code base, please seek more information 
+from the project steering committee, or the OSGeo foundation legal counsel.
+
+All committers are responsible for having read, and understood this document. And confirm acceptance to these 
 guidelines by sending an email to the mailing list with subject `Committer guidelines acceptance` and body 
-`I hereby accept the deegree committer guidelines. <Date> <Your Full Name>`.
+`I hereby accept the deegree committer guidelines. <Date> <Your Full Name>`.
+
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -0,0 +1,51 @@
+# List of contributors
+
+The following list shows in alphabetical order individuals who have contributed to deegree:
+- Andrei Aiordachioaie
+- D. Baum
+- Rutger Bezema
+- Florian Bingel
+- Danilo Bretschneider
+- Reijer Copier
+- Alexander Erben
+- Lyn Goltz
+- Sebastian Goerke
+- Volker Grabsch
+- Torsten Friebe
+- Jerry Huxtable
+- Andrei Ionita
+- Mats Isakson
+- Christian Kiehle
+- Martin W. Kirst
+- Johannes Küpper
+- Anne Loos
+- Matteo Matassoni
+- Diego Migliavacca
+- Ulrich Neumeister
+- Mike Nidel
+- Sebastian Niklasch
+- Jens Pabel
+- Alexander Padberg
+- Jarle Pedersen
+- Andreas Poth
+- Rammi aka Andreas M. Rammelt
+- Stephan Reichhelm
+- Lena Rippolz
+- Hanko Rubach
+- Andreas Schmitz
+- Markus Schneider
+- Paul Sohier
+- Dirk Stenger
+- Jason R. Surratt
+- Ugo Taddei
+- Carmen Tawalika
+- Steffen Thomas
+- Oliver Tonnhofer
+- Sven Tschirner
+- Jeroen van der Vegt
+- Martin Vieweg
+- Jeroen ter Voorde
+- Georg Walenciak
+- Jeronimo Wanhoff
+- Juergen Weichand
+- Johannes Wilden
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -0,0 +1,101 @@
+pipeline {
+    agent {
+        label 'openjdk8bot'
+    }
+
+    tools {
+        maven 'maven-3.6'
+        jdk 'adoptopenjdk-jdk8'
+    }
+    environment {
+        MAVEN_OPTS='-Djava.awt.headless=true -Xmx3096m'
+    }
+    stages {
+        stage ('Initialize') {
+            steps {
+                sh '''
+                    echo "PATH = ${PATH}"
+                    echo "M2_HOME = ${M2_HOME}"
+                '''
+                sh 'mvn -version'
+                sh 'java -version'
+                sh 'git --version'
+            }
+        }
+        stage ('Build') {
+            steps {
+               echo 'Unit testing'
+               sh 'mvn -B -C -Poracle,mssql clean test-compile'
+            }
+        }
+        stage ('Integration Test') {
+            steps {
+                echo 'Integration testing'
+                sh 'mvn -B -C -Pintegration-tests,oracle,mssql install'
+            }
+            post {
+                always {
+                    junit '**/target/*-reports/*.xml'
+                }
+            }
+        }
+        stage ('Quality Checks') {
+            when {
+                branch 'master'
+            }
+            steps {
+                echo 'Quality checking'
+                sh 'mvn -B -C -fae -Poracle,mssql findbugs:findbugs checkstyle:checkstyle javadoc:javadoc'
+            }
+            post {
+                success {
+                    findbugs canComputeNew: false, defaultEncoding: '', excludePattern: '', healthy: '', includePattern: '', pattern: '**/findbugsXml.xml', unHealthy: ''
+                    checkstyle canComputeNew: false, canRunOnFailed: true, defaultEncoding: '', healthy: '', pattern: '**/checkstyle-result.xml', unHealthy: ''
+                }
+            }
+        }
+        stage ('Acceptance Test') {
+            when {
+                branch 'master'
+            }
+            steps {
+                echo 'Preparing test harness: TEAM Engine'
+                echo 'Download and start TEAM Engine'
+                echo 'Start SUT deegree webapp with test configuration'
+                echo 'Run FAT'
+            }
+            post {
+                success {
+                    echo 'FAT passed successfully'
+                }
+            }
+        }
+        stage ('Release') {
+            when {
+                branch 'master'
+            }
+            steps {
+                echo 'Prepare release version...'
+                echo 'Build and publish documentation'
+                sh 'mvn -pl :deegree-webservices-handbook -Phandbook install'
+                echo 'Build docker image...'
+            }
+            post {
+                success {
+                    // post release on github
+                    archiveArtifacts artifacts: '**/target/deegree-webservices-*.war', fingerprint: true
+                }
+            }
+        }
+        stage ('Deploy PROD') {
+            when {
+                branch 'master'
+            }
+            // install current release version on demo.deegree.org
+            steps {
+                echo 'Deploying to demo.deegree.org...'
+                echo 'Running smoke tests...'
+            }
+        }
+    }
+}
diff --git a/README.md b/README.md
@@ -1,17 +1,16 @@
-| Master (3.4) | Maintenance (3.3) | OpenHUB |
-| ------------ | ----------------- | ------------- |
-| [![Master Build Status](https://travis-ci.org/deegree/deegree3.png?branch=master)](https://travis-ci.org/deegree/deegree3) | [![Develop Build Status](https://travis-ci.org/deegree/deegree3.png?branch=3.3-master)](https://travis-ci.org/deegree/deegree3/branches) | [![OpenHUB](https://www.openhub.net/p/deegree3/widgets/project_thin_badge.gif)](https://www.openhub.net/p/deegree3) |
-
-# deegree web services
+| Master (3.4) | Release   | OpenHUB       |
+| ------------ | --------- | ------------- |
+| [![Master Build Status](https://buildserver.deegree.org/buildStatus/icon?job=deegree-3.4-master)](https://buildserver.deegree.org/job/deegree-3.4-master/) | [![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/deegree/deegree3?sort=semver)](https://github.com/deegree/deegree3/releases/latest) | [![OpenHUB](https://www.openhub.net/p/deegree3/widgets/project_thin_badge.gif)](https://www.openhub.net/p/deegree3) |
+# deegree webservices
 deegree is open source software for spatial data infrastructures and the geospatial web. deegree includes components for geospatial data management, including data access, visualization, discovery and security. Open standards are at the heart of deegree. The software is built on the standards of the Open Geospatial Consortium (OGC) and the ISO Technical Committee 211.
 
 ## User documentation
-General project information and user documentation (e.g. "How to set up WMS and WFS?" or "How to get support?")  can be found on the deegree homepage:
+General project information and user documentation (e.g. "How to set up WMS and WFS?" or "How to get support?") can be found on the deegree homepage:
 
-http://www.deegree.org
+https://www.deegree.org/documentation
 
 ## Developer documentation
-Developer-related information (e.g. "How to build deegree webservices?") can be found on the deegree3 project wiki on GiHub:
+Information for developer (e.g. "How to build deegree webservices?") can be found on the deegree project wiki on GitHub:
 
 https://github.com/deegree/deegree3/wiki
 
@@ -21,10 +20,12 @@ https://github.com/deegree/deegree3/wiki
 
 deegree is distributed under the GNU Lesser General Public License, Version 2.1 (LGPL 2.1). Generally speaking this means that you have essential freedoms such as: Run the software for any purpose, find out how it works, make changes, redistribute copies (of modified versions). Practically, with these freedoms, you do not have to pay a license fee, you can create as many installations as you need, and you're not bound to one single vendor. Instead you can contact a service provider of your choice to make necessary configurations or code adjustments. Or you may even step up and do this yourself.
 
-More information about free software can be found at the free software foundation. A good starting point is [www.gnu.org](http://www.gnu.org).
+More information about free software can be found at the free software foundation. A good starting point is [www.gnu.org](https://www.gnu.org).
 
 ## Contribution guidelines
 
 First off all, thank you for taking the time to contribute to deegree! :+1: :tada:
 
-By participating you are expected to uphold the [Contribution guidelines](CONTRIB.md). 
+By participating you are expected to uphold the [Contribution guidelines](CONTRIB.md).
+
+You can add yourself when contributing to the project to the [list of contributors](CONTRIBUTORS.md).
diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,21 @@
+# Security Policy
+
+## Supported Versions
+
+The following versions of deegree are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 3.4.x   | :white_check_mark: |
+| <= 3.3   | :x:                |
+
+Please check also our [support matrix](https://github.com/deegree/deegree3/wiki/End-of-Life-and-Support-Matrix) for more detailed information.
+
+## Reporting a Vulnerability
+
+If you encounter a security vulnerability in deegree please take care to report the issue in a responsible fashion:
+
+-  Keep exploit details out of the issue report (send to TMC privately – just like you would do for sensitive sample data) and mark the issue as a vulnerability!
+-  Be prepared to work with Technical Management Committee (TMC) members on a solution!
+-  Keep in mind TMC members are volunteers and an extensive fix may require fundraising and other kinds of contributions!
diff --git a/deegree-client/deegree-jsf-core/pom.xml b/deegree-client/deegree-jsf-core/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-client</artifactId>
-    <version>3.4.4-SNAPSHOT</version>
+    <version>3.4.15-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/deegree-client/deegree-wps-webclient/pom.xml b/deegree-client/deegree-wps-webclient/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-client</artifactId>
-    <version>3.4.4-SNAPSHOT</version>
+    <version>3.4.15-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/deegree-client/deegree-wpsprinter-webclient/pom.xml b/deegree-client/deegree-wpsprinter-webclient/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-client</artifactId>
-    <version>3.4.4-SNAPSHOT</version>
+    <version>3.4.15-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/deegree-client/pom.xml b/deegree-client/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree</artifactId>
-    <version>3.4.4-SNAPSHOT</version>
+    <version>3.4.15-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/deegree-core/deegree-connectionprovider-datasource/pom.xml b/deegree-core/deegree-connectionprovider-datasource/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.4.4-SNAPSHOT</version>
+    <version>3.4.15-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/deegree-core/deegree-core-3d/pom.xml b/deegree-core/deegree-core-3d/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.4.4-SNAPSHOT</version>
+    <version>3.4.15-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/deegree-core/deegree-core-annotations/pom.xml b/deegree-core/deegree-core-annotations/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.4.4-SNAPSHOT</version>
+    <version>3.4.15-SNAPSHOT</version>
   </parent>
 
   <repositories>

diff --git a/deegree-core/deegree-core-base/pom.xml b/deegree-core/deegree-core-base/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.deegree</groupId>
     <artifactId>deegree-core</artifactId>
-    <version>3.4.4-SNAPSHOT</version>
+    <version>3.4.15-SNAPSHOT</version>
   </parent>
 
   <repositories>
@@ -39,8 +39,8 @@
       <artifactId>commons-codec</artifactId>
     </dependency>
     <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
     </dependency>
     <dependency>
       <groupId>junit</groupId>