From b62347612dda3cd41376c04f6e6cc700735c1a6f Mon Sep 17 00:00:00 2001 From: shiyuhang <1136742008@qq.com> Date: Thu, 27 Jul 2023 15:03:50 +0800 Subject: [PATCH 1/2] release-3.1.4 --- assembly/pom.xml | 2 +- core-test/pom.xml | 2 +- core-test/pom.xml.versionsBackup | 394 +++++++++++++++++++++++++++++++ core/pom.xml | 2 +- db-random-test/pom.xml | 2 +- pom.xml | 2 +- spark-wrapper/spark-3.0/pom.xml | 2 +- spark-wrapper/spark-3.1/pom.xml | 2 +- spark-wrapper/spark-3.2/pom.xml | 2 +- spark-wrapper/spark-3.3/pom.xml | 2 +- tikv-client/pom.xml | 2 +- 11 files changed, 404 insertions(+), 10 deletions(-) create mode 100644 core-test/pom.xml.versionsBackup diff --git a/assembly/pom.xml b/assembly/pom.xml index b571ca01b..2689ea34b 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 3.1.3 + 3.1.4 ../pom.xml diff --git a/core-test/pom.xml b/core-test/pom.xml index e51b76439..bdcdc4f2c 100644 --- a/core-test/pom.xml +++ b/core-test/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 3.1.3 + 3.1.4 ../pom.xml diff --git a/core-test/pom.xml.versionsBackup b/core-test/pom.xml.versionsBackup new file mode 100644 index 000000000..e51b76439 --- /dev/null +++ b/core-test/pom.xml.versionsBackup @@ -0,0 +1,394 @@ + + + 4.0.0 + + com.pingcap.tispark + tispark-parent + 3.1.3 + ../pom.xml + + + tispark-core-test + jar + TiSpark Project Core Test + http://github.copm/pingcap/tispark + + + + com.pingcap.tispark + tispark-core-internal + ${project.parent.version} + + + org.apache.spark + spark-core_${scala.binary.version} + + + org.apache.spark + spark-catalyst_${scala.binary.version} + + + org.apache.spark + spark-sql_${scala.binary.version} + + + org.apache.spark + spark-hive_${scala.binary.version} + + + org.apache.spark + spark-hive-thriftserver_${scala.binary.version} + + + org.apache.spark + spark-unsafe_${scala.binary.version} + + + + + com.pingcap.tikv + tikv-client + ${project.parent.version} + + + com.pingcap.tispark + db-random-test + ${project.parent.version} + test + + + org.scalaj + scalaj-http_${scala.binary.version} + ${scalaj.version} + + + org.scala-lang + scala-library + + + + + org.apache.logging.log4j + log4j-api + 2.17.2 + + + org.apache.logging.log4j + log4j-core + 2.17.2 + + + org.apache.spark + spark-core_${scala.binary.version} + ${spark.version.test} + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core + + + + + org.apache.spark + spark-catalyst_${scala.binary.version} + ${spark.version.test} + + + org.apache.spark + spark-sql_${scala.binary.version} + ${spark.version.test} + + + org.apache.spark + spark-hive_${scala.binary.version} + ${spark.version.test} + + + org.apache.hadoop + hadoop-client + + + + + org.apache.spark + spark-hive-thriftserver_${scala.binary.version} + ${spark.version.test} + + + org.apache.spark + spark-unsafe_${scala.binary.version} + ${spark.version.test} + + + org.apache.hadoop + hadoop-client + 2.7.2 + + + org.slf4j + slf4j-log4j12 + + + + + com.google.guava + guava + 29.0-android + + + + org.scalatest + scalatest_${scala.binary.version} + ${scalatest.version} + test + + + mysql + mysql-connector-java + ${mysql.connector.version} + test + + + + + + + src/main/resources + true + + + + + kr.motd.maven + os-maven-plugin + 1.4.1.Final + + + + + net.alchim31.maven + scala-maven-plugin + 4.3.0 + + + compile-scala + compile + + add-source + compile + + + + test-compile-scala + test-compile + + add-source + testCompile + + + + attach-javadocs + + doc-jar + + + + + ${scala.version} + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.5 + + UTF-8 + + + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + ${skipFetchTestData} + + + + version imprint + + ${basedir}/scripts/version.sh + + validate + + exec + + + + test data fetch + validate + + ${basedir}/scripts/fetch-test-data.sh + + + exec + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + UTF-8 + true + true + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.2 + + + false + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-clean-plugin + 2.4.1 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + ${javadoc.skip} + + + + attach-javadocs + + jar + + + -Xdoclint:none + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + false + false + true + + + + + org.antipathy + mvn-scalafmt_${scala.binary.version} + 1.0.3 + + ${scalafmt.skip} + ${scalafmt.skip} + + ${project.basedir}/src/main/scala + + + ${project.basedir}/src/test/scala + + + + + + org.scalatest + scalatest-maven-plugin + 2.0.0 + + + ${project.build.directory}/surefire-reports + . + SparkTestSuite.txt + -ea -Xmx6g -Xss4m -XX:ReservedCodeCacheSize=${CodeCacheSize} -Dfile.encoding=UTF-8 -Duser.timezone=GMT+8 -Dio.netty.leakDetection.level=paranoid -Dio.netty.tryReflectionSetAccessible=true + + + ${test.java.home} + + + file:src/test/resources/log4j.properties + + ${test.exclude.tags} + ${test.include.tags} + + + + test + + test + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.1 + + + package + + shade + + + + + + + + com.google.common + com.pingcap.com.google.common + + + + + com.google.guava:* + + + + + + + + + diff --git a/core/pom.xml b/core/pom.xml index 267cc454b..898619d1c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 3.1.3 + 3.1.4 ../pom.xml diff --git a/db-random-test/pom.xml b/db-random-test/pom.xml index fb39d3a7b..9466ce2e8 100644 --- a/db-random-test/pom.xml +++ b/db-random-test/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 3.1.3 + 3.1.4 ../pom.xml diff --git a/pom.xml b/pom.xml index c02880d9a..07a7f9c47 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.pingcap.tispark tispark-parent - 3.1.3 + 3.1.4 pom TiSpark Project Parent POM http://github.copm/pingcap/tispark diff --git a/spark-wrapper/spark-3.0/pom.xml b/spark-wrapper/spark-3.0/pom.xml index 18ee1cfd7..e492a48ea 100644 --- a/spark-wrapper/spark-3.0/pom.xml +++ b/spark-wrapper/spark-3.0/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 3.1.3 + 3.1.4 ../../pom.xml diff --git a/spark-wrapper/spark-3.1/pom.xml b/spark-wrapper/spark-3.1/pom.xml index 96277315d..5ad618b84 100644 --- a/spark-wrapper/spark-3.1/pom.xml +++ b/spark-wrapper/spark-3.1/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 3.1.3 + 3.1.4 ../../pom.xml diff --git a/spark-wrapper/spark-3.2/pom.xml b/spark-wrapper/spark-3.2/pom.xml index dfa62d60b..833492004 100644 --- a/spark-wrapper/spark-3.2/pom.xml +++ b/spark-wrapper/spark-3.2/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 3.1.3 + 3.1.4 ../../pom.xml diff --git a/spark-wrapper/spark-3.3/pom.xml b/spark-wrapper/spark-3.3/pom.xml index 9f7827ebd..05a7e48c4 100644 --- a/spark-wrapper/spark-3.3/pom.xml +++ b/spark-wrapper/spark-3.3/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 3.1.3 + 3.1.4 ../../pom.xml diff --git a/tikv-client/pom.xml b/tikv-client/pom.xml index 3bba07d8d..c1e7f7f57 100644 --- a/tikv-client/pom.xml +++ b/tikv-client/pom.xml @@ -5,7 +5,7 @@ com.pingcap.tispark tispark-parent - 3.1.3 + 3.1.4 ../pom.xml From 487270ccb89b72f7c51b2e57e72e68c423846a5b Mon Sep 17 00:00:00 2001 From: shiyuhang <1136742008@qq.com> Date: Thu, 27 Jul 2023 15:04:47 +0800 Subject: [PATCH 2/2] delete useless file --- core-test/pom.xml.versionsBackup | 394 ------------------------------- 1 file changed, 394 deletions(-) delete mode 100644 core-test/pom.xml.versionsBackup diff --git a/core-test/pom.xml.versionsBackup b/core-test/pom.xml.versionsBackup deleted file mode 100644 index e51b76439..000000000 --- a/core-test/pom.xml.versionsBackup +++ /dev/null @@ -1,394 +0,0 @@ - - - 4.0.0 - - com.pingcap.tispark - tispark-parent - 3.1.3 - ../pom.xml - - - tispark-core-test - jar - TiSpark Project Core Test - http://github.copm/pingcap/tispark - - - - com.pingcap.tispark - tispark-core-internal - ${project.parent.version} - - - org.apache.spark - spark-core_${scala.binary.version} - - - org.apache.spark - spark-catalyst_${scala.binary.version} - - - org.apache.spark - spark-sql_${scala.binary.version} - - - org.apache.spark - spark-hive_${scala.binary.version} - - - org.apache.spark - spark-hive-thriftserver_${scala.binary.version} - - - org.apache.spark - spark-unsafe_${scala.binary.version} - - - - - com.pingcap.tikv - tikv-client - ${project.parent.version} - - - com.pingcap.tispark - db-random-test - ${project.parent.version} - test - - - org.scalaj - scalaj-http_${scala.binary.version} - ${scalaj.version} - - - org.scala-lang - scala-library - - - - - org.apache.logging.log4j - log4j-api - 2.17.2 - - - org.apache.logging.log4j - log4j-core - 2.17.2 - - - org.apache.spark - spark-core_${scala.binary.version} - ${spark.version.test} - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-core - - - - - org.apache.spark - spark-catalyst_${scala.binary.version} - ${spark.version.test} - - - org.apache.spark - spark-sql_${scala.binary.version} - ${spark.version.test} - - - org.apache.spark - spark-hive_${scala.binary.version} - ${spark.version.test} - - - org.apache.hadoop - hadoop-client - - - - - org.apache.spark - spark-hive-thriftserver_${scala.binary.version} - ${spark.version.test} - - - org.apache.spark - spark-unsafe_${scala.binary.version} - ${spark.version.test} - - - org.apache.hadoop - hadoop-client - 2.7.2 - - - org.slf4j - slf4j-log4j12 - - - - - com.google.guava - guava - 29.0-android - - - - org.scalatest - scalatest_${scala.binary.version} - ${scalatest.version} - test - - - mysql - mysql-connector-java - ${mysql.connector.version} - test - - - - - - - src/main/resources - true - - - - - kr.motd.maven - os-maven-plugin - 1.4.1.Final - - - - - net.alchim31.maven - scala-maven-plugin - 4.3.0 - - - compile-scala - compile - - add-source - compile - - - - test-compile-scala - test-compile - - add-source - testCompile - - - - attach-javadocs - - doc-jar - - - - - ${scala.version} - - - - - org.apache.maven.plugins - maven-resources-plugin - 2.5 - - UTF-8 - - - - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - ${skipFetchTestData} - - - - version imprint - - ${basedir}/scripts/version.sh - - validate - - exec - - - - test data fetch - validate - - ${basedir}/scripts/fetch-test-data.sh - - - exec - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - UTF-8 - true - true - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.2 - - - false - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-clean-plugin - 2.4.1 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - ${javadoc.skip} - - - - attach-javadocs - - jar - - - -Xdoclint:none - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - false - true - - - - - org.antipathy - mvn-scalafmt_${scala.binary.version} - 1.0.3 - - ${scalafmt.skip} - ${scalafmt.skip} - - ${project.basedir}/src/main/scala - - - ${project.basedir}/src/test/scala - - - - - - org.scalatest - scalatest-maven-plugin - 2.0.0 - - - ${project.build.directory}/surefire-reports - . - SparkTestSuite.txt - -ea -Xmx6g -Xss4m -XX:ReservedCodeCacheSize=${CodeCacheSize} -Dfile.encoding=UTF-8 -Duser.timezone=GMT+8 -Dio.netty.leakDetection.level=paranoid -Dio.netty.tryReflectionSetAccessible=true - - - ${test.java.home} - - - file:src/test/resources/log4j.properties - - ${test.exclude.tags} - ${test.include.tags} - - - - test - - test - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - - package - - shade - - - - - - - - com.google.common - com.pingcap.com.google.common - - - - - com.google.guava:* - - - - - - - - -