This is an automated email from the ASF dual-hosted git repository.
snuyanzin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-opensearch.git
The following commit(s) were added to refs/heads/main by this push:
new f2646bc [hotfix] Make `PackagingITCase` Windows-friendly
f2646bc is described below
commit f2646bce848b51140d9b29158a1517e684c6fe66
Author: Andriy Redko <[email protected]>
AuthorDate: Sun May 17 08:04:29 2026 -0400
[hotfix] Make `PackagingITCase` Windows-friendly
Signed-off-by: Andriy Redko <[email protected]>
---
.../apache/flink/connector/opensearch/PackagingITCase.java | 3 ++-
.../apache/flink/connector/opensearch2/PackagingITCase.java | 3 ++-
flink-sql-connector-opensearch3/pom.xml | 12 ++++++++++++
.../apache/flink/connector/opensearch3}/PackagingITCase.java | 6 ++++--
4 files changed, 20 insertions(+), 4 deletions(-)
diff --git
a/flink-sql-connector-opensearch/src/test/java/org/apache/flink/connector/opensearch/PackagingITCase.java
b/flink-sql-connector-opensearch/src/test/java/org/apache/flink/connector/opensearch/PackagingITCase.java
index 2a2d110..3b586a1 100644
---
a/flink-sql-connector-opensearch/src/test/java/org/apache/flink/connector/opensearch/PackagingITCase.java
+++
b/flink-sql-connector-opensearch/src/test/java/org/apache/flink/connector/opensearch/PackagingITCase.java
@@ -32,7 +32,8 @@ class PackagingITCase {
@Test
void testPackaging() throws Exception {
final Path jar =
-
ResourceTestUtils.getResource(".*/flink-sql-connector-opensearch-[^/]*\\.jar");
+ ResourceTestUtils.getResource(
+
".*[\\\\/]flink-sql-connector-opensearch-[^\\\\/]*\\.jar");
PackagingTestUtils.assertJarContainsOnlyFilesMatching(
jar,
diff --git
a/flink-sql-connector-opensearch2/src/test/java/org/apache/flink/connector/opensearch2/PackagingITCase.java
b/flink-sql-connector-opensearch2/src/test/java/org/apache/flink/connector/opensearch2/PackagingITCase.java
index 503652a..3db4087 100644
---
a/flink-sql-connector-opensearch2/src/test/java/org/apache/flink/connector/opensearch2/PackagingITCase.java
+++
b/flink-sql-connector-opensearch2/src/test/java/org/apache/flink/connector/opensearch2/PackagingITCase.java
@@ -32,7 +32,8 @@ class PackagingITCase {
@Test
void testPackaging() throws Exception {
final Path jar =
-
ResourceTestUtils.getResource(".*/flink-sql-connector-opensearch2-[^/]*\\.jar");
+ ResourceTestUtils.getResource(
+
".*[\\\\/]flink-sql-connector-opensearch2-[^\\\\/]*\\.jar");
PackagingTestUtils.assertJarContainsOnlyFilesMatching(
jar,
diff --git a/flink-sql-connector-opensearch3/pom.xml
b/flink-sql-connector-opensearch3/pom.xml
index 4c15242..39fdfcc 100644
--- a/flink-sql-connector-opensearch3/pom.xml
+++ b/flink-sql-connector-opensearch3/pom.xml
@@ -73,6 +73,9 @@ under the License.
<exclude>net.java.dev.jna:jna</exclude>
<exclude>org.hdrhistogram:HdrHistogram</exclude>
<exclude>org.yaml:snakeyaml</exclude>
+
<exclude>jakarta.annotation:jakarta.annotation-api</exclude>
+
<exclude>org.eclipse:yasson</exclude>
+
<exclude>org.eclipse.parsson:parsson</exclude>
</excludes>
</artifactSet>
<filters>
@@ -96,6 +99,7 @@ under the License.
<exclude>META-INF/versions/**</exclude>
<exclude>META-INF/services/com.fasterxml.**</exclude>
<exclude>META-INF/LICENSE.txt</exclude>
+
<exclude>**/effective_tld_names.dat</exclude>
</excludes>
</filter>
</filters>
@@ -108,6 +112,10 @@ under the License.
<pattern>org.apache.commons.logging</pattern>
<shadedPattern>org.apache.flink.opensearch3.shaded.org.apache.commons.logging</shadedPattern>
</relocation>
+ <relocation>
+
<pattern>org.apache.http</pattern>
+
<shadedPattern>org.apache.flink.opensearch3.shaded.org.apache.http</shadedPattern>
+ </relocation>
<relocation>
<pattern>org.apache.hc</pattern>
<shadedPattern>org.apache.flink.opensearch3.shaded.org.apache.hc</shadedPattern>
@@ -124,6 +132,10 @@ under the License.
<pattern>jakarta.json</pattern>
<shadedPattern>org.apache.flink.opensearch3.shaded.jakarta.json</shadedPattern>
</relocation>
+ <relocation>
+
<pattern>org.glassfish</pattern>
+
<shadedPattern>org.apache.flink.opensearch3.shaded.org.glassfish</shadedPattern>
+ </relocation>
</relocations>
</configuration>
</execution>
diff --git
a/flink-sql-connector-opensearch/src/test/java/org/apache/flink/connector/opensearch/PackagingITCase.java
b/flink-sql-connector-opensearch3/src/test/java/org/apache/flink/connector/opensearch3/PackagingITCase.java
similarity index 87%
copy from
flink-sql-connector-opensearch/src/test/java/org/apache/flink/connector/opensearch/PackagingITCase.java
copy to
flink-sql-connector-opensearch3/src/test/java/org/apache/flink/connector/opensearch3/PackagingITCase.java
index 2a2d110..956dbeb 100644
---
a/flink-sql-connector-opensearch/src/test/java/org/apache/flink/connector/opensearch/PackagingITCase.java
+++
b/flink-sql-connector-opensearch3/src/test/java/org/apache/flink/connector/opensearch3/PackagingITCase.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.opensearch;
+package org.apache.flink.connector.opensearch3;
import org.apache.flink.packaging.PackagingTestUtils;
import org.apache.flink.table.factories.Factory;
@@ -32,7 +32,8 @@ class PackagingITCase {
@Test
void testPackaging() throws Exception {
final Path jar =
-
ResourceTestUtils.getResource(".*/flink-sql-connector-opensearch-[^/]*\\.jar");
+ ResourceTestUtils.getResource(
+
".*[\\\\/]flink-sql-connector-opensearch3-[^\\\\/]*\\.jar");
PackagingTestUtils.assertJarContainsOnlyFilesMatching(
jar,
@@ -41,6 +42,7 @@ class PackagingITCase {
"org/apache/flink/connector/base/",
"org/apache/flink/connector/opensearch/",
"org/apache/flink/opensearch/",
+ "org/apache/flink/opensearch3/shaded/",
"org/apache/flink/streaming/connectors/opensearch/"));
PackagingTestUtils.assertJarContainsServiceEntry(jar, Factory.class);
}
