Skip to content

Commit 524cd2e

Browse files
snuyanzinsnuyanzin
committed
[hotfix] Apply for Opensearch 2.13.0
1 parent abacb47 commit 524cd2e

File tree

9 files changed

+52
-36
lines changed

9 files changed

+52
-36
lines changed

‎flink-connector-opensearch-base/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ under the License.
3636

3737
<!-- Allow users to pass custom connector versions -->
3838
<properties>
39-
<opensearch.version>1.3.14</opensearch.version>
39+
<opensearch.version>1.3.15</opensearch.version>
4040
<flink.connector.module.config><!-- required by
4141
OpensearchSinkITCase --> --add-opens=java.base/java.lang=ALL-UNNAMED <!--
4242
OpensearchSinkITCase --> --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED <!--

‎flink-connector-opensearch-base/src/test/java/org/apache/flink/connector/opensearch/test/DockerImageVersions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
* integration tests.
2323
*/
2424
public class DockerImageVersions {
25-
public static final String OPENSEARCH_1 = "opensearchproject/opensearch:1.3.14";
26-
public static final String OPENSEARCH_2 = "opensearchproject/opensearch:2.11.1";
25+
public static final String OPENSEARCH_1 = "opensearchproject/opensearch:1.3.15";
26+
public static final String OPENSEARCH_2 = "opensearchproject/opensearch:2.13.0";
2727
}

‎flink-connector-opensearch/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ under the License.
3636

3737
<!-- Allow users to pass custom connector versions -->
3838
<properties>
39-
<opensearch.version>1.3.14</opensearch.version>
39+
<opensearch.version>1.3.15</opensearch.version>
4040
<flink.connector.module.config><!-- required by
4141
OpensearchSinkITCase --> --add-opens=java.base/java.lang=ALL-UNNAMED <!--
4242
OpensearchSinkITCase --> --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED <!--

‎flink-connector-opensearch2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ under the License.
3636

3737
<!-- Allow users to pass custom connector versions -->
3838
<properties>
39-
<opensearch.version>2.11.1</opensearch.version>
39+
<opensearch.version>2.13.0</opensearch.version>
4040
<flink.connector.module.config><!-- required by
4141
OpensearchSinkITCase --> --add-opens=java.base/java.lang=ALL-UNNAMED <!--
4242
OpensearchSinkITCase --> --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED <!--

‎flink-connector-opensearch2/src/test/resources/archunit.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#
1818

1919
# By default we allow removing existing violations, but fail when new violations are added.
20-
freeze.store.default.allowStoreUpdate=true
20+
@freeze.store.default.allowStoreUpdate=true
2121

2222
# Enable this if a new (frozen) rule has been added in order to create the initial store and record the existing violations.
2323
#freeze.store.default.allowStoreCreation=true

‎flink-sql-connector-opensearch/src/main/resources/META-INF/NOTICE

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ This project bundles the following dependencies under the Apache Software Licens
3232
- org.apache.lucene:lucene-spatial3d:8.10.1
3333
- org.apache.lucene:lucene-spatial-extras:8.10.1
3434
- org.apache.lucene:lucene-suggest:8.10.1
35-
- org.opensearch.client:opensearch-rest-client:1.3.14
36-
- org.opensearch.client:opensearch-rest-high-level-client:1.3.14
37-
- org.opensearch:opensearch-cli:1.3.14
38-
- org.opensearch:opensearch-core:1.3.14
39-
- org.opensearch:opensearch-geo:1.3.14
40-
- org.opensearch:opensearch:1.3.14
41-
- org.opensearch:opensearch-secure-sm:1.3.14
42-
- org.opensearch:opensearch-x-content:1.3.14
43-
- org.opensearch.plugin:aggs-matrix-stats-client:1.3.14
44-
- org.opensearch.plugin:lang-mustache-client:1.3.14
45-
- org.opensearch.plugin:mapper-extras-client:1.3.14
46-
- org.opensearch.plugin:parent-join-client:1.3.14
47-
- org.opensearch.plugin:rank-eval-client:1.3.14
35+
- org.opensearch.client:opensearch-rest-client:1.3.15
36+
- org.opensearch.client:opensearch-rest-high-level-client:1.3.15
37+
- org.opensearch:opensearch-cli:1.3.15
38+
- org.opensearch:opensearch-core:1.3.15
39+
- org.opensearch:opensearch-geo:1.3.15
40+
- org.opensearch:opensearch:1.3.15
41+
- org.opensearch:opensearch-secure-sm:1.3.15
42+
- org.opensearch:opensearch-x-content:1.3.15
43+
- org.opensearch.plugin:aggs-matrix-stats-client:1.3.15
44+
- org.opensearch.plugin:lang-mustache-client:1.3.15
45+
- org.opensearch.plugin:mapper-extras-client:1.3.15
46+
- org.opensearch.plugin:parent-join-client:1.3.15
47+
- org.opensearch.plugin:rank-eval-client:1.3.15

‎flink-sql-connector-opensearch2/pom.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,22 @@ under the License.
170170
<pattern>org.apache.logging.log4j.jul</pattern>
171171
<shadedPattern>org.apache.flink.opensearch2.shaded.org.apache.logging.log4j.jul</shadedPattern>
172172
</relocation>
173+
<relocation>
174+
<pattern>reactor.util</pattern>
175+
<shadedPattern>org.apache.flink.opensearch2.shaded.reactor.util</shadedPattern>
176+
</relocation>
177+
<relocation>
178+
<pattern>reactor.core</pattern>
179+
<shadedPattern>org.apache.flink.opensearch2.shaded.reactor.core</shadedPattern>
180+
</relocation>
181+
<relocation>
182+
<pattern>reactor.adapter</pattern>
183+
<shadedPattern>org.apache.flink.opensearch2.shaded.reactor.adapter</shadedPattern>
184+
</relocation>
185+
<relocation>
186+
<pattern>org.reactivestreams</pattern>
187+
<shadedPattern>org.apache.flink.opensearch2.shaded.org.reactivestreams</shadedPattern>
188+
</relocation>
173189
</relocations>
174190
</configuration>
175191
</execution>

‎flink-sql-connector-opensearch2/src/main/resources/META-INF/NOTICE

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,22 @@ This project bundles the following dependencies under the Apache Software Licens
3232
- org.apache.lucene:lucene-spatial3d:9.7.0
3333
- org.apache.lucene:lucene-spatial-extras:9.7.0
3434
- org.apache.lucene:lucene-suggest:9.7.0
35-
- org.opensearch.client:opensearch-rest-client:2.11.1
36-
- org.opensearch.client:opensearch-rest-high-level-client:2.11.1
37-
- org.opensearch:opensearch-cli:2.11.1
38-
- org.opensearch:opensearch-common:2.11.1
39-
- org.opensearch:opensearch-compress:2.11.1
40-
- org.opensearch:opensearch-core:2.11.1
41-
- org.opensearch:opensearch-geo:2.11.1
42-
- org.opensearch:opensearch:2.11.1
43-
- org.opensearch:opensearch-secure-sm:2.11.1
44-
- org.opensearch:opensearch-telemetry:2.11.1
45-
- org.opensearch:opensearch-x-content:2.11.1
46-
- org.opensearch.plugin:aggs-matrix-stats-client:2.11.1
47-
- org.opensearch.plugin:lang-mustache-client:2.11.1
48-
- org.opensearch.plugin:mapper-extras-client:2.11.1
49-
- org.opensearch.plugin:parent-join-client:2.11.1
50-
- org.opensearch.plugin:rank-eval-client:2.11.1
35+
- org.opensearch.client:opensearch-rest-client:2.13.0
36+
- org.opensearch.client:opensearch-rest-high-level-client:2.13.0
37+
- org.opensearch:opensearch-cli:2.13.0
38+
- org.opensearch:opensearch-common:2.13.0
39+
- org.opensearch:opensearch-compress:2.13.0
40+
- org.opensearch:opensearch-core:2.13.0
41+
- org.opensearch:opensearch-geo:2.13.0
42+
- org.opensearch:opensearch:2.13.0
43+
- org.opensearch:opensearch-secure-sm:2.13.0
44+
- org.opensearch:opensearch-telemetry:2.13.0
45+
- org.opensearch:opensearch-x-content:2.13.0
46+
- org.opensearch.plugin:aggs-matrix-stats-client:2.13.0
47+
- org.opensearch.plugin:lang-mustache-client:2.13.0
48+
- org.opensearch.plugin:mapper-extras-client:2.13.0
49+
- org.opensearch.plugin:parent-join-client:2.13.0
50+
- org.opensearch.plugin:rank-eval-client:2.13.0
5151

5252
This project bundles the following dependencies under the BSD license.
5353
See bundled license files for details.

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ under the License.
6161
<flink.version>1.18.0</flink.version>
6262

6363
<commons-compress.version>1.26.1</commons-compress.version>
64-
<jackson-bom.version>2.15.3</jackson-bom.version>
64+
<jackson-bom.version>2.16.2</jackson-bom.version>
6565
<junit5.version>5.10.2</junit5.version>
6666
<assertj.version>3.25.3</assertj.version>
6767
<testcontainers.version>1.19.7</testcontainers.version>

0 commit comments

Comments
 (0)