Skip to content

Commit 7cbeecb

Browse files
authored
This reverts commit 54e0338.
1 parent dda8a1b commit 7cbeecb

File tree

1 file changed

+8
-25
lines changed

1 file changed

+8
-25
lines changed

sdk/identity/azure-identity/pom.xml

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -42,31 +42,6 @@
4242
<groupId>com.microsoft.azure</groupId>
4343
<artifactId>msal4j</artifactId>
4444
<version>1.11.0</version> <!-- {x-version-update;com.microsoft.azure:msal4j;external_dependency} -->
45-
<exclusions>
46-
<exclusion>
47-
<!--
48-
com.nimbusds:oauth2-oidc-sdk:9.7 have version range: net.minidev:json-smart:[1.3.3,2.4.7].
49-
This will bring trouble to our customer.
50-
Refs: https://github.com/Azure/azure-sdk-for-java/issues/23373
51-
Remove this after we used new version of oauth2-oidc-sdk which removed version range.
52-
Refs: https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions/issues/370/variable-range-of-netminidev-json-smart
53-
-->
54-
<groupId>net.minidev</groupId>
55-
<artifactId>json-smart</artifactId>
56-
</exclusion>
57-
</exclusions>
58-
</dependency>
59-
<dependency>
60-
<!--
61-
com.nimbusds:oauth2-oidc-sdk:9.7 have version range: net.minidev:json-smart:[1.3.3,2.4.7].
62-
This will bring trouble to our customer.
63-
Refs: https://github.com/Azure/azure-sdk-for-java/issues/23373
64-
Remove this after we used new version of oauth2-oidc-sdk which removed version range.
65-
Refs: https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions/issues/370/variable-range-of-netminidev-json-smart
66-
-->
67-
<groupId>net.minidev</groupId>
68-
<artifactId>json-smart</artifactId>
69-
<version>2.4.7</version> <!-- {x-version-update;net.minidev:json-smart;external_dependency} -->
7045
</dependency>
7146
<dependency>
7247
<groupId>com.microsoft.azure</groupId>
@@ -109,6 +84,14 @@
10984
<version>2.8.9</version> <!-- {x-version-update;com.google.code.gson:gson;external_dependency} -->
11085
<scope>test</scope>
11186
</dependency>
87+
88+
<!-- This dependency pins the version to 2.4.7 and is required to be pinned as part of issue https://github.com/Azure/azure-sdk-for-java/issues/22807.
89+
Don't remove this until the version gets pinned in msal4j library.-->
90+
<dependency>
91+
<groupId>net.minidev</groupId>
92+
<artifactId>json-smart</artifactId>
93+
<version>2.4.7</version> <!-- {x-version-update;net.minidev:json-smart;external_dependency} -->
94+
</dependency>
11295
</dependencies>
11396

11497
<build>

0 commit comments

Comments
 (0)