This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 611016069 [test] Migrate MinioTestContainer to paimon-s3 (#869)
611016069 is described below
commit 611016069b79fa3374b1de272ac3c8e821a544ff
Author: wgcn <[email protected]>
AuthorDate: Tue Apr 11 10:37:46 2023 +0800
[test] Migrate MinioTestContainer to paimon-s3 (#869)
---
paimon-filesystems/paimon-s3-impl/pom.xml | 1 -
paimon-filesystems/paimon-s3/pom.xml | 40 +++++++++++++++++++++-
.../org/apache/paimon/s3}/MinioTestContainer.java | 2 +-
paimon-filesystems/pom.xml | 1 +
.../org/apache/paimon/spark/SparkS3ITCase.java | 1 +
paimon-spark/pom.xml | 8 +++++
6 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/paimon-filesystems/paimon-s3-impl/pom.xml
b/paimon-filesystems/paimon-s3-impl/pom.xml
index b0ae1d01e..458647661 100644
--- a/paimon-filesystems/paimon-s3-impl/pom.xml
+++ b/paimon-filesystems/paimon-s3-impl/pom.xml
@@ -32,7 +32,6 @@
<packaging>jar</packaging>
<properties>
- <fs.s3.aws.version>1.12.319</fs.s3.aws.version>
<japicmp.skip>true</japicmp.skip>
</properties>
diff --git a/paimon-filesystems/paimon-s3/pom.xml
b/paimon-filesystems/paimon-s3/pom.xml
index 2a779d9f2..ee38ddd48 100644
--- a/paimon-filesystems/paimon-s3/pom.xml
+++ b/paimon-filesystems/paimon-s3/pom.xml
@@ -52,16 +52,54 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-test-utils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-core</artifactId>
+ <version>${fs.s3.aws.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-s3</artifactId>
+ <version>${fs.s3.aws.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <!-- jaxb-api is packaged as an optional
dependency that is only accessible on Java 11 -->
+ <Multi-Release>true</Multi-Release>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>copy-oss-jar</id>
+ <id>copy-s3-jar</id>
<phase>prepare-package</phase>
<goals>
<goal>copy</goal>
diff --git
a/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/MinioTestContainer.java
b/paimon-filesystems/paimon-s3/src/test/java/org/apache/paimon/s3/MinioTestContainer.java
similarity index 99%
rename from
paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/MinioTestContainer.java
rename to
paimon-filesystems/paimon-s3/src/test/java/org/apache/paimon/s3/MinioTestContainer.java
index 6adafded3..5163ef729 100644
---
a/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/MinioTestContainer.java
+++
b/paimon-filesystems/paimon-s3/src/test/java/org/apache/paimon/s3/MinioTestContainer.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.paimon.spark;
+package org.apache.paimon.s3;
import org.apache.paimon.testutils.junit.DockerImageVersions;
import org.apache.paimon.utils.Preconditions;
diff --git a/paimon-filesystems/pom.xml b/paimon-filesystems/pom.xml
index 8710839aa..f3b4e8160 100644
--- a/paimon-filesystems/pom.xml
+++ b/paimon-filesystems/pom.xml
@@ -41,6 +41,7 @@
<properties>
<fs.hadoopshaded.version>3.3.4</fs.hadoopshaded.version>
+ <fs.s3.aws.version>1.12.319</fs.s3.aws.version>
<commons.beanutils.version>1.9.4</commons.beanutils.version>
</properties>
diff --git
a/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkS3ITCase.java
b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkS3ITCase.java
index c511397e2..7a27d7d03 100644
---
a/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkS3ITCase.java
+++
b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkS3ITCase.java
@@ -19,6 +19,7 @@
package org.apache.paimon.spark;
import org.apache.paimon.fs.Path;
+import org.apache.paimon.s3.MinioTestContainer;
import
org.apache.paimon.testutils.junit.parameterized.ParameterizedTestExtension;
import org.apache.paimon.testutils.junit.parameterized.Parameters;
diff --git a/paimon-spark/pom.xml b/paimon-spark/pom.xml
index 0d5a97bd6..3300789c2 100644
--- a/paimon-spark/pom.xml
+++ b/paimon-spark/pom.xml
@@ -61,6 +61,14 @@ under the License.
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-s3</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-s3</artifactId>
