Skip to content

Commit ca901df

Browse files
committed
HSEARCH-5464 Fix aggregated javadocs and dependency alignment
1 parent dba2882 commit ca901df

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

build/parents/build/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
<version.org.wiremock.wiremock>3.13.1</version.org.wiremock.wiremock>
148148
<version.org.apache.commons.math3>3.6.1</version.org.apache.commons.math3>
149149
<version.commons-codec>1.19.0</version.commons-codec>
150+
<version.commons-logging>1.3.5</version.commons-logging>
150151
<!--
151152
When upgrading Avro:
152153
- make sure to create a new payload in EventPayloadSerializationUtilsTest
@@ -507,6 +508,12 @@
507508
<artifactId>commons-codec</artifactId>
508509
<version>${version.commons-codec}</version>
509510
</dependency>
511+
<!-- To align versions between different ES rest clients -->
512+
<dependency>
513+
<groupId>commons-logging</groupId>
514+
<artifactId>commons-logging</artifactId>
515+
<version>${version.commons-logging}</version>
516+
</dependency>
510517

511518
<!-- JakartaEE dependencies -->
512519
<dependency>

distribution/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@
276276
${basedir}/../mapper/orm/src/main/java;
277277
${basedir}/../mapper/pojo-standalone/src/main/java;
278278
${basedir}/../backend/elasticsearch/src/main/java;
279+
${basedir}/../backend/elasticsearch-client/common/src/main/java;
280+
${basedir}/../backend/elasticsearch-client/elasticsearch-rest-client/src/main/java;
281+
${basedir}/../backend/elasticsearch-client/elasticsearch-java-client/src/main/java;
282+
${basedir}/../backend/elasticsearch-client/opensearch-rest-client/src/main/java;
279283
${basedir}/../backend/elasticsearch-aws/src/main/java;
280284
${basedir}/../backend/lucene/src/main/java;
281285
${basedir}/../mapper/orm-outbox-polling/src/main/java;
@@ -288,6 +292,10 @@
288292
${basedir}/../mapper/orm/target/generated-sources/annotations;
289293
${basedir}/../mapper/pojo-standalone/target/generated-sources/annotations;
290294
${basedir}/../backend/elasticsearch/target/generated-sources/annotations;
295+
${basedir}/../backend/elasticsearch-client/common/target/generated-sources/annotations;
296+
${basedir}/../backend/elasticsearch-client/elasticsearch-rest-client/target/generated-sources/annotations;
297+
${basedir}/../backend/elasticsearch-client/opensearch-rest-client/target/generated-sources/annotations;
298+
${basedir}/../backend/elasticsearch-client/elasticsearch-java-client/target/generated-sources/annotations;
291299
${basedir}/../backend/elasticsearch-aws/target/generated-sources/annotations;
292300
${basedir}/../backend/lucene/target/generated-sources/annotations;
293301
${basedir}/../mapper/orm-outbox-polling/src/main/avro/generated;

0 commit comments

Comments
 (0)