diff --git a/.mailmap b/.mailmap deleted file mode 100644 index c34d483af..000000000 --- a/.mailmap +++ /dev/null @@ -1,9 +0,0 @@ -# See https://github.com/git/git/blob/master/Documentation/mailmap.txt for syntax -#vinoth's uber email and personal email mapping to apache - - - -Vinoth Chandar -Vinoth Chandar vinothchandar -# Prasanna's uber email mapping to active email - diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 3e356af0b..4868e20e4 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -26,6 +26,7 @@ Release 0.5.0-incubating * Bug fixes in query side integration, hive-sync, deltaStreamer, compaction, rollbacks, restore ### Full PR List + * **leesf** [HUDI-265] Failed to delete tmp dirs created in unit tests * **Balaji Varadarajan** [HUDI-287] Address comments during review of release candidate. Remove LICENSE and NOTICE files in hoodie child modules. * **Balaji Varadarajan** [HUDI-121] Fix bugs in Release Scripts found during RC creation * **Balaji Varadarajan** [HUDI-121] : Address comments during RC2 voting diff --git a/docker/hoodie/hadoop/sparkworker/NOTICE.txt b/docker/hoodie/hadoop/sparkworker/NOTICE.txt deleted file mode 100644 index f98429b78..000000000 --- a/docker/hoodie/hadoop/sparkworker/NOTICE.txt +++ /dev/null @@ -1,5 +0,0 @@ -Apache Hudi -Copyright 2019 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). diff --git a/hudi-cli/pom.xml b/hudi-cli/pom.xml index 10db3fac3..91df8ac0a 100644 --- a/hudi-cli/pom.xml +++ b/hudi-cli/pom.xml @@ -29,7 +29,6 @@ 1.2.0.RELEASE org.springframework.shell.Bootstrap - ${project.basedir}/src/main/resources/META-INF diff --git a/hudi-client/pom.xml b/hudi-client/pom.xml index db1272ff7..d05948eef 100644 --- a/hudi-client/pom.xml +++ b/hudi-client/pom.xml @@ -26,10 +26,6 @@ hudi-client jar - - ${project.basedir}/src/main/resources/META-INF - - diff --git a/hudi-client/src/test/resources/log4j-surefire.properties b/hudi-client/src/test/resources/log4j-surefire.properties index d55fbd166..6bb184f14 100644 --- a/hudi-client/src/test/resources/log4j-surefire.properties +++ b/hudi-client/src/test/resources/log4j-surefire.properties @@ -16,11 +16,11 @@ # limitations under the License. ### log4j.rootLogger=WARN, A1 -log4j.category.com.uber=INFO -log4j.category.com.uber.hoodie.common.utils=WARN -log4j.category.com.uber.hoodie.io=WARN -log4j.category.com.uber.hoodie.common=WARN -log4j.category.com.uber.hoodie.table.log=WARN +log4j.category.org.apache=INFO +log4j.category.org.apache.hudi.common.utils=WARN +log4j.category.org.apache.hudi.io=WARN +log4j.category.org.apache.hudi.common=WARN +log4j.category.org.apache.hudi.table.log=WARN log4j.category.org.apache.parquet.hadoop=WARN # A1 is set to be a ConsoleAppender. log4j.appender.A1=org.apache.log4j.ConsoleAppender diff --git a/hudi-common/pom.xml b/hudi-common/pom.xml index 15fda2ec1..103f89efb 100644 --- a/hudi-common/pom.xml +++ b/hudi-common/pom.xml @@ -25,10 +25,6 @@ hudi-common - - ${project.basedir}/src/main/resources/META-INF - - diff --git a/hudi-common/src/test/resources/log4j-surefire.properties b/hudi-common/src/test/resources/log4j-surefire.properties index ab28c4d76..3063e9e49 100644 --- a/hudi-common/src/test/resources/log4j-surefire.properties +++ b/hudi-common/src/test/resources/log4j-surefire.properties @@ -16,9 +16,9 @@ # limitations under the License. ### log4j.rootLogger=WARN, A1 -log4j.category.com.uber=INFO -log4j.category.com.uber.hoodie.table.log=WARN -log4j.category.com.uber.hoodie.common.util=WARN +log4j.category.org.apache=INFO +log4j.category.org.apache.hudi.table.log=WARN +log4j.category.org.apache.hudi.common.util=WARN log4j.category.org.apache.parquet.hadoop=WARN # A1 is set to be a ConsoleAppender. log4j.appender.A1=org.apache.log4j.ConsoleAppender diff --git a/hudi-hadoop-mr/pom.xml b/hudi-hadoop-mr/pom.xml index ac1aeb48f..e95a1dea1 100644 --- a/hudi-hadoop-mr/pom.xml +++ b/hudi-hadoop-mr/pom.xml @@ -25,10 +25,6 @@ hudi-hadoop-mr - - ${project.basedir}/src/main/resources/META-INF - - diff --git a/hudi-hadoop-mr/src/test/resources/log4j-surefire.properties b/hudi-hadoop-mr/src/test/resources/log4j-surefire.properties index 070f3445e..a59d4ebe2 100644 --- a/hudi-hadoop-mr/src/test/resources/log4j-surefire.properties +++ b/hudi-hadoop-mr/src/test/resources/log4j-surefire.properties @@ -16,7 +16,7 @@ # limitations under the License. ### log4j.rootLogger=WARN, A1 -log4j.category.com.uber=INFO +log4j.category.org.apache=INFO log4j.category.org.apache.parquet.hadoop=WARN # A1 is set to be a ConsoleAppender. log4j.appender.A1=org.apache.log4j.ConsoleAppender diff --git a/hudi-hive/pom.xml b/hudi-hive/pom.xml index d71622a02..0af1bfe4e 100644 --- a/hudi-hive/pom.xml +++ b/hudi-hive/pom.xml @@ -26,10 +26,6 @@ hudi-hive jar - - ${project.basedir}/src/main/resources/META-INF - - diff --git a/hudi-hive/src/test/resources/log4j-surefire.properties b/hudi-hive/src/test/resources/log4j-surefire.properties index 82bbb1317..3c1e2602d 100644 --- a/hudi-hive/src/test/resources/log4j-surefire.properties +++ b/hudi-hive/src/test/resources/log4j-surefire.properties @@ -16,7 +16,7 @@ # limitations under the License. ### log4j.rootLogger=WARN, A1 -log4j.category.com.uber=INFO +log4j.category.org.apache=INFO log4j.category.org.apache.parquet.hadoop=WARN log4j.category.parquet.hadoop=WARN # A1 is set to be a ConsoleAppender. diff --git a/hudi-integ-test/pom.xml b/hudi-integ-test/pom.xml index 89dc7f744..486473daf 100644 --- a/hudi-integ-test/pom.xml +++ b/hudi-integ-test/pom.xml @@ -135,7 +135,6 @@ false ${skipITs} true - ${project.basedir}/src/main/resources/META-INF diff --git a/hudi-integ-test/src/test/resources/log4j-surefire.properties b/hudi-integ-test/src/test/resources/log4j-surefire.properties index 070f3445e..a59d4ebe2 100644 --- a/hudi-integ-test/src/test/resources/log4j-surefire.properties +++ b/hudi-integ-test/src/test/resources/log4j-surefire.properties @@ -16,7 +16,7 @@ # limitations under the License. ### log4j.rootLogger=WARN, A1 -log4j.category.com.uber=INFO +log4j.category.org.apache=INFO log4j.category.org.apache.parquet.hadoop=WARN # A1 is set to be a ConsoleAppender. log4j.appender.A1=org.apache.log4j.ConsoleAppender diff --git a/hudi-spark/pom.xml b/hudi-spark/pom.xml index 2701ac481..948e5afdb 100644 --- a/hudi-spark/pom.xml +++ b/hudi-spark/pom.xml @@ -26,10 +26,6 @@ hudi-spark jar - - ${project.basedir}/src/main/resources/META-INF - - diff --git a/hudi-spark/src/test/resources/log4j-surefire.properties b/hudi-spark/src/test/resources/log4j-surefire.properties index d55fbd166..6bb184f14 100644 --- a/hudi-spark/src/test/resources/log4j-surefire.properties +++ b/hudi-spark/src/test/resources/log4j-surefire.properties @@ -16,11 +16,11 @@ # limitations under the License. ### log4j.rootLogger=WARN, A1 -log4j.category.com.uber=INFO -log4j.category.com.uber.hoodie.common.utils=WARN -log4j.category.com.uber.hoodie.io=WARN -log4j.category.com.uber.hoodie.common=WARN -log4j.category.com.uber.hoodie.table.log=WARN +log4j.category.org.apache=INFO +log4j.category.org.apache.hudi.common.utils=WARN +log4j.category.org.apache.hudi.io=WARN +log4j.category.org.apache.hudi.common=WARN +log4j.category.org.apache.hudi.table.log=WARN log4j.category.org.apache.parquet.hadoop=WARN # A1 is set to be a ConsoleAppender. log4j.appender.A1=org.apache.log4j.ConsoleAppender diff --git a/hudi-timeline-service/pom.xml b/hudi-timeline-service/pom.xml index 48f26e916..8d661033a 100644 --- a/hudi-timeline-service/pom.xml +++ b/hudi-timeline-service/pom.xml @@ -26,10 +26,6 @@ hudi-timeline-service jar - - ${project.basedir}/src/main/resources/META-INF - - diff --git a/hudi-timeline-service/src/test/resources/log4j-surefire.properties b/hudi-timeline-service/src/test/resources/log4j-surefire.properties index ab28c4d76..3063e9e49 100644 --- a/hudi-timeline-service/src/test/resources/log4j-surefire.properties +++ b/hudi-timeline-service/src/test/resources/log4j-surefire.properties @@ -16,9 +16,9 @@ # limitations under the License. ### log4j.rootLogger=WARN, A1 -log4j.category.com.uber=INFO -log4j.category.com.uber.hoodie.table.log=WARN -log4j.category.com.uber.hoodie.common.util=WARN +log4j.category.org.apache=INFO +log4j.category.org.apache.hudi.table.log=WARN +log4j.category.org.apache.hudi.common.util=WARN log4j.category.org.apache.parquet.hadoop=WARN # A1 is set to be a ConsoleAppender. log4j.appender.A1=org.apache.log4j.ConsoleAppender diff --git a/hudi-utilities/pom.xml b/hudi-utilities/pom.xml index ed443ae7f..98c491971 100644 --- a/hudi-utilities/pom.xml +++ b/hudi-utilities/pom.xml @@ -26,10 +26,6 @@ hudi-utilities jar - - ${project.basedir}/src/main/resources/META-INF - - diff --git a/hudi-utilities/src/test/resources/log4j-surefire.properties b/hudi-utilities/src/test/resources/log4j-surefire.properties index 070f3445e..a59d4ebe2 100644 --- a/hudi-utilities/src/test/resources/log4j-surefire.properties +++ b/hudi-utilities/src/test/resources/log4j-surefire.properties @@ -16,7 +16,7 @@ # limitations under the License. ### log4j.rootLogger=WARN, A1 -log4j.category.com.uber=INFO +log4j.category.org.apache=INFO log4j.category.org.apache.parquet.hadoop=WARN # A1 is set to be a ConsoleAppender. log4j.appender.A1=org.apache.log4j.ConsoleAppender diff --git a/packaging/hudi-hadoop-mr-bundle/pom.xml b/packaging/hudi-hadoop-mr-bundle/pom.xml index 98ec2410c..bdeb33846 100644 --- a/packaging/hudi-hadoop-mr-bundle/pom.xml +++ b/packaging/hudi-hadoop-mr-bundle/pom.xml @@ -28,8 +28,6 @@ true - ${project.basedir}/src/main/resources/META-INF - HUDI_NOTICE.txt diff --git a/packaging/hudi-hive-bundle/pom.xml b/packaging/hudi-hive-bundle/pom.xml index 7b9d4f0f5..2ca3a7755 100644 --- a/packaging/hudi-hive-bundle/pom.xml +++ b/packaging/hudi-hive-bundle/pom.xml @@ -28,8 +28,6 @@ true - ${project.basedir}/src/main/resources/META-INF - HUDI_NOTICE.txt diff --git a/packaging/hudi-presto-bundle/pom.xml b/packaging/hudi-presto-bundle/pom.xml index 6ec33759a..2e9e0baf7 100644 --- a/packaging/hudi-presto-bundle/pom.xml +++ b/packaging/hudi-presto-bundle/pom.xml @@ -28,8 +28,6 @@ true - ${project.basedir}/src/main/resources/META-INF - HUDI_NOTICE.txt diff --git a/packaging/hudi-spark-bundle/pom.xml b/packaging/hudi-spark-bundle/pom.xml index b48e61b81..68baea7c9 100644 --- a/packaging/hudi-spark-bundle/pom.xml +++ b/packaging/hudi-spark-bundle/pom.xml @@ -28,8 +28,6 @@ true - ${project.basedir}/src/main/resources/META-INF - HUDI_NOTICE.txt diff --git a/packaging/hudi-timeline-server-bundle/pom.xml b/packaging/hudi-timeline-server-bundle/pom.xml index f32c406fe..f370cb4c1 100644 --- a/packaging/hudi-timeline-server-bundle/pom.xml +++ b/packaging/hudi-timeline-server-bundle/pom.xml @@ -229,8 +229,6 @@ true - ${project.basedir}/src/main/resources/META-INF - HUDI_NOTICE.txt diff --git a/packaging/hudi-utilities-bundle/pom.xml b/packaging/hudi-utilities-bundle/pom.xml index 29e281185..091182f5e 100644 --- a/packaging/hudi-utilities-bundle/pom.xml +++ b/packaging/hudi-utilities-bundle/pom.xml @@ -29,8 +29,6 @@ true - ${project.basedir}/src/main/resources/META-INF - HUDI_NOTICE.txt diff --git a/pom.xml b/pom.xml index 12b27d51c..622c99007 100644 --- a/pom.xml +++ b/pom.xml @@ -95,8 +95,6 @@ 7.6.0.v20120127 1.2.3 1.9.13 - ${project.basedir} - NOTICE.txt false ${skipTests} ${skipTests} diff --git a/release/config/license-mappings.xml b/release/config/license-mappings.xml deleted file mode 100644 index 61927389f..000000000 --- a/release/config/license-mappings.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - asm - asm-commons - 3-Clause BSD License - - - asm - asm - 3-Clause BSD License - - - asm - asm-tree - 3-Clause BSD License - - - commons-beanutils - commons-beanutils - Apache License - - - javax.servlet - servlet-api - CDDL - - - javax.servlet - jsp-api - CDDL - - - javax.xml.stream - stax-api - CDDL - - - javax.servlet.jsp - jsp-api - CDDL - - - javax.transaction - jta - OWN LICENSE (See http://download.oracle.com/otndocs/jcp/jta-1.1-classes-oth-JSpec/jta-1.1-classes-oth-JSpec-license.html) - - - javax.transaction - transaction-api - OWN LICENSE (See http://download.oracle.com/otndocs/jcp/jta-1.1-classes-oth-JSpec/jta-1.1-classes-oth-JSpec-license.html) - - - jdk.tools - jdk.tools - Oracle Binary Code License Agreement for the Java SE - - - org.apache.zookeeper - zookeeper - Apache License, Version 2.0 - - - org.codehaus.jettison - jettison - Apache License, Version 2.0 - - - dnl.utils - textutils - 3-Clause BSD License - - - io.confluent - common-config - Apache License, Version 2.0 - - - io.confluent - common-utils - Apache License, Version 2.0 - - - io.confluent - kafka-avro-serializer - Apache License, Version 2.0 - - - io.confluent - kafka-schema-registry-client - Apache License, Version 2.0 - - - org.pentaho - pentaho-aggdesigner-algorithm - Apache License, Version 2.0 - - - oro - oro - Apache License, Version 2.0 - - - org.antlr - antlr-runtime - BSD - - - xerces - xercesImpl - Apache License, Version 1.1 - -