diff --git a/NOTICE b/NOTICE index 4604c32cb35f0b0f29c1123e4b4d6a8c6c3bd412..2b22524e40384776224f6f58ea055c74ae2d9190 100644 --- a/NOTICE +++ b/NOTICE @@ -479,6 +479,7 @@ The following software have components provided under the terms of this license: - Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util) - Redisson (from http://redisson.org) - ServiceLocator Default Implementation (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-locator) +- SnakeYAML (from http://code.google.com/p/snakeyaml/, http://www.snakeyaml.org, https://bitbucket.org/snakeyaml/snakeyaml) - Spring Core (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-core) - Spring Data KeyValue (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-keyvalue) - ThreeTen backport (from https://github.com/ThreeTen/threetenbp, https://www.threeten.org/threetenbp) @@ -620,6 +621,7 @@ The following software have components provided under the terms of this license: - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java) +- SnakeYAML (from http://code.google.com/p/snakeyaml/, http://www.snakeyaml.org, https://bitbucket.org/snakeyaml/snakeyaml) - aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged) - jersey-core-common (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-common) - jersey-core-server (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-server) @@ -697,6 +699,13 @@ The following software have components provided under the terms of this license: - jersey-spring5 (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-spring5) - tomcat-embed-core (from http://tomcat.apache.org/) +======================================================================== +GPL-2.0-or-later +======================================================================== +The following software have components provided under the terms of this license: + +- SnakeYAML (from http://code.google.com/p/snakeyaml/, http://www.snakeyaml.org, https://bitbucket.org/snakeyaml/snakeyaml) + ======================================================================== GPL-2.0-with-classpath-exception ======================================================================== @@ -814,6 +823,7 @@ The following software have components provided under the terms of this license: - Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna) - Java Native Access Platform (from https://github.com/java-native-access/jna) - Javassist (from http://www.javassist.org/) +- SnakeYAML (from http://code.google.com/p/snakeyaml/, http://www.snakeyaml.org, https://bitbucket.org/snakeyaml/snakeyaml) ======================================================================== LGPL-3.0-only diff --git a/pom.xml b/pom.xml index a25fb78d1c0d27cf257d1d69483a7aff001d0bd3..6627da23b55afceb739599314ebbdda848182d61 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <jackson.version>2.13.2</jackson.version> <resteasy.version>3.12.0.Final</resteasy.version> <elasticsearch.version>7.8.1</elasticsearch.version> - <snakeyaml.version>1.33</snakeyaml.version> + <snakeyaml.version>2.0</snakeyaml.version> <commons-codec.version>1.14</commons-codec.version> <hibernate-validator.version>6.1.5.Final</hibernate-validator.version> <httpclient.version>4.5.13</httpclient.version> @@ -64,6 +64,13 @@ </modules> <dependencyManagement> <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-dependencies</artifactId> + <version>2.7.10</version> + <type>pom</type> + <scope>import</scope> + </dependency> <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>os-core-common</artifactId> @@ -76,7 +83,6 @@ <artifactId>javassist</artifactId> <version>3.24.1-GA</version> </dependency> - <dependency> <groupId>io.swagger</groupId> <artifactId>swagger-jaxrs</artifactId> diff --git a/provider/search-ibm/pom.xml b/provider/search-ibm/pom.xml index d2e2a7314d85f491400face66a24e975208f7e49..ce4d0a41607b66940fd7a1c748bbb849d378750a 100644 --- a/provider/search-ibm/pom.xml +++ b/provider/search-ibm/pom.xml @@ -251,7 +251,7 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.33</version> + <version>2.0</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/search-core/pom.xml b/search-core/pom.xml index 663fc4531599661887fba4a29811acec8621a102..b9676437dede84c86bc0b16d623c9ebf1a05cf33 100644 --- a/search-core/pom.xml +++ b/search-core/pom.xml @@ -40,8 +40,8 @@ <elasticsearch.version>7.8.1</elasticsearch.version> <osdu.oscorecommon.version>0.19.0</osdu.oscorecommon.version> <netty.version>4.1.70.Final</netty.version> - <spring-security-web.version>5.7.3</spring-security-web.version> - <spring-webmvc.version>5.3.22</spring-webmvc.version> + <spring-security-web.version>5.8.2</spring-security-web.version> + <spring-webmvc.version>5.3.26</spring-webmvc.version> </properties> <dependencyManagement>