Merge branch 'jones2026-master'

THIRD_PARTY_NOTICES

@@ -85,48 +85,6 @@ See Open Source Licenses below for complete copy of the Apache 2.0 license
 
 -------------------
 
-FasterXML Jackson Annotations
-Version (if any):
-2.0.6
-Brief Description:
-This project contains core low-level incremental ("streaming") parser and generator abstractions used by Jackson Data Processor. It also includes the default implementation of handler types (parser, generator) that handle JSON format. The core abstractions are not JSON specific, although naming does contain 'JSON' in many places, due to historical reasons. Only packages that specifically contain word 'json' are JSON-specific.
-
-Copyright (c) 2007- Tatu Saloranta, [email protected]
-
-See Open Source Licenses below for complete copy of the Apache 2.0 license
-
--------------------
-
-FasterXML Jackson Databind
-Version (if any):
-2.0.6
-Brief Description:
-This project contains core low-level incremental ("streaming") parser and generator abstractions used by Jackson Data Processor. It also includes the default implementation of handler types (parser, generator) that handle JSON format. The core abstractions are not JSON specific, although naming does contain 'JSON' in many places, due to historical reasons. Only packages that specifically contain word 'json' are JSON-specific.
-
-Copyright (c) 2007- Tatu Saloranta, [email protected]
-
-See Open Source Licenses below for complete copy of the Apache 2.0 license
-
--------------------
-
-Joda Time
-Version (if any):
-2.9.3
-Brief Description:
-Joda-Time provides a quality replacement for the Java date and time classes.
-
-Copyright 2001-2005 Stephen Colebourne
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-
- http:https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
-See Open Source Licenses below for complete copy of the Apache 2.0 license
-
--------------------
-
 org.json
 Version (if any):
 201602012

pom.xml

@@ -24,22 +24,17 @@
 
  <properties>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <aws-java-sdk.version>1.11.277</aws-java-sdk.version>
+ <aws-java-sdk.version>1.11.410</aws-java-sdk.version>
  <okta.version>1.2.0</okta.version>
- <joda-time.version>2.9.9</joda-time.version>
- <json.version>20171018</json.version>
- <log4j.version>2.10.0</log4j.version>
- <junit.jupiter.version>5.0.2</junit.jupiter.version>
- <junit.platform.version>1.0.1</junit.platform.version>
+ <json.version>20180813</json.version>
+ <log4j.version>2.11.1</log4j.version>
+ <junit.jupiter.version>5.3.1</junit.jupiter.version>
  <ini4j.version>0.5.4</ini4j.version>
  <jsoup.version>1.11.3</jsoup.version>
  <opensaml.version>3.3.0</opensaml.version>
- <slf4j.version>1.7.25</slf4j.version>
- <jackson.version>2.9.6</jackson.version>
  </properties>
 
  <dependencies>
- <!-- runtime dependencies -->
  <dependency>
  <groupId>com.amazonaws</groupId>
  <artifactId>aws-java-sdk-core</artifactId>
@@ -50,26 +45,6 @@
  <artifactId>aws-java-sdk-sts</artifactId>
  <version>${aws-java-sdk.version}</version>
  </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>${joda-time.version}</version>
- </dependency>
  <dependency>
  <groupId>org.json</groupId>
  <artifactId>json</artifactId>
@@ -117,12 +92,6 @@
  </dependency>
 
  <!-- Runtime dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-nop</artifactId>
- <version>${slf4j.version}</version>
- <scope>runtime</scope>
- </dependency>
  <dependency>
  <groupId>org.openjfx</groupId>
  <artifactId>javafx-web</artifactId>
@@ -142,20 +111,6 @@
  <version>2.22.0</version>
  <scope>test</scope>
  </dependency>
- <!-- To avoid compiler warnings about @API annotations in JUnit code -->
- <dependency>
- <groupId>org.apiguardian</groupId>
- <artifactId>apiguardian-api</artifactId>
- <version>1.0.0</version>
- <scope>test</scope>
- </dependency>
- <!-- Dynamic dependency of commons-configuration -->
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.9.3</version>
- <scope>runtime</scope>
- </dependency>
  </dependencies>
 
  <distributionManagement>
@@ -180,7 +135,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.2</version>
+ <version>3.8.0</version>
  <configuration>
  <source>1.8</source>
  <target>1.8</target>
@@ -189,7 +144,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-shade-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.2.0</version>
  <executions>
  <execution>
  <phase>package</phase>
@@ -221,7 +176,7 @@
  </plugin>
  <plugin>
  <artifactId>maven-surefire-plugin</artifactId>
- <version>2.19.1</version>
+ <version>2.22.0</version>
  <configuration>
  <includes>
  <include>**/Test*.java</include>
@@ -230,13 +185,6 @@
  <include>**/*TestCase.java</include>
  </includes>
  </configuration>
- <dependencies>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-surefire-provider</artifactId>
- <version>${junit.platform.version}</version>
- </dependency>
- </dependencies>
  </plugin>
  </plugins>
  </build>