This is an automated email from the ASF dual-hosted git repository. vinoth pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hudi.git
The following commit(s) were added to refs/heads/master by this push: new b9c2856 [HUDI-1535] Fix 0.7.0 snapshot (#2456) b9c2856 is described below commit b9c2856d164c58075a2a0f88ed07fb00d24f65e5 Author: Sivabalan Narayanan <sivab...@uber.com> AuthorDate: Tue Jan 19 15:20:43 2021 -0500 [HUDI-1535] Fix 0.7.0 snapshot (#2456) * Revert "[MINOR] Bumping snapshot version to 0.7.0 (#2435)" This reverts commit a43e191d6cd91f8fb787fc1fc99ec12218195313. * Fixing 0.7.0 snapshot bump --- docker/hoodie/hadoop/hive_base/pom.xml | 2 +- docker/hoodie/hadoop/prestobase/pom.xml | 4 +--- hudi-client/hudi-client-common/pom.xml | 5 ++--- hudi-client/hudi-flink-client/pom.xml | 5 ++--- hudi-client/hudi-java-client/pom.xml | 5 ++--- hudi-client/hudi-spark-client/pom.xml | 5 ++--- hudi-flink/pom.xml | 3 +-- hudi-spark-datasource/hudi-spark-common/pom.xml | 2 +- hudi-spark-datasource/hudi-spark/pom.xml | 2 +- hudi-spark-datasource/hudi-spark2/pom.xml | 2 +- hudi-spark-datasource/hudi-spark3/pom.xml | 2 +- packaging/hudi-flink-bundle/pom.xml | 3 +-- packaging/hudi-integ-test-bundle/pom.xml | 3 +-- packaging/hudi-presto-bundle/pom.xml | 2 +- packaging/hudi-spark-bundle/pom.xml | 4 ++-- packaging/hudi-timeline-server-bundle/pom.xml | 4 +--- packaging/hudi-utilities-bundle/pom.xml | 3 +-- pom.xml | 6 +++--- 18 files changed, 25 insertions(+), 37 deletions(-) diff --git a/docker/hoodie/hadoop/hive_base/pom.xml b/docker/hoodie/hadoop/hive_base/pom.xml index 0f9b0cc..9af55ba 100644 --- a/docker/hoodie/hadoop/hive_base/pom.xml +++ b/docker/hoodie/hadoop/hive_base/pom.xml @@ -59,7 +59,7 @@ <copy file="${project.basedir}/../../../../packaging/hudi-hadoop-mr-bundle/target/hudi-hadoop-mr-bundle-${project.version}.jar" tofile="target/hoodie-hadoop-mr-bundle.jar" /> <copy file="${project.basedir}/../../../../packaging/hudi-hive-sync-bundle/target/hudi-hive-sync-bundle-${project.version}.jar" tofile="target/hoodie-hive-sync-bundle.jar" /> <copy file="${project.basedir}/../../../../packaging/hudi-spark-bundle/target/hudi-spark-bundle_${scala.binary.version}-${project.version}.jar" tofile="target/hoodie-spark-bundle.jar" /> - <copy file="${project.basedir}/../../../../packaging/hudi-utilities-bundle/target/hudi-utilities-bundle_${scala.binary.version}-${project.version}.jar" tofile="target/hoodie-utilities.jar"/> + <copy file="${project.basedir}/../../../../packaging/hudi-utilities-bundle/target/hudi-utilities-bundle_${scala.binary.version}-${project.version}.jar" tofile="target/hoodie-utilities.jar" /> </tasks> </configuration> <goals> diff --git a/docker/hoodie/hadoop/prestobase/pom.xml b/docker/hoodie/hadoop/prestobase/pom.xml index e348d47..f19d028 100644 --- a/docker/hoodie/hadoop/prestobase/pom.xml +++ b/docker/hoodie/hadoop/prestobase/pom.xml @@ -16,9 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> diff --git a/hudi-client/hudi-client-common/pom.xml b/hudi-client/hudi-client-common/pom.xml index 7cacd37..ab32379 100644 --- a/hudi-client/hudi-client-common/pom.xml +++ b/hudi-client/hudi-client-common/pom.xml @@ -15,8 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>hudi-client</artifactId> <groupId>org.apache.hudi</groupId> @@ -25,7 +24,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>hudi-client-common</artifactId> - <version>${parent.version}</version> + <version>0.7.0-SNAPSHOT</version> <name>hudi-client-common</name> <packaging>jar</packaging> diff --git a/hudi-client/hudi-flink-client/pom.xml b/hudi-client/hudi-flink-client/pom.xml index 630577b..bf76780 100644 --- a/hudi-client/hudi-flink-client/pom.xml +++ b/hudi-client/hudi-flink-client/pom.xml @@ -15,8 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>hudi-client</artifactId> <groupId>org.apache.hudi</groupId> @@ -25,7 +24,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>hudi-flink-client</artifactId> - <version>${parent.version}</version> + <version>0.7.0-SNAPSHOT</version> <name>hudi-flink-client</name> <packaging>jar</packaging> diff --git a/hudi-client/hudi-java-client/pom.xml b/hudi-client/hudi-java-client/pom.xml index 9a081c6..455d092 100644 --- a/hudi-client/hudi-java-client/pom.xml +++ b/hudi-client/hudi-java-client/pom.xml @@ -15,8 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>hudi-client</artifactId> <groupId>org.apache.hudi</groupId> @@ -25,7 +24,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>hudi-java-client</artifactId> - <version>${parent.version}</version> + <version>0.7.0-SNAPSHOT</version> <name>hudi-java-client</name> <packaging>jar</packaging> diff --git a/hudi-client/hudi-spark-client/pom.xml b/hudi-client/hudi-spark-client/pom.xml index eb12469..0230448 100644 --- a/hudi-client/hudi-spark-client/pom.xml +++ b/hudi-client/hudi-spark-client/pom.xml @@ -15,8 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>hudi-client</artifactId> <groupId>org.apache.hudi</groupId> @@ -25,7 +24,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark-client</artifactId> - <version>${parent.version}</version> + <version>0.7.0-SNAPSHOT</version> <name>hudi-spark-client</name> <packaging>jar</packaging> diff --git a/hudi-flink/pom.xml b/hudi-flink/pom.xml index 45bb977..2774494 100644 --- a/hudi-flink/pom.xml +++ b/hudi-flink/pom.xml @@ -17,8 +17,7 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> diff --git a/hudi-spark-datasource/hudi-spark-common/pom.xml b/hudi-spark-datasource/hudi-spark-common/pom.xml index f60e900..83f8c90 100644 --- a/hudi-spark-datasource/hudi-spark-common/pom.xml +++ b/hudi-spark-datasource/hudi-spark-common/pom.xml @@ -22,7 +22,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark-common</artifactId> - <version>${parent.version}</version> + <version>0.7.0-SNAPSHOT</version> <name>hudi-spark-common</name> <packaging>jar</packaging> diff --git a/hudi-spark-datasource/hudi-spark/pom.xml b/hudi-spark-datasource/hudi-spark/pom.xml index 84208f3..4ff68ba 100644 --- a/hudi-spark-datasource/hudi-spark/pom.xml +++ b/hudi-spark-datasource/hudi-spark/pom.xml @@ -24,7 +24,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark_${scala.binary.version}</artifactId> - <version>${parent.version}</version> + <version>0.7.0-SNAPSHOT</version> <name>hudi-spark_${scala.binary.version}</name> <packaging>jar</packaging> diff --git a/hudi-spark-datasource/hudi-spark2/pom.xml b/hudi-spark-datasource/hudi-spark2/pom.xml index 74df3f7..130ea87 100644 --- a/hudi-spark-datasource/hudi-spark2/pom.xml +++ b/hudi-spark-datasource/hudi-spark2/pom.xml @@ -22,7 +22,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark2_${scala.binary.version}</artifactId> - <version>${parent.version}</version> + <version>0.7.0-SNAPSHOT</version> <name>hudi-spark2_${scala.binary.version}</name> <packaging>jar</packaging> diff --git a/hudi-spark-datasource/hudi-spark3/pom.xml b/hudi-spark-datasource/hudi-spark3/pom.xml index 9f42d13..b86f03f 100644 --- a/hudi-spark-datasource/hudi-spark3/pom.xml +++ b/hudi-spark-datasource/hudi-spark3/pom.xml @@ -22,7 +22,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark3_2.12</artifactId> - <version>${parent.version}</version> + <version>0.7.0-SNAPSHOT</version> <name>hudi-spark3_2.12</name> <packaging>jar</packaging> diff --git a/packaging/hudi-flink-bundle/pom.xml b/packaging/hudi-flink-bundle/pom.xml index 8b52416..1d1c96c 100644 --- a/packaging/hudi-flink-bundle/pom.xml +++ b/packaging/hudi-flink-bundle/pom.xml @@ -17,8 +17,7 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> diff --git a/packaging/hudi-integ-test-bundle/pom.xml b/packaging/hudi-integ-test-bundle/pom.xml index ba171c5..fc4d982 100644 --- a/packaging/hudi-integ-test-bundle/pom.xml +++ b/packaging/hudi-integ-test-bundle/pom.xml @@ -13,8 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> diff --git a/packaging/hudi-presto-bundle/pom.xml b/packaging/hudi-presto-bundle/pom.xml index 2626f8f..4d75b47 100644 --- a/packaging/hudi-presto-bundle/pom.xml +++ b/packaging/hudi-presto-bundle/pom.xml @@ -206,7 +206,7 @@ <id>presto-shade-unbundle-bootstrap</id> <properties> <presto.bundle.bootstrap.scope>provided</presto.bundle.bootstrap.scope> - <presto.bundle.bootstrap.shade.prefix></presto.bundle.bootstrap.shade.prefix> + <presto.bundle.bootstrap.shade.prefix /> </properties> </profile> </profiles> diff --git a/packaging/hudi-spark-bundle/pom.xml b/packaging/hudi-spark-bundle/pom.xml index b1acc9b..2722667 100644 --- a/packaging/hudi-spark-bundle/pom.xml +++ b/packaging/hudi-spark-bundle/pom.xml @@ -52,7 +52,7 @@ <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml </dependencyReducedPomLocation> <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"></transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" /> <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"> <addHeader>true</addHeader> </transformer> @@ -362,7 +362,7 @@ <id>spark-shade-unbundle-avro</id> <properties> <spark.bundle.avro.scope>provided</spark.bundle.avro.scope> - <spark.bundle.spark.shade.prefix></spark.bundle.spark.shade.prefix> + <spark.bundle.spark.shade.prefix /> </properties> </profile> </profiles> diff --git a/packaging/hudi-timeline-server-bundle/pom.xml b/packaging/hudi-timeline-server-bundle/pom.xml index 3c500bc..427918c 100644 --- a/packaging/hudi-timeline-server-bundle/pom.xml +++ b/packaging/hudi-timeline-server-bundle/pom.xml @@ -17,9 +17,7 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> diff --git a/packaging/hudi-utilities-bundle/pom.xml b/packaging/hudi-utilities-bundle/pom.xml index f33e33c..065f11e 100644 --- a/packaging/hudi-utilities-bundle/pom.xml +++ b/packaging/hudi-utilities-bundle/pom.xml @@ -15,8 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> diff --git a/pom.xml b/pom.xml index 8f7fd44..c7d4b87 100644 --- a/pom.xml +++ b/pom.xml @@ -130,11 +130,11 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <main.basedir>${project.basedir}</main.basedir> <spark.bundle.hive.scope>provided</spark.bundle.hive.scope> - <spark.bundle.hive.shade.prefix></spark.bundle.hive.shade.prefix> + <spark.bundle.hive.shade.prefix /> <spark.bundle.avro.scope>compile</spark.bundle.avro.scope> <spark.bundle.spark.shade.prefix>org.apache.hudi.spark.</spark.bundle.spark.shade.prefix> <utilities.bundle.hive.scope>provided</utilities.bundle.hive.scope> - <utilities.bundle.hive.shade.prefix></utilities.bundle.hive.shade.prefix> + <utilities.bundle.hive.shade.prefix /> <argLine>-Xmx2g</argLine> <jacoco.version>0.8.5</jacoco.version> <presto.bundle.bootstrap.scope>compile</presto.bundle.bootstrap.scope> @@ -212,7 +212,7 @@ </eclipse> </java> <scala> - <trimTrailingWhitespace/> + <trimTrailingWhitespace /> </scala> </configuration> <executions>