Merge branch '148-cleanup' into 'master'

Resolve "receiver cleanup bug"

Closes #148

See merge request ghsc/hazdev/pdl!155

.gitlab-ci.yml

@@ -1,8 +1,6 @@
-image: ${DEVOPS_REGISTRY}usgs/centos:8
 
 stages:
   - build
-  - javadoc
 
 .check_code:
   after_script:
@@ -45,13 +43,13 @@ Java 11:
     - .check_code
   image: ${DEVOPS_REGISTRY}usgs/java:11-jdk
 
-Java Latest:
-  extends:
-    - .check_code
-  image: ${DEVOPS_REGISTRY}usgs/java:latest-jdk
+# Java Latest:
+#   extends:
+#     - .check_code
+#   image: ${DEVOPS_REGISTRY}usgs/java:latest-jdk
 
 Javadoc:
-  image: ${DEVOPS_REGISTRY}usgs/java:latest-jdk
+  image: ${DEVOPS_REGISTRY}usgs/java:11-jdk
   script:
     - ./gradlew javadoc
-  stage: javadoc
+  stage: build

CONTRIBUTING.md

@@ -0,0 +1,42 @@
+# Contributing
+
+Contributions are welcome from the community.
+
+## Bug Reports and Suggested Enhancements
+
+Bug Reports and Suggested Enhancements can be [submitted on the issues page][1].
+
+Before creating a new issue, please take a moment to search and make sure a
+similar issue does not already exist. If one does exist, you can comment
+(most simply even with a :+1: (`:+1:`) to show your support for that issue.
+
+## Development
+
+This project uses [Gradle][4] to manage dependencies and build the project.
+
+- Clone project
+
+  > Note: This project uses a [forking workflow][2].
+  > Creating a fork is not required to get started, but is recommended.
+
+- Install dependencies
+
+  - Java 8, 11, or 17
+
+- Build project and run tests
+
+  ```
+  ./gradlew build
+  ```
+
+### Merge Requests
+
+If you have direct contributions you would like considered for incorporation
+into the project you can [fork this repository][2] and
+[create a merge request][3] for review.
+
+
+[1]: https://code.usgs.gov/ghsc/hazdev/pdl/issues
+[2]: https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html
+[3]: https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html
+[4]: https://gradle.org/

DISCLAIMER.md

@@ -0,0 +1,10 @@
+# Disclaimer
+
+This software is preliminary or provisional and is subject to revision. It is
+being provided to meet the need for timely best science. The software has not
+received final approval by the U.S. Geological Survey (USGS). No warranty,
+expressed or implied, is made by the USGS or the U.S. Government as to the
+functionality of the software and related material nor shall the fact of release
+constitute any such warranty. The software is provided on the condition that
+neither the USGS nor the U.S. Government shall be held liable for any damages
+resulting from the authorized or unauthorized use of the software.

LICENSE.md

@@ -1,35 +1,56 @@
-Unless otherwise noted, This software is in the public domain because it
-contains materials that originally came from the United States Geological
-Survey, an agency of the United States Department of Interior. For more
-information, see the official USGS copyright policy at
-http://www.usgs.gov/visual-id/credit_usgs.html#copyright
+License
+=======
 
+Unless otherwise noted, This project is in the public domain in the United
+States because it contains materials that originally came from the United
+States Geological Survey, an agency of the United States Department of
+Interior. For more information, see the official USGS copyright policy at
+https://www.usgs.gov/information-policies-and-instructions/copyrights-and-credits
 
-Dependent libraries found in the "lib" directory are distributed under the
+Additionally, we waive copyright and related rights in the work
+worldwide through the CC0 1.0 Universal public domain dedication.
+
+
+CC0 1.0 Universal Summary
+-------------------------
+
+This is a human-readable summary of the
+[Legal Code (read the full text)][1].
+
+
+### No Copyright
+
+The person who associated a work with this deed has dedicated the work to
+the public domain by waiving all of his or her rights to the work worldwide
+under copyright law, including all related and neighboring rights, to the
+extent allowed by law.
+
+You can copy, modify, distribute and perform the work, even for commercial
+purposes, all without asking permission.
+
+
+### Other Information
+
+In no way are the patent or trademark rights of any person affected by CC0,
+nor are the rights that other persons may have in the work or in how the
+work is used, such as publicity or privacy rights.
+
+Unless expressly stated otherwise, the person who associated a work with
+this deed makes no warranties about the work, and disclaims liability for
+all uses of the work, to the fullest extent permitted by applicable law.
+When using or citing the work, you should not imply endorsement by the
+author or the affirmer.
+
+
+### Liraries
+
+Libraries found in the "lib" directory are distributed under the
 open source (or open source-like) licenses/agreements. Appropriate license
 agreements for each library can be found in the "lib" directory.  Other
 dependencies can be found in `build.gradle`.
 
- - eqmessageutils.jar                   (https://github.com/usgs/eqmessageutils)
+ - MessageUtils.jar                   (https://github.com/usgs/eqmessageutils)
  - QWFileOutClient.jar                  (http://www.isti2.com/QWIDS/current_dist/QWIDS_EIDS_Summary.html#Open)
- - sqlitejdbc-v056.jar                  (https://github.com/xerial/sqlite-jdbc)
  - cap-library-r11.jar                  (https://github.com/google/cap-library)
 
-
-
-Disclaimers
------------
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-Information provided by this software may be preliminary or provisional and is
-subject to revision. It is being provided to meet the need for timely best
-science. The information has not received final approval by the U.S. Geological
-Survey (USGS) and is provided on the condition that neither the USGS nor the
-U.S. Government shall be held liable for any damages resulting from the
-authorized or unauthorized use of the information.
+[1]: https://creativecommons.org/publicdomain/zero/1.0/legalcode

build.gradle

@@ -40,7 +40,7 @@ dependencies {
   implementation "org.glassfish.tyrus.bundles:tyrus-standalone-client:1.17"
   // database drivers
   runtimeOnly "mysql:mysql-connector-java:5.1.47"
-  runtimeOnly "org.xerial:sqlite-jdbc:3.23.1"
+  runtimeOnly "org.xerial:sqlite-jdbc:3.39.2.1"
   // ssh keys
   implementation "ch.ethz.ganymed:ganymed-ssh2:262"
   // nats
@@ -72,7 +72,7 @@ tasks.withType(JavaCompile) {
 
 // coverage reports
 jacoco {
-  toolVersion "0.8.7"
+  toolVersion "0.8.8"
 }
 jacocoTestReport {
   reports {

code.json

@@ -3,31 +3,31 @@
     "name": "Product Distribution Layer",
     "organization": "U.S. Geological Survey",
     "description": "Distribution system used for derived earthquake information",
-    "version": "v2.7.12",
+    "version": "v2.8.0",
     "status": "Production",
     "permissions": {
       "usageType": "openSource",
       "licenses": [
         {
           "name": "Public Domain, CC0-1.0",
-          "URL": "https://github.com/usgs/pdl/blob/master/LICENSE.md"
+          "URL": "https://code.usgs.gov/ghsc/hazdev/pdl/-/raw/master/LICENSE.md"
         }
       ]
     },
     "homepageURL": "https://usgs.github.io/pdl/",
-    "downloadURL": "https://github.com/usgs/pdl/archive/master.zip",
-    "disclaimerURL": "https://github.com/usgs/pdl/blob/master/LICENSE.md",
-    "repositoryURL": "https://github.com/usgs/pdl.git",
+    "downloadURL": "https://code.usgs.gov/ghsc/hazdev/pdl/-/archive/master/pdl-master.zip",
+    "disclaimerURL": "https://code.usgs.gov/ghsc/hazdev/pdl/-/raw/master/DISCLAIMER.md",
+    "repositoryURL": "https://code.usgs.gov/ghsc/hazdev/pdl.git",
     "vcs": "git",
     "laborHours": 0,
     "tags": ["earthquake", "distribution", "quakeml"],
     "languages": ["java"],
     "contact": {
-      "name": "Jeremy Fee",
-      "email": "jmfee@usgs.gov"
+      "name": "Hazards Development Team",
+      "email": "gs-haz_dev_team_group@usgs.gov"
     },
     "date": {
-      "metadataLastUpdated": "2022-09-16"
+      "metadataLastUpdated": "2022-10-11"
     }
   }
 ]