Skip to content

Commit cdb4a3b

Browse files
authored
Modularize the repository-azure component (#94050)
1 parent 0d09580 commit cdb4a3b

File tree

3 files changed

+41
-7
lines changed

3 files changed

+41
-7
lines changed

gradle/verification-metadata.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,11 @@
129129
<sha256 value="0e67a261c1088b9d688d7461e27da95f6830bdde713420b0d783ae1025c4d384" origin="Generated by Gradle"/>
130130
</artifact>
131131
</component>
132+
<component group="com.azure" name="azure-storage-internal-avro" version="12.5.3">
133+
<artifact name="azure-storage-internal-avro-12.5.3.jar">
134+
<sha256 value="7cbebf7710808f3689fb6acf1384e710e13ecd74bfedbe6fa8cb467eaa156d83" origin="Generated by Gradle"/>
135+
</artifact>
136+
</component>
132137
<component group="com.bettercloud" name="vault-java-driver" version="4.1.0">
133138
<artifact name="vault-java-driver-4.1.0.jar">
134139
<sha256 value="8878c47594fcfaa3e5b6fd75bb0e8f82cd8d4e7d947dd2a8e986f6d1f4b6c23e" origin="Generated by Gradle"/>

modules/repository-azure/build.gradle

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ versions << [
2626
'azureCoreHttpNetty': '1.12.7',
2727
'azureJackson': '2.13.4',
2828
'azureJacksonDatabind': '2.13.4.2',
29+
'azureAvro': '12.5.3',
2930

3031
'jakartaActivation': '1.2.1',
3132
'jakartaXMLBind': '2.3.2',
@@ -72,11 +73,11 @@ dependencies {
7273
api "org.reactivestreams:reactive-streams:${versions.reactiveStreams}"
7374

7475
implementation project(":modules:transport-netty4")
76+
implementation("org.slf4j:slf4j-api:${versions.slf4j}")
7577

76-
runtimeOnly("org.slf4j:slf4j-api:${versions.slf4j}")
78+
runtimeOnly "com.azure:azure-storage-internal-avro:${versions.azureAvro}"
7779
runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}")
7880

79-
8081
testImplementation project(':test:fixtures:azure-fixture')
8182
}
8283

@@ -107,11 +108,6 @@ tasks.named("dependencyLicenses").configure {
107108

108109
tasks.named("thirdPartyAudit").configure {
109110
ignoreMissingClasses(
110-
'com.azure.storage.internal.avro.implementation.AvroObject',
111-
'com.azure.storage.internal.avro.implementation.AvroReader',
112-
'com.azure.storage.internal.avro.implementation.AvroReaderFactory',
113-
'com.azure.storage.internal.avro.implementation.schema.AvroSchema',
114-
115111
// from reactory-netty metric collection
116112
'io.micrometer.core.instrument.Clock',
117113
'io.micrometer.core.instrument.Counter',
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
5+
* in compliance with, at your election, the Elastic License 2.0 or the Server
6+
* Side Public License, v 1.
7+
*/
8+
9+
module org.elasticsearch.repository.azure {
10+
requires org.elasticsearch.base;
11+
requires org.elasticsearch.transport.netty4;
12+
requires org.elasticsearch.server;
13+
requires org.elasticsearch.xcontent;
14+
15+
requires org.apache.lucene.core;
16+
17+
requires org.apache.logging.log4j;
18+
requires org.apache.logging.log4j.core;
19+
20+
requires com.azure.core;
21+
requires com.azure.http.netty;
22+
requires com.azure.storage.blob;
23+
requires com.azure.storage.common;
24+
25+
requires io.netty.buffer;
26+
requires io.netty.transport;
27+
requires io.netty.resolver;
28+
requires io.netty.common;
29+
30+
requires reactor.core;
31+
requires reactor.netty.core;
32+
requires reactor.netty.http;
33+
}

0 commit comments

Comments
 (0)