Skip to content

Commit f18f77b

Browse files
authored
Move TC Native Dependency to azure-core-http-netty (Azure#28283)
Move TC Native Dependency to azure-core-http-netty
1 parent 9b31fd3 commit f18f77b

File tree

2 files changed

+50
-47
lines changed

2 files changed

+50
-47
lines changed

sdk/core/azure-core-http-netty/pom.xml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
--add-opens com.azure.http.netty/com.azure.core.http.netty=ALL-UNNAMED
5252
--add-opens com.azure.http.netty/com.azure.core.http.netty.implementation=ALL-UNNAMED
5353
</javaModulesSurefireArgLine>
54+
<boring-ssl-classifier></boring-ssl-classifier>
5455
</properties>
5556

5657
<developers>
@@ -111,6 +112,13 @@
111112
<classifier>osx-x86_64</classifier>
112113
</dependency>
113114

115+
<dependency>
116+
<groupId>io.netty</groupId>
117+
<artifactId>netty-tcnative-boringssl-static</artifactId>
118+
<version>2.0.47.Final</version> <!-- {x-version-update;io.netty:netty-tcnative-boringssl-static;external_dependency} -->
119+
<classifier>${boring-ssl-classifier}</classifier>
120+
</dependency>
121+
114122
<dependency>
115123
<groupId>io.projectreactor.netty</groupId>
116124
<artifactId>reactor-netty-http</artifactId>
@@ -188,6 +196,7 @@
188196
<rules>
189197
<bannedDependencies>
190198
<includes>
199+
<include>io.netty:netty-tcnative-boringssl-static:[2.0.47.Final]</include> <!-- {x-include-update;io.netty:netty-tcnative-boringssl-static;external_dependency} -->
191200
<include>io.projectreactor.netty:reactor-netty-http:[1.0.15]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty-http;external_dependency} -->
192201
<include>io.netty:netty-buffer:[4.1.73.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
193202
<include>io.netty:netty-codec-http:[4.1.73.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
@@ -215,4 +224,45 @@
215224
</plugin>
216225
</plugins>
217226
</build>
227+
228+
<profiles>
229+
<profile>
230+
<id>native-linux</id>
231+
<activation>
232+
<property>
233+
<name>native-linux</name>
234+
</property>
235+
</activation>
236+
237+
<properties>
238+
<boring-ssl-classifier>linux-x86_64</boring-ssl-classifier>
239+
</properties>
240+
</profile>
241+
242+
<profile>
243+
<id>native-macos</id>
244+
<activation>
245+
<property>
246+
<name>native-macos</name>
247+
</property>
248+
</activation>
249+
250+
<properties>
251+
<boring-ssl-classifier>osx-x86_64</boring-ssl-classifier>
252+
</properties>
253+
</profile>
254+
255+
<profile>
256+
<id>native-windows</id>
257+
<activation>
258+
<property>
259+
<name>native-windows</name>
260+
</property>
261+
</activation>
262+
263+
<properties>
264+
<boring-ssl-classifier>windows-x86_64</boring-ssl-classifier>
265+
</properties>
266+
</profile>
267+
</profiles>
218268
</project>

sdk/core/azure-core/pom.xml

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
4848
<jacoco.min.linecoverage>0.60</jacoco.min.linecoverage>
4949
<jacoco.min.branchcoverage>0.60</jacoco.min.branchcoverage>
50-
<boring-ssl-classifier></boring-ssl-classifier>
5150
<javaModulesSurefireArgLine>
5251
--add-exports com.azure.core/com.azure.core.implementation.http=ALL-UNNAMED
5352
--add-exports com.azure.core/com.azure.core.implementation.serializer=ALL-UNNAMED
@@ -132,12 +131,6 @@
132131
<artifactId>reactor-core</artifactId>
133132
<version>3.4.14</version> <!-- {x-version-update;io.projectreactor:reactor-core;external_dependency} -->
134133
</dependency>
135-
<dependency>
136-
<groupId>io.netty</groupId>
137-
<artifactId>netty-tcnative-boringssl-static</artifactId>
138-
<version>2.0.47.Final</version> <!-- {x-version-update;io.netty:netty-tcnative-boringssl-static;external_dependency} -->
139-
<classifier>${boring-ssl-classifier}</classifier>
140-
</dependency>
141134
<dependency>
142135
<groupId>io.projectreactor</groupId>
143136
<artifactId>reactor-test</artifactId>
@@ -237,7 +230,6 @@
237230
<rules>
238231
<bannedDependencies>
239232
<includes>
240-
<include>io.netty:netty-tcnative-boringssl-static:[2.0.47.Final]</include> <!-- {x-include-update;io.netty:netty-tcnative-boringssl-static;external_dependency} -->
241233
<include>io.projectreactor:reactor-core:[3.4.14]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
242234
<include>com.fasterxml.jackson.core:jackson-annotations:[2.13.2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
243235
<include>com.fasterxml.jackson.core:jackson-core:[2.13.2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-core;external_dependency} -->
@@ -338,45 +330,6 @@
338330
</build>
339331
</profile>
340332

341-
<profile>
342-
<id>native-linux</id>
343-
<activation>
344-
<property>
345-
<name>native-linux</name>
346-
</property>
347-
</activation>
348-
349-
<properties>
350-
<boring-ssl-classifier>linux-x86_64</boring-ssl-classifier>
351-
</properties>
352-
</profile>
353-
354-
<profile>
355-
<id>native-macos</id>
356-
<activation>
357-
<property>
358-
<name>native-macos</name>
359-
</property>
360-
</activation>
361-
362-
<properties>
363-
<boring-ssl-classifier>osx-x86_64</boring-ssl-classifier>
364-
</properties>
365-
</profile>
366-
367-
<profile>
368-
<id>native-windows</id>
369-
<activation>
370-
<property>
371-
<name>native-windows</name>
372-
</property>
373-
</activation>
374-
375-
<properties>
376-
<boring-ssl-classifier>windows-x86_64</boring-ssl-classifier>
377-
</properties>
378-
</profile>
379-
380333
<profile>
381334
<id>jmh-benchmark</id>
382335
<activation>

0 commit comments

Comments
 (0)