Skip to content

Commit 5cf5c5a

Browse files
authored
Fix live test failure (Azure#19407)
1 parent 413a717 commit 5cf5c5a

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

sdk/spring/azure-spring-boot-test-parent/pom.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,23 @@
3030
<type>pom</type>
3131
<scope>import</scope>
3232
</dependency>
33+
<!-- Define jackson libraries version here to solve conflicts with azure-identity,
34+
this could be removed when there are no breaking changes between jackson libraries imported from Spring Boot and azure-identity -->
35+
<dependency>
36+
<groupId>com.fasterxml.jackson.core</groupId>
37+
<artifactId>jackson-databind</artifactId>
38+
<version>2.12.1</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
39+
</dependency>
40+
<dependency>
41+
<groupId>com.fasterxml.jackson.core</groupId>
42+
<artifactId>jackson-annotations</artifactId>
43+
<version>2.12.1</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
44+
</dependency>
45+
<dependency>
46+
<groupId>com.fasterxml.jackson.core</groupId>
47+
<artifactId>jackson-core</artifactId>
48+
<version>2.12.1</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-core;external_dependency} -->
49+
</dependency>
3350
</dependencies>
3451
</dependencyManagement>
3552

sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
<artifactId>gson</artifactId>
3434
<version>2.8.6</version> <!-- {x-version-update;com.google.code.gson:gson;external_dependency} -->
3535
</dependency>
36-
3736
<dependency>
3837
<groupId>org.springframework.boot</groupId>
3938
<artifactId>spring-boot-starter-test</artifactId>

sdk/spring/spring-test-template.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ parameters:
33
TestName: 'LiveTestInAzureGlobal'
44
Clouds: 'Public'
55
TestResourceDirectories:
6+
- spring/azure-spring-boot-test-cosmos
67
- spring/azure-spring-boot-test-keyvault
78
- spring/azure-spring-boot-test-servicebus-jms
89
- spring/azure-spring-boot-test-storage
@@ -14,6 +15,9 @@ parameters:
1415
- name: azure-spring-boot-test-core
1516
groupId: com.azure.spring
1617
safeName: azurespringboottestcore
18+
- name: azure-spring-boot-test-cosmos
19+
groupId: com.azure.spring
20+
safeName: azurespringboottestcosmos
1721
- name: azure-spring-boot-test-aad
1822
groupId: com.azure.spring
1923
safeName: azurespringboottestaad

0 commit comments

Comments
 (0)