Skip to content

Commit 05f7a37

Browse files
authored
[Key Vault JCA] Included the org.brotli:dec library in the list of shaded dependencies to avoid issues when generating and publishing docs to MSLearn (#45395)
* Included the `org.brotli:dec` library in the list of shaded dependencies to avoid issues when generating and publishing docs to MSLearn. * Updated NOTICE * Updated .cspell for new word in NOTICE.txt
1 parent e7de99a commit 05f7a37

File tree

5 files changed

+40
-1
lines changed

5 files changed

+40
-1
lines changed

.vscode/cspell.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,8 @@
924924
"Dokuka",
925925
"Netifi",
926926
"Zaugg",
927-
"lrgrwrks"
927+
"lrgrwrks",
928+
"Brotli"
928929
]
929930
},
930931
{

NOTICE.txt

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,3 +610,28 @@ compliance with the License. You may obtain a copy of the License at:
610610
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
611611
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
612612
language governing permissions and limitations under the License.
613+
614+
-------------------------------------------------------------------------------
615+
616+
License notice for Brotli
617+
------------------------------------------------------------------------------
618+
619+
Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
620+
621+
Permission is hereby granted, free of charge, to any person obtaining a copy
622+
of this software and associated documentation files (the "Software"), to deal
623+
in the Software without restriction, including without limitation the rights
624+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
625+
copies of the Software, and to permit persons to whom the Software is
626+
furnished to do so, subject to the following conditions:
627+
628+
The above copyright notice and this permission notice shall be included in
629+
all copies or substantial portions of the Software.
630+
631+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
632+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
633+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
634+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
635+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
636+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
637+
THE SOFTWARE.

eng/versioning/external_dependencies.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ org.apache.maven.archetype:archetype-packaging;3.3.0
8181
org.apache.maven.plugins:maven-archetype-plugin;3.3.0
8282
org.apache.qpid:proton-j;0.34.1
8383
org.asynchttpclient:async-http-client;2.12.1
84+
org.brotli:dec;0.1.2
8485
org.codehaus.groovy:groovy-jsr223;3.0.19
8586
org.codehaus.janino:janino;3.1.10
8687
org.codehaus.woodstox:stax2-api;4.2.2

sdk/keyvault/azure-security-keyvault-jca/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
### Bugs Fixed
1010

1111
### Other Changes
12+
- Included the `org.brotli:dec` library in the list of shaded dependencies to avoid issues when generating and publishing docs to MSLearn.
1213

1314
## 2.10.1 (2025-05-12)
1415

sdk/keyvault/azure-security-keyvault-jca/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@
4343
<artifactId>httpclient5</artifactId>
4444
<version>5.4.3</version> <!-- {x-version-update;org.apache.httpcomponents.client5:httpclient5;external_dependency} -->
4545
</dependency>
46+
<dependency>
47+
<groupId>org.brotli</groupId>
48+
<artifactId>dec</artifactId>
49+
<version>0.1.2</version> <!-- {x-version-update;org.brotli:dec;external_dependency} -->
50+
<optional>true</optional>
51+
</dependency>
4652
<!-- Conscrypt -->
4753
<dependency>
4854
<groupId>org.conscrypt</groupId>
@@ -204,6 +210,10 @@
204210
<pattern>org.apache.hc</pattern>
205211
<shadedPattern>com.azure.security.keyvault.jca.implementation.shaded.org.apache.hc</shadedPattern>
206212
</relocation>
213+
<relocation>
214+
<pattern>org.brotli</pattern>
215+
<shadedPattern>com.azure.security.keyvault.jca.implementation.shaded.org.brotli</shadedPattern>
216+
</relocation>
207217
<relocation>
208218
<pattern>org.slf4j</pattern>
209219
<shadedPattern>com.azure.security.keyvault.jca.implementation.shaded.org.slf4j</shadedPattern>
@@ -269,6 +279,7 @@
269279
<include>org.bouncycastle:bcpkix-lts8on:[2.73.6]</include> <!-- {x-include-update;org.bouncycastle:bcpkix-lts8on;external_dependency} -->
270280
<include>org.conscrypt:conscrypt-openjdk-uber:[2.5.2]</include> <!-- {x-include-update;org.conscrypt:conscrypt-openjdk-uber;external_dependency} -->
271281
<include>org.apache.httpcomponents.client5:httpclient5:[5.4.3]</include> <!-- {x-include-update;org.apache.httpcomponents.client5:httpclient5;external_dependency} -->
282+
<include>org.brotli:dec:[0.1.2]</include> <!-- {x-include-update;org.brotli:dec;external_dependency} -->
272283
<include>org.slf4j:slf4j-nop:[1.7.36]</include> <!-- {x-include-update;org.slf4j:slf4j-nop;external_dependency} -->
273284
</includes>
274285
</bannedDependencies>

0 commit comments

Comments
 (0)