Skip to content

Commit 1419f40

Browse files
authored
Merge pull request #42 from oracle/atael-add-snakeyaml
Put back snakeyaml & Spring Cloud 2023.0.2
2 parents fce4a0b + a123013 commit 1419f40

File tree

3 files changed

+2
-26
lines changed

3 files changed

+2
-26
lines changed

pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
6262

6363
<properties>
6464
<spring-cloud-oci-dependencies.version>${project.version}</spring-cloud-oci-dependencies.version>
65-
<spring-cloud-dependencies.version>2023.0.1</spring-cloud-dependencies.version>
65+
<spring-cloud-dependencies.version>2023.0.2</spring-cloud-dependencies.version>
6666
<spring-boot-dependencies.version>3.2.6</spring-boot-dependencies.version>
6767
<oci-sdk.version>3.43.0</oci-sdk.version>
6868
<spring-boot-maven-plugin.version>3.2.5</spring-boot-maven-plugin.version>
@@ -151,12 +151,6 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
151151
<groupId>org.springframework.boot</groupId>
152152
<artifactId>spring-boot-starter-test</artifactId>
153153
<scope>test</scope>
154-
<exclusions>
155-
<exclusion>
156-
<groupId>org.yaml</groupId>
157-
<artifactId>snakeyaml</artifactId>
158-
</exclusion>
159-
</exclusions>
160154
</dependency>
161155
</dependencies>
162156

spring-cloud-oci-core/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023, Oracle and/or its affiliates.
3+
Copyright (c) 2023, 2024, Oracle and/or its affiliates.
44
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
55
-->
66

@@ -48,12 +48,6 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
4848
<dependency>
4949
<groupId>org.springframework.boot</groupId>
5050
<artifactId>spring-boot-starter</artifactId>
51-
<exclusions>
52-
<exclusion>
53-
<groupId>org.yaml</groupId>
54-
<artifactId>snakeyaml</artifactId>
55-
</exclusion>
56-
</exclusions>
5751
</dependency>
5852
<dependency>
5953
<groupId>com.oracle.oci.sdk</groupId>

spring-cloud-oci-samples/spring-cloud-oci-common-samples-utils/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,10 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
2424
<dependency>
2525
<groupId>org.springframework.boot</groupId>
2626
<artifactId>spring-boot-starter-web</artifactId>
27-
<exclusions>
28-
<exclusion>
29-
<groupId>org.yaml</groupId>
30-
<artifactId>snakeyaml</artifactId>
31-
</exclusion>
32-
</exclusions>
3327
</dependency>
3428
<dependency>
3529
<groupId>org.springdoc</groupId>
3630
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
37-
<exclusions>
38-
<exclusion>
39-
<groupId>org.yaml</groupId>
40-
<artifactId>snakeyaml</artifactId>
41-
</exclusion>
42-
</exclusions>
4331
<version>2.5.0</version>
4432
</dependency>
4533
<dependency>

0 commit comments

Comments
 (0)