diff --git a/paimon-format/pom.xml b/paimon-format/pom.xml index e96fddcd8480..5804a704b0cf 100644 --- a/paimon-format/pom.xml +++ b/paimon-format/pom.xml @@ -32,13 +32,10 @@ under the License. Paimon : Format - 1.13.1 - 1.9.2 2.5 1.6 3.12.0 2.8.1 - 3.19.6 diff --git a/paimon-spark/paimon-spark-3.2/pom.xml b/paimon-spark/paimon-spark-3.2/pom.xml index 73e1c2632731..2e7804b63cd4 100644 --- a/paimon-spark/paimon-spark-3.2/pom.xml +++ b/paimon-spark/paimon-spark-3.2/pom.xml @@ -42,222 +42,61 @@ under the License. ${project.version} - - org.scala-lang - scala-library - ${scala.version} - - - org.scala-lang - scala-reflect - ${scala.version} - - - org.scala-lang - scala-compiler - ${scala.version} - - org.apache.spark spark-sql_${scala.binary.version} ${spark.version} - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - - org.apache.logging.log4j - log4j-slf4j2-impl - - - org.apache.orc - orc-core - - - org.apache.orc - orc-mapreduce - - - org.apache.parquet - parquet-column - - - org.apache.parquet - parquet-hadoop - - org.apache.spark spark-core_${scala.binary.version} ${spark.version} - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - - org.apache.logging.log4j - log4j-slf4j2-impl - - - org.apache.orc - orc-core - - - org.apache.orc - orc-mapreduce - - - org.apache.parquet - parquet-column - - - com.google.protobuf - protobuf-java - - + + org.apache.paimon paimon-spark-common ${project.version} - test-jar + tests test + org.apache.spark spark-sql_${scala.binary.version} ${spark.version} tests test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - + org.apache.spark - spark-core_${scala.binary.version} + spark-catalyst_${scala.binary.version} ${spark.version} tests test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - org.apache.logging.log4j - log4j-slf4j2-impl - - + org.apache.spark - spark-catalyst_${scala.binary.version} + spark-core_${scala.binary.version} ${spark.version} tests test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - - org.scalatest - scalatest_${scala.binary.version} - 3.1.0 - test - org.apache.spark spark-hive_${scala.binary.version} ${spark.version} test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - com.google.protobuf - protobuf-java - - - - - org.apache.paimon - paimon-hive-common - ${project.version} - test - - - org.apache.paimon - paimon-hive-common - ${project.version} - tests - test-jar - test - - - - net.alchim31.maven - scala-maven-plugin - ${scala-maven-plugin.version} - - - -nobootcp - -target:jvm-${target.java.version} - - false - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins @@ -287,57 +126,6 @@ under the License. - - net.alchim31.maven - scala-maven-plugin - ${scala-maven-plugin.version} - - - - scala-compile-first - process-resources - - add-source - compile - - - - - - scala-test-compile - process-test-resources - - testCompile - - - - - - org.scalatest - scalatest-maven-plugin - ${scalatest-maven-plugin.version} - - ${project.build.directory}/surefire-reports - . - -ea -Xmx4g -Xss4m -XX:MaxMetaspaceSize=2g -XX:ReservedCodeCacheSize=${CodeCacheSize} ${extraJavaTestArgs} -Dio.netty.tryReflectionSetAccessible=true - PaimonTestSuite.txt - - once - - - - test - - test - - - - diff --git a/paimon-spark/paimon-spark-3.3/pom.xml b/paimon-spark/paimon-spark-3.3/pom.xml index 0e80cbef0a02..6b21ebb53e2b 100644 --- a/paimon-spark/paimon-spark-3.3/pom.xml +++ b/paimon-spark/paimon-spark-3.3/pom.xml @@ -42,92 +42,20 @@ under the License. ${project.version} - - org.scala-lang - scala-library - ${scala.version} - - - org.scala-lang - scala-reflect - ${scala.version} - - - org.scala-lang - scala-compiler - ${scala.version} - - org.apache.spark spark-sql_${scala.binary.version} ${spark.version} - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - - org.apache.logging.log4j - log4j-slf4j2-impl - - - org.apache.orc - orc-core - - - org.apache.parquet - parquet-column - - - org.apache.parquet - parquet-hadoop - - org.apache.spark spark-core_${scala.binary.version} ${spark.version} - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - - org.apache.logging.log4j - log4j-slf4j2-impl - - - org.apache.orc - orc-core - - - org.apache.orc - orc-mapreduce - - - org.apache.parquet - parquet-column - - - com.google.protobuf - protobuf-java - - + + org.apache.paimon paimon-spark-common @@ -135,124 +63,40 @@ under the License. tests test + org.apache.spark spark-sql_${scala.binary.version} ${spark.version} tests test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - + org.apache.spark - spark-core_${scala.binary.version} + spark-catalyst_${scala.binary.version} ${spark.version} tests test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - org.apache.logging.log4j - log4j-slf4j2-impl - - + org.apache.spark - spark-catalyst_${scala.binary.version} + spark-core_${scala.binary.version} ${spark.version} tests test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - - - org.scalatest - scalatest_${scala.binary.version} - 3.1.0 - test + org.apache.spark spark-hive_${scala.binary.version} ${spark.version} test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - com.google.protobuf - protobuf-java - - - - - org.apache.paimon - paimon-hive-common - ${project.version} - test - - - org.apache.paimon - paimon-hive-common - ${project.version} - tests - test-jar - test - - - - net.alchim31.maven - scala-maven-plugin - ${scala-maven-plugin.version} - - - -nobootcp - -target:jvm-${target.java.version} - - false - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins @@ -282,57 +126,6 @@ under the License. - - net.alchim31.maven - scala-maven-plugin - ${scala-maven-plugin.version} - - - - scala-compile-first - process-resources - - add-source - compile - - - - - - scala-test-compile - process-test-resources - - testCompile - - - - - - org.scalatest - scalatest-maven-plugin - ${scalatest-maven-plugin.version} - - ${project.build.directory}/surefire-reports - . - -ea -Xmx4g -Xss4m -XX:MaxMetaspaceSize=2g -XX:ReservedCodeCacheSize=${CodeCacheSize} ${extraJavaTestArgs} -Dio.netty.tryReflectionSetAccessible=true - PaimonTestSuite.txt - - once - - - - test - - test - - - - diff --git a/paimon-spark/paimon-spark-3.4/pom.xml b/paimon-spark/paimon-spark-3.4/pom.xml index 7c916e014683..9f1b69fce067 100644 --- a/paimon-spark/paimon-spark-3.4/pom.xml +++ b/paimon-spark/paimon-spark-3.4/pom.xml @@ -42,92 +42,20 @@ under the License. ${project.version} - - org.scala-lang - scala-library - ${scala.version} - - - org.scala-lang - scala-reflect - ${scala.version} - - - org.scala-lang - scala-compiler - ${scala.version} - - org.apache.spark spark-sql_${scala.binary.version} ${spark.version} - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - - org.apache.logging.log4j - log4j-slf4j2-impl - - - org.apache.orc - orc-core - - - org.apache.parquet - parquet-column - - - org.apache.parquet - parquet-hadoop - - org.apache.spark spark-core_${scala.binary.version} ${spark.version} - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - - org.apache.logging.log4j - log4j-slf4j2-impl - - - org.apache.orc - orc-core - - - org.apache.orc - orc-mapreduce - - - org.apache.parquet - parquet-column - - - com.google.protobuf - protobuf-java - - + + org.apache.paimon paimon-spark-common @@ -135,124 +63,40 @@ under the License. tests test + org.apache.spark spark-sql_${scala.binary.version} ${spark.version} tests test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - + org.apache.spark - spark-core_${scala.binary.version} + spark-catalyst_${scala.binary.version} ${spark.version} tests test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - org.apache.logging.log4j - log4j-slf4j2-impl - - + org.apache.spark - spark-catalyst_${scala.binary.version} + spark-core_${scala.binary.version} ${spark.version} tests test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - - - org.scalatest - scalatest_${scala.binary.version} - 3.1.0 - test + org.apache.spark spark-hive_${scala.binary.version} ${spark.version} test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - com.google.protobuf - protobuf-java - - - - - org.apache.paimon - paimon-hive-common - ${project.version} - test - - - org.apache.paimon - paimon-hive-common - ${project.version} - tests - test-jar - test - - - - net.alchim31.maven - scala-maven-plugin - ${scala-maven-plugin.version} - - - -nobootcp - -target:jvm-${target.java.version} - - false - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins @@ -282,57 +126,6 @@ under the License. - - net.alchim31.maven - scala-maven-plugin - ${scala-maven-plugin.version} - - - - scala-compile-first - process-resources - - add-source - compile - - - - - - scala-test-compile - process-test-resources - - testCompile - - - - - - org.scalatest - scalatest-maven-plugin - ${scalatest-maven-plugin.version} - - ${project.build.directory}/surefire-reports - . - -ea -Xmx4g -Xss4m -XX:MaxMetaspaceSize=2g -XX:ReservedCodeCacheSize=${CodeCacheSize} ${extraJavaTestArgs} -Dio.netty.tryReflectionSetAccessible=true - PaimonTestSuite.txt - - once - - - - test - - test - - - - diff --git a/paimon-spark/paimon-spark-3.5/pom.xml b/paimon-spark/paimon-spark-3.5/pom.xml index 75849185a951..9593a1a9d175 100644 --- a/paimon-spark/paimon-spark-3.5/pom.xml +++ b/paimon-spark/paimon-spark-3.5/pom.xml @@ -42,88 +42,20 @@ under the License. ${project.version} - - org.scala-lang - scala-library - ${scala.version} - - - org.scala-lang - scala-reflect - ${scala.version} - - - org.scala-lang - scala-compiler - ${scala.version} - - org.apache.spark spark-sql_${scala.binary.version} ${spark.version} - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - - org.apache.logging.log4j - log4j-slf4j2-impl - - - org.apache.orc - orc-core - - - org.apache.parquet - parquet-column - - org.apache.spark spark-core_${scala.binary.version} ${spark.version} - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - - org.apache.logging.log4j - log4j-slf4j2-impl - - - org.apache.orc - orc-core - - - org.apache.orc - orc-mapreduce - - - org.apache.parquet - parquet-column - - - com.google.protobuf - protobuf-java - - + + org.apache.paimon paimon-spark-common @@ -131,144 +63,40 @@ under the License. tests test + org.apache.spark spark-sql_${scala.binary.version} ${spark.version} tests test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - org.apache.orc - orc-core - - - org.apache.parquet - parquet-column - - + org.apache.spark - spark-core_${scala.binary.version} + spark-catalyst_${scala.binary.version} ${spark.version} tests test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - org.apache.logging.log4j - log4j-slf4j2-impl - - - org.apache.orc - orc-core - - + org.apache.spark - spark-catalyst_${scala.binary.version} + spark-core_${scala.binary.version} ${spark.version} tests test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - org.apache.orc - orc-core - - - - - org.scalatest - scalatest_${scala.binary.version} - 3.1.0 - test + org.apache.spark spark-hive_${scala.binary.version} ${spark.version} test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - org.apache.orc - orc-core - - - com.google.protobuf - protobuf-java - - - - - org.apache.paimon - paimon-hive-common - ${project.version} - test - - - org.apache.paimon - paimon-hive-common - ${project.version} - tests - test-jar - test - - - - net.alchim31.maven - scala-maven-plugin - ${scala-maven-plugin.version} - - - -nobootcp - -target:jvm-${target.java.version} - - false - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins @@ -298,57 +126,6 @@ under the License. - - net.alchim31.maven - scala-maven-plugin - ${scala-maven-plugin.version} - - - - scala-compile-first - process-resources - - add-source - compile - - - - - - scala-test-compile - process-test-resources - - testCompile - - - - - - org.scalatest - scalatest-maven-plugin - ${scalatest-maven-plugin.version} - - ${project.build.directory}/surefire-reports - . - -ea -Xmx4g -Xss4m -XX:MaxMetaspaceSize=2g -XX:ReservedCodeCacheSize=${CodeCacheSize} ${extraJavaTestArgs} -Dio.netty.tryReflectionSetAccessible=true - PaimonTestSuite.txt - - once - - - - test - - test - - - - diff --git a/paimon-spark/paimon-spark-common/pom.xml b/paimon-spark/paimon-spark-common/pom.xml index 97a926711e5f..05387f2bb0c5 100644 --- a/paimon-spark/paimon-spark-common/pom.xml +++ b/paimon-spark/paimon-spark-common/pom.xml @@ -38,249 +38,67 @@ under the License. - - org.scala-lang - scala-library - ${scala.version} - - - org.scala-lang - scala-reflect - ${scala.version} - - - org.scala-lang - scala-compiler - ${scala.version} - - - - org.apache.spark - spark-avro_${scala.binary.version} - ${spark.version} - test - - org.apache.spark spark-sql_${scala.binary.version} ${spark.version} - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - - org.apache.logging.log4j - log4j-slf4j2-impl - - - org.apache.orc - orc-core - - - org.apache.orc - orc-mapreduce - - - org.apache.parquet - parquet-column - - org.apache.spark spark-core_${scala.binary.version} ${spark.version} - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - - org.apache.logging.log4j - log4j-slf4j2-impl - - - org.apache.orc - orc-core - - - org.apache.orc - orc-mapreduce - - - org.apache.parquet - parquet-column - - - com.google.protobuf - protobuf-java - - - org.apache.spark - spark-hive_${scala.binary.version} - ${spark.version} - test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - com.google.protobuf - protobuf-java - - + org.antlr + antlr4-runtime + ${antlr4.version} + + org.apache.spark spark-sql_${scala.binary.version} ${spark.version} tests test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - + org.apache.spark - spark-core_${scala.binary.version} + spark-catalyst_${scala.binary.version} ${spark.version} tests test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - org.apache.logging.log4j - log4j-slf4j2-impl - - - com.google.protobuf - protobuf-java - - + org.apache.spark - spark-catalyst_${scala.binary.version} + spark-core_${scala.binary.version} ${spark.version} tests test - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - - - org.antlr - antlr4-runtime - ${antlr4.version} - - - org.scalatest - scalatest_${scala.binary.version} - 3.1.0 - test - - - org.apache.paimon - paimon-common - ${project.version} - test-jar - test + - org.apache.paimon - paimon-hive-common - ${project.version} + org.apache.spark + spark-hive_${scala.binary.version} + ${spark.version} test + - org.apache.paimon - paimon-hive-common - ${project.version} - tests - test-jar + org.apache.spark + spark-avro_${scala.binary.version} + ${spark.version} test - - - - net.alchim31.maven - scala-maven-plugin - ${scala-maven-plugin.version} - - - -nobootcp - -target:jvm-${target.java.version} - - false - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - prepare-test-jar - test-compile - - test-jar - - - - org.apache.maven.plugins maven-shade-plugin @@ -301,33 +119,7 @@ under the License. - - net.alchim31.maven - scala-maven-plugin - ${scala-maven-plugin.version} - - - - scala-compile-first - process-resources - - add-source - compile - - - - - scala-test-compile - process-test-resources - - testCompile - - - - org.antlr antlr4-maven-plugin @@ -345,26 +137,17 @@ under the License. src/main/antlr4 + + - org.scalatest - scalatest-maven-plugin - ${scalatest-maven-plugin.version} - - ${project.build.directory}/surefire-reports - . - -ea -Xmx4g -Xss4m -XX:MaxMetaspaceSize=2g -XX:ReservedCodeCacheSize=${CodeCacheSize} ${extraJavaTestArgs} -Dio.netty.tryReflectionSetAccessible=true - PaimonTestSuite.txt - - once - + org.apache.maven.plugins + maven-jar-plugin - test + prepare-test-jar + test-compile - test + test-jar diff --git a/paimon-spark/pom.xml b/paimon-spark/pom.xml index c06b3a3d4e66..1045a58e5a85 100644 --- a/paimon-spark/pom.xml +++ b/paimon-spark/pom.xml @@ -45,7 +45,213 @@ under the License. paimon-spark-3.2 + + + + org.apache.spark + spark-sql_${scala.binary.version} + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + org.apache.logging.log4j + log4j-slf4j2-impl + + + org.apache.orc + orc-core + + + org.apache.orc + orc-mapreduce + + + org.apache.parquet + parquet-column + + + + + + org.apache.spark + spark-core_${scala.binary.version} + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + + org.apache.logging.log4j + log4j-slf4j2-impl + + + org.apache.orc + orc-core + + + org.apache.orc + orc-mapreduce + + + org.apache.parquet + parquet-column + + + com.google.protobuf + protobuf-java + + + + + + + + org.apache.spark + spark-sql_${scala.binary.version} + tests + test + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + org.apache.logging.log4j + log4j-slf4j2-impl + + + org.apache.orc + orc-core + + + org.apache.parquet + parquet-column + + + org.apache.parquet + parquet-hadoop + + + + + + org.apache.spark + spark-catalyst_${scala.binary.version} + tests + test + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + org.apache.orc + orc-core + + + org.apache.parquet + parquet-column + + + org.apache.parquet + parquet-hadoop + + + + + + org.apache.spark + spark-core_${scala.binary.version} + tests + test + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + org.apache.logging.log4j + log4j-slf4j2-impl + + + com.google.protobuf + protobuf-java + + + org.apache.orc + orc-core + + + + + + org.apache.spark + spark-hive_${scala.binary.version} + test + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + com.google.protobuf + protobuf-java + + + org.apache.orc + orc-core + + + + + + + + org.scala-lang + scala-library + ${scala.version} + + + + org.scala-lang + scala-reflect + ${scala.version} + + + + org.scala-lang + scala-compiler + ${scala.version} + + org.apache.paimon paimon-bundle @@ -54,6 +260,37 @@ under the License. + + org.scalatest + scalatest_${scala.binary.version} + 3.1.0 + test + + + + org.apache.paimon + paimon-common + ${project.version} + test-jar + test + + + + org.apache.paimon + paimon-hive-common + ${project.version} + test + + + + org.apache.paimon + paimon-hive-common + ${project.version} + tests + test-jar + test + + org.apache.paimon paimon-test-utils @@ -89,5 +326,119 @@ under the License. ${aws.version} test + + + org.apache.orc + orc-core + ${orc.version} + test + + + + org.apache.parquet + parquet-hadoop + ${parquet.version} + test + + + + org.apache.parquet + parquet-column + ${parquet.version} + test + + + + com.google.protobuf + protobuf-java + ${protobuf-java.version} + test + + + + + + + net.alchim31.maven + scala-maven-plugin + ${scala-maven-plugin.version} + + + + scala-compile-first + process-resources + + add-source + compile + + + + + + scala-test-compile + process-test-resources + + testCompile + + + + + ${scala.version} + false + + -nobootcp + -target:jvm-${target.java.version} + + + + + + + org.scalatest + scalatest-maven-plugin + ${scalatest-maven-plugin.version} + + ${project.build.directory}/surefire-reports + . + -ea -Xmx4g -Xss4m -XX:MaxMetaspaceSize=2g -XX:ReservedCodeCacheSize=${CodeCacheSize} ${extraJavaTestArgs} -Dio.netty.tryReflectionSetAccessible=true + PaimonTestSuite.txt + + once + true + + + + test + + test + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + net.alchim31.maven + scala-maven-plugin + + + + org.scalatest + scalatest-maven-plugin + + + diff --git a/pom.xml b/pom.xml index 2d3f42b11cda..21e40c00c7cd 100644 --- a/pom.xml +++ b/pom.xml @@ -102,6 +102,9 @@ under the License. true 1.19.1 1.6.1 + 1.13.1 + 1.9.2 + 3.19.6