Skip to content

Commit

Permalink
Merge pull request #382 from RWS/hotfix/27/CRQ-35912
Browse files Browse the repository at this point in the history 
CRQ-35912 : Updated vulnerabilities
  • Loading branch information
@ben-gineer
ben-gineer authored Oct 30, 2023
2 parents d2f9251 + 413dc41 commit c91d6ce
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 45 deletions.
8 changes: 4 additions & 4 deletions odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/ODataAtomParser.java
View file
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
88 changes: 47 additions & 41 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,21 +91,21 @@
<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>
<scala.version>2.12.11</scala.version>
<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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit c91d6ce

Please sign in to comment.