Skip to content

Commit

Permalink
[hotfix] Apply for Opensearch 2.13.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@snuyanzin
snuyanzin committed Apr 16, 2024
1 parent 5ebe41c commit 209e7f4
Show file tree
Hide file tree
Showing 9 changed files with 77 additions and 59 deletions.
2 changes: 1 addition & 1 deletion flink-connector-opensearch-base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ under the License.

<!-- Allow users to pass custom connector versions -->
<properties>
<opensearch.version>1.3.14</opensearch.version>
<opensearch.version>1.3.15</opensearch.version>
<flink.connector.module.config><!-- required by
OpensearchSinkITCase --> --add-opens=java.base/java.lang=ALL-UNNAMED <!--
OpensearchSinkITCase --> --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED <!--
Expand Down
4 changes: 2 additions & 2 deletions ...ch-base/src/test/java/org/apache/flink/connector/opensearch/test/DockerImageVersions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
* integration tests.
*/
public class DockerImageVersions {
public static final String OPENSEARCH_1 = "opensearchproject/opensearch:1.3.14";
public static final String OPENSEARCH_2 = "opensearchproject/opensearch:2.11.1";
public static final String OPENSEARCH_1 = "opensearchproject/opensearch:1.3.15";
public static final String OPENSEARCH_2 = "opensearchproject/opensearch:2.13.0";
}
2 changes: 1 addition & 1 deletion flink-connector-opensearch/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ under the License.

<!-- Allow users to pass custom connector versions -->
<properties>
<opensearch.version>1.3.14</opensearch.version>
<opensearch.version>1.3.15</opensearch.version>
<flink.connector.module.config><!-- required by
OpensearchSinkITCase --> --add-opens=java.base/java.lang=ALL-UNNAMED <!--
OpensearchSinkITCase --> --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED <!--
Expand Down
2 changes: 1 addition & 1 deletion flink-connector-opensearch2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ under the License.

<!-- Allow users to pass custom connector versions -->
<properties>
<opensearch.version>2.11.1</opensearch.version>
<opensearch.version>2.13.0</opensearch.version>
<flink.connector.module.config><!-- required by
OpensearchSinkITCase --> --add-opens=java.base/java.lang=ALL-UNNAMED <!--
OpensearchSinkITCase --> --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED <!--
Expand Down
2 changes: 1 addition & 1 deletion flink-connector-opensearch2/src/test/resources/archunit.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#

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

# Enable this if a new (frozen) rule has been added in order to create the initial store and record the existing violations.
#freeze.store.default.allowStoreCreation=true
Expand Down
34 changes: 17 additions & 17 deletions flink-sql-connector-opensearch/src/main/resources/META-INF/NOTICE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the Apache Software License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)

- com.carrotsearch:hppc:0.8.1
- com.fasterxml.jackson.core:jackson-core:2.15.3
- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.3
- com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.3
- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.3
- com.fasterxml.jackson.core:jackson-core:2.16.2
- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.16.2
- com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.16.2
- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.16.2
- com.github.spullara.mustache.java:compiler:0.9.10
- commons-codec:commons-codec:1.15
- commons-logging:commons-logging:1.1.3
Expand All @@ -32,16 +32,16 @@ This project bundles the following dependencies under the Apache Software Licens
- org.apache.lucene:lucene-spatial3d:8.10.1
- org.apache.lucene:lucene-spatial-extras:8.10.1
- org.apache.lucene:lucene-suggest:8.10.1
- org.opensearch.client:opensearch-rest-client:1.3.14
- org.opensearch.client:opensearch-rest-high-level-client:1.3.14
- org.opensearch:opensearch-cli:1.3.14
- org.opensearch:opensearch-core:1.3.14
- org.opensearch:opensearch-geo:1.3.14
- org.opensearch:opensearch:1.3.14
- org.opensearch:opensearch-secure-sm:1.3.14
- org.opensearch:opensearch-x-content:1.3.14
- org.opensearch.plugin:aggs-matrix-stats-client:1.3.14
- org.opensearch.plugin:lang-mustache-client:1.3.14
- org.opensearch.plugin:mapper-extras-client:1.3.14
- org.opensearch.plugin:parent-join-client:1.3.14
- org.opensearch.plugin:rank-eval-client:1.3.14
- org.opensearch.client:opensearch-rest-client:1.3.15
- org.opensearch.client:opensearch-rest-high-level-client:1.3.15
- org.opensearch:opensearch-cli:1.3.15
- org.opensearch:opensearch-core:1.3.15
- org.opensearch:opensearch-geo:1.3.15
- org.opensearch:opensearch:1.3.15
- org.opensearch:opensearch-secure-sm:1.3.15
- org.opensearch:opensearch-x-content:1.3.15
- org.opensearch.plugin:aggs-matrix-stats-client:1.3.15
- org.opensearch.plugin:lang-mustache-client:1.3.15
- org.opensearch.plugin:mapper-extras-client:1.3.15
- org.opensearch.plugin:parent-join-client:1.3.15
- org.opensearch.plugin:rank-eval-client:1.3.15
16 changes: 16 additions & 0 deletions flink-sql-connector-opensearch2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,22 @@ under the License.
<pattern>org.apache.logging.log4j.jul</pattern>
<shadedPattern>org.apache.flink.opensearch2.shaded.org.apache.logging.log4j.jul</shadedPattern>
</relocation>
<relocation>
<pattern>reactor.util</pattern>
<shadedPattern>org.apache.flink.opensearch2.shaded.reactor.util</shadedPattern>
</relocation>
<relocation>
<pattern>reactor.core</pattern>
<shadedPattern>org.apache.flink.opensearch2.shaded.reactor.core</shadedPattern>
</relocation>
<relocation>
<pattern>reactor.adapter</pattern>
<shadedPattern>org.apache.flink.opensearch2.shaded.reactor.adapter</shadedPattern>
</relocation>
<relocation>
<pattern>org.reactivestreams</pattern>
<shadedPattern>org.apache.flink.opensearch2.shaded.org.reactivestreams</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
Expand Down
72 changes: 37 additions & 35 deletions flink-sql-connector-opensearch2/src/main/resources/META-INF/NOTICE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,48 +6,50 @@ The Apache Software Foundation (http://www.apache.org/).

This project bundles the following dependencies under the Apache Software License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)

- com.fasterxml.jackson.core:jackson-core:2.15.3
- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.3
- com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.3
- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.3
- com.fasterxml.jackson.core:jackson-core:2.16.2
- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.16.2
- com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.16.2
- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.16.2
- com.github.spullara.mustache.java:compiler:0.9.10
- commons-codec:commons-codec:1.15
- commons-logging:commons-logging:1.2
- org.apache.httpcomponents:httpasyncclient:4.1.5
- org.apache.httpcomponents:httpclient:4.5.13
- org.apache.httpcomponents:httpcore:4.4.14
- org.apache.httpcomponents:httpcore-nio:4.4.12
- org.apache.logging.log4j:log4j-jul:2.20.0
- org.apache.lucene:lucene-backward-codecs:9.7.0
- org.apache.lucene:lucene-analysis-common:9.7.0
- org.apache.lucene:lucene-core:9.7.0
- org.apache.lucene:lucene-grouping:9.7.0
- org.apache.lucene:lucene-highlighter:9.7.0
- org.apache.lucene:lucene-join:9.7.0
- org.apache.lucene:lucene-memory:9.7.0
- org.apache.lucene:lucene-misc:9.7.0
- org.apache.lucene:lucene-queries:9.7.0
- org.apache.lucene:lucene-queryparser:9.7.0
- org.apache.lucene:lucene-sandbox:9.7.0
- org.apache.lucene:lucene-spatial3d:9.7.0
- org.apache.lucene:lucene-spatial-extras:9.7.0
- org.apache.lucene:lucene-suggest:9.7.0
- org.opensearch.client:opensearch-rest-client:2.11.1
- org.opensearch.client:opensearch-rest-high-level-client:2.11.1
- org.opensearch:opensearch-cli:2.11.1
- org.opensearch:opensearch-common:2.11.1
- org.opensearch:opensearch-compress:2.11.1
- org.opensearch:opensearch-core:2.11.1
- org.opensearch:opensearch-geo:2.11.1
- org.opensearch:opensearch:2.11.1
- org.opensearch:opensearch-secure-sm:2.11.1
- org.opensearch:opensearch-telemetry:2.11.1
- org.opensearch:opensearch-x-content:2.11.1
- org.opensearch.plugin:aggs-matrix-stats-client:2.11.1
- org.opensearch.plugin:lang-mustache-client:2.11.1
- org.opensearch.plugin:mapper-extras-client:2.11.1
- org.opensearch.plugin:parent-join-client:2.11.1
- org.opensearch.plugin:rank-eval-client:2.11.1
- org.apache.logging.log4j:log4j-jul:2.21.0
- org.apache.lucene:lucene-backward-codecs:9.10.0
- org.apache.lucene:lucene-analysis-common:9.10.0
- org.apache.lucene:lucene-core:9.10.0
- org.apache.lucene:lucene-grouping:9.10.0
- org.apache.lucene:lucene-highlighter:9.10.0
- org.apache.lucene:lucene-join:9.10.0
- org.apache.lucene:lucene-memory:9.10.0
- org.apache.lucene:lucene-misc:9.10.0
- org.apache.lucene:lucene-queries:9.10.0
- org.apache.lucene:lucene-queryparser:9.10.0
- org.apache.lucene:lucene-sandbox:9.10.0
- org.apache.lucene:lucene-spatial3d:9.10.0
- org.apache.lucene:lucene-spatial-extras:9.10.0
- org.apache.lucene:lucene-suggest:9.10.0
- org.opensearch.client:opensearch-rest-client:2.13.0
- org.opensearch.client:opensearch-rest-high-level-client:2.13.0
- org.opensearch:opensearch-cli:2.13.0
- org.opensearch:opensearch-common:2.13.0
- org.opensearch:opensearch-compress:2.13.0
- org.opensearch:opensearch-core:2.13.0
- org.opensearch:opensearch-geo:2.13.0
- org.opensearch:opensearch:2.13.0
- org.opensearch:opensearch-secure-sm:2.13.0
- org.opensearch:opensearch-telemetry:2.13.0
- org.opensearch:opensearch-x-content:2.13.0
- org.opensearch.plugin:aggs-matrix-stats-client:2.13.0
- org.opensearch.plugin:lang-mustache-client:2.13.0
- org.opensearch.plugin:mapper-extras-client:2.13.0
- org.opensearch.plugin:parent-join-client:2.13.0
- org.opensearch.plugin:rank-eval-client:2.13.0
- io.projectreactor:reactor-core:3.5.15
- org.reactivestreams:reactive-streams:1.0.4

This project bundles the following dependencies under the BSD license.
See bundled license files for details.
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ under the License.
<flink.version>1.18.0</flink.version>

<commons-compress.version>1.26.1</commons-compress.version>
<jackson-bom.version>2.15.3</jackson-bom.version>
<jackson-bom.version>2.16.2</jackson-bom.version>
<junit5.version>5.10.2</junit5.version>
<assertj.version>3.25.3</assertj.version>
<testcontainers.version>1.19.7</testcontainers.version>
Expand Down

0 comments on commit 209e7f4

Please sign in to comment.