From 413dc4156f8e22e195d5fab9fb382c0915603d96 Mon Sep 17 00:00:00 2001
From: Ben Middleton <BMiddleton@sdl.com>
Date: Mon, 30 Oct 2023 11:59:47 +0000
Subject: [PATCH] CRQ-35912 : Updated vulnerabilities

---
 .../unmarshaller/atom/ODataAtomParser.java    |  8 +-
 pom.xml                                       | 88 ++++++++++---------
 2 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/ODataAtomParser.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/ODataAtomParser.java
index 659880fd..3718c084 100644
--- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/ODataAtomParser.java
+++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/ODataAtomParser.java
@@ -1,12 +1,12 @@
 /**
  * Copyright (c) 2014 All Rights Reserved by the SDL Group.
- * <p>
+ *
  * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *     http://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.
diff --git a/pom.xml b/pom.xml
index 868e9d4d..95a66024 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,10 +91,10 @@
         <akka.version>2.5.31</akka.version>
         <apache-procrun.version>1.0</apache-procrun.version>
         <brave.version>4.2.0</brave.version>
-        <guava.version>30.1.1-jre</guava.version>
+        <guava.version>32.1.2-jre</guava.version>
         <httpcomponents.version>4.5.13</httpcomponents.version>
-        <jackson.version>2.10.5</jackson.version>
-        <jacoco.version>0.8.5</jacoco.version>
+        <jackson.version>2.14.2</jackson.version>
+        <jacoco.version>0.8.10</jacoco.version>
         <junit.version>4.13.1</junit.version>
         <logback.version>1.2.11</logback.version>
         <mockito.version>2.24.0</mockito.version>
@@ -102,10 +102,10 @@
         <scala-parser-combinators.version>1.1.1</scala-parser-combinators.version>
         <scalatest.version>3.0.8</scalatest.version>
         <servlet-api.version>3.1.0</servlet-api.version>
-        <slf4j.version>1.7.30</slf4j.version>
-        <spring.version>5.1.15.RELEASE</spring.version>
-        <spring-boot.version>2.1.14.RELEASE</spring-boot.version>
-        <tomcat.version>9.0.62</tomcat.version>
+        <slf4j.version>1.7.36</slf4j.version>
+        <spring.version>5.1.20.RELEASE</spring.version>
+        <spring-boot.version>2.1.18.RELEASE</spring-boot.version>
+        <tomcat.version>9.0.82</tomcat.version>
         <typesafe-config.version>1.3.4</typesafe-config.version>
         <xerces.version>2.12.2</xerces.version>
         <zipkin-sender.version>0.8.0</zipkin-sender.version>
@@ -429,27 +429,27 @@
                 <plugin>
                     <groupId>org.sonatype.plugins</groupId>
                     <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <version>1.6.8</version>
+                    <version>1.6.13</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-gpg-plugin</artifactId>
-                    <version>3.0.1</version>
+                    <version>3.1.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.6.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>3.0.0-M4</version>
+                    <version>3.0.1</version>
                     <configuration>
                         <autoVersionSubmodules>true</autoVersionSubmodules>
                         <releaseProfiles>release</releaseProfiles>
@@ -458,12 +458,12 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>flatten-maven-plugin</artifactId>
-                    <version>1.2.2</version>
+                    <version>1.5.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.7</version>
+                    <version>2.16.1</version>
                     <configuration>
                         <includes>
                             <include>com.sdl:*</include>
@@ -473,12 +473,12 @@
                 <plugin>
                     <groupId>net.alchim31.maven</groupId>
                     <artifactId>scala-maven-plugin</artifactId>
-                    <version>4.3.1</version>
+                    <version>4.8.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-antrun-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.1.0</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.ant</groupId>
@@ -490,17 +490,17 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>3.11.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>3.0.0-M1</version>
+                    <version>3.1.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.0</version>
                     <configuration>
                         <archive>
                             <addMavenDescriptor>false</addMavenDescriptor>
@@ -522,12 +522,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
-                    <version>3.2.3</version>
+                    <version>3.4.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.scalatest</groupId>
                     <artifactId>scalatest-maven-plugin</artifactId>
-                    <version>2.0.0</version>
+                    <version>2.2.0</version>
                     <configuration>
                         <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
                         <junitxml>.</junitxml>
@@ -545,7 +545,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.3.0</version>
                     <dependencies>
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
@@ -562,27 +562,17 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.0.0-M4</version>
+                    <version>3.1.2</version>
                 </plugin>
                 <plugin>
                     <groupId>com.mycila</groupId>
                     <artifactId>license-maven-plugin</artifactId>
-                    <version>3.0</version>
-                    <configuration>
-                        <properties>
-                            <inceptionYear>${project.inceptionYear}</inceptionYear>
-                            <latestYearOfContribution>${currentYearDynamic}</latestYearOfContribution>
-                        </properties>
-                        <header>${license.header.file}</header>
-                        <excludes>
-                            <exclude>src/license/**</exclude>
-                        </excludes>
-                    </configuration>
+                    <version>4.3</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.4.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -714,11 +704,27 @@
                     <execution>
                         <id>process-sources</id>
                         <configuration>
-                            <includes>
-                                <include>**/*.java</include>
-                                <include>**/*.scala</include>
-                                <include>**/pom.xml</include>
-                            </includes>
+                            <properties>
+                                <inceptionYear>${project.inceptionYear}</inceptionYear>
+                                <latestYearOfContribution>${currentYearDynamic}</latestYearOfContribution>
+                            </properties>
+                            <licenseSets>
+                                <licenseSet>
+                                    <header>${license.header.file}</header>
+                                    <excludes>
+                                        <exclude>src/license/**</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>**/*.java</include>
+                                        <include>**/*.scala</include>
+                                        <include>**/pom.xml</include>
+                                    </includes>
+                                </licenseSet>
+                            </licenseSets>
+                            <mapping>
+                                <java>JAVADOC_STYLE</java>
+                                <scala>JAVADOC_STYLE</scala>
+                            </mapping>
                         </configuration>
                         <phase>process-sources</phase>
                         <goals>
@@ -786,7 +792,7 @@
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>ossrh</serverId>
-                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
                             <autoReleaseAfterClose>true</autoReleaseAfterClose>
                         </configuration>
                     </plugin>