Skip to content

Commit 9a1e5c4

Browse files
Merge pull request #30 from oracle/topic_jitkukum_fixsnakeyamlcve
remove snakeyaml reference form sample modules due to cve issues and disable integration tests
2 parents 286d40e + 4017721 commit 9a1e5c4

File tree

4 files changed

+17
-5
lines changed

4 files changed

+17
-5
lines changed

.github/workflows/integrationTest.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# This workflow will build a Java project with Maven
2+
# Integration tests for github are disabled temporarily
23

34
name: Run the Integration Tests for Spring Cloud OCI
45

@@ -36,4 +37,4 @@ jobs:
3637
-DlogId=${{ vars.logId }} \
3738
-Dit.storage=${{ vars.it_storage }} \
3839
-DbucketName=${{ vars.bucketName }} \
39-
install
40+
install -DskipTests

spring-cloud-oci-samples/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,16 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
4646
<build>
4747
<pluginManagement>
4848
<plugins>
49+
<!-- Settings for dependency check exclusion for sample modules -->
50+
<!--
4951
<plugin>
5052
<groupId>org.owasp</groupId>
5153
<artifactId>dependency-check-maven</artifactId>
5254
<configuration>
5355
<skip>true</skip>
5456
</configuration>
5557
</plugin>
58+
-->
5659
<plugin>
5760
<groupId>org.springframework.boot</groupId>
5861
<artifactId>spring-boot-maven-plugin</artifactId>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,22 @@ 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>
2733
</dependency>
2834
<dependency>
2935
<groupId>org.springdoc</groupId>
3036
<artifactId>springdoc-openapi-ui</artifactId>
37+
<exclusions>
38+
<exclusion>
39+
<groupId>org.yaml</groupId>
40+
<artifactId>snakeyaml</artifactId>
41+
</exclusion>
42+
</exclusions>
3143
</dependency>
3244
<dependency>
3345
<groupId>org.springframework.boot</groupId>

spring-cloud-oci-samples/spring-cloud-oci-notification-sample/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
4040
<artifactId>spring-cloud-oci-common-samples-utils</artifactId>
4141
<type>test-jar</type>
4242
</dependency>
43-
<dependency>
44-
<groupId>org.springdoc</groupId>
45-
<artifactId>springdoc-openapi-ui</artifactId>
46-
</dependency>
4743
</dependencies>
4844

4945
<build>

0 commit comments

Comments
 (0)