From 3cb5fcdbf722ef24d78e5138ac612facea6dc21e Mon Sep 17 00:00:00 2001 From: Jeremy Fee Date: Mon, 21 Jun 2021 16:50:56 -0600 Subject: [PATCH 1/2] Update to v2.7.10 --- code.json | 4 ++-- .../java/gov/usgs/earthquake/distribution/ProductClient.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code.json b/code.json index baad46e9..f92cf731 100644 --- a/code.json +++ b/code.json @@ -3,7 +3,7 @@ "name": "Product Distribution Layer", "organization": "U.S. Geological Survey", "description": "Distribution system used for derived earthquake information", - "version": "v2.7.9", + "version": "v2.7.10", "status": "Production", "permissions": { "usageType": "openSource", @@ -27,7 +27,7 @@ "email": "jmfee@usgs.gov" }, "date": { - "metadataLastUpdated": "2021-02-10" + "metadataLastUpdated": "2021-06-21" } } ] diff --git a/src/main/java/gov/usgs/earthquake/distribution/ProductClient.java b/src/main/java/gov/usgs/earthquake/distribution/ProductClient.java index a6b66f0a..5946bcb2 100644 --- a/src/main/java/gov/usgs/earthquake/distribution/ProductClient.java +++ b/src/main/java/gov/usgs/earthquake/distribution/ProductClient.java @@ -64,7 +64,7 @@ public class ProductClient extends DefaultConfigurable implements ProductClientMBean, Bootstrappable { /** The "release" version number. */ - public static final String RELEASE_VERSION = "Version 2.7.9 2021-02-10"; + public static final String RELEASE_VERSION = "Version 2.7.10 2021-06-21"; /** Property name used on products for current RELEASE_VERSION. */ public static final String PDL_CLIENT_VERSION_PROPERTY = "pdl-client-version"; From 5e8e330de949efcb62ca93fe7d5b02370fc47f79 Mon Sep 17 00:00:00 2001 From: Jeremy Fee Date: Mon, 21 Jun 2021 17:34:11 -0600 Subject: [PATCH 2/2] Remove unexpected javadoc character --- src/main/java/gov/usgs/util/FutureExecutorTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gov/usgs/util/FutureExecutorTask.java b/src/main/java/gov/usgs/util/FutureExecutorTask.java index bac8ced5..4ca1e812 100644 --- a/src/main/java/gov/usgs/util/FutureExecutorTask.java +++ b/src/main/java/gov/usgs/util/FutureExecutorTask.java @@ -37,7 +37,7 @@ public class FutureExecutorTask extends ExecutorTask { * Construct a new ExecutorTask * * @param backgroundService - * ExecutorService used to execute callableƍ + * ExecutorService used to execute callable. * @param service * ExecutorService that this task will be submitted to. * @param maxTries