[HUDI-121] Remove leftover notice file and replace com.uber.hoodie with org.apache.hudi in log4j properties

2019-10-03 21:12:55 -07:00
parent 7dd9c74b1b
commit 9b66ea41fd
28 changed files with 21 additions and 207 deletions
--- a/.mailmap
+++ b/.mailmap
@@ -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@apache.org> <vinoth@uber.com>
-<vinoth@apache.org> <vinoth@bytearray.io>
-<vinoth@apache.org> <vchandar@confluent.io>
-Vinoth Chandar <vinoth@apache.org> <vinothchandar@users.noreply.github.com>
-Vinoth Chandar <vinoth@apache.org> vinothchandar <vinoth@apache.org>
-# Prasanna's uber email mapping to active email
-<prasanna.raj@gmail.com> <prasanna@uber.com>
--- 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
--- a/docker/hoodie/hadoop/sparkworker/NOTICE.txt
+++ b/docker/hoodie/hadoop/sparkworker/NOTICE.txt
@@ -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/).
--- a/hudi-cli/pom.xml
+++ b/hudi-cli/pom.xml
@@ -29,7 +29,6 @@
  <properties>
    <spring.shell.version>1.2.0.RELEASE</spring.shell.version>
    <jar.mainclass>org.springframework.shell.Bootstrap</jar.mainclass>
-    <notice.dir>${project.basedir}/src/main/resources/META-INF</notice.dir>
  </properties>

  <repositories>
--- a/hudi-client/pom.xml
+++ b/hudi-client/pom.xml
@@ -26,10 +26,6 @@
  <artifactId>hudi-client</artifactId>
  <packaging>jar</packaging>

-  <properties>
-    <notice.dir>${project.basedir}/src/main/resources/META-INF</notice.dir>
-  </properties>
-
  <build>
    <plugins>
      <plugin>
--- 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
--- a/hudi-common/pom.xml
+++ b/hudi-common/pom.xml
@@ -25,10 +25,6 @@

  <artifactId>hudi-common</artifactId>

-  <properties>
-    <notice.dir>${project.basedir}/src/main/resources/META-INF</notice.dir>
-  </properties>
-
  <build>
    <resources>
      <resource>
--- 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
--- a/hudi-hadoop-mr/pom.xml
+++ b/hudi-hadoop-mr/pom.xml
@@ -25,10 +25,6 @@

  <artifactId>hudi-hadoop-mr</artifactId>

-  <properties>
-    <notice.dir>${project.basedir}/src/main/resources/META-INF</notice.dir>
-  </properties>
-
  <dependencies>
    <!-- Hudi -->
    <dependency>
--- 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
--- a/hudi-hive/pom.xml
+++ b/hudi-hive/pom.xml
@@ -26,10 +26,6 @@
  <artifactId>hudi-hive</artifactId>
  <packaging>jar</packaging>

-  <properties>
-    <notice.dir>${project.basedir}/src/main/resources/META-INF</notice.dir>
-  </properties>
-
  <dependencies>

    <!-- Hoodie -->
--- 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.
--- a/hudi-integ-test/pom.xml
+++ b/hudi-integ-test/pom.xml
@@ -135,7 +135,6 @@
    <skipITs>false</skipITs>
    <docker.compose.skip>${skipITs}</docker.compose.skip>
    <checkstyle.skip>true</checkstyle.skip>
-    <notice.dir>${project.basedir}/src/main/resources/META-INF</notice.dir>
  </properties>

  <build>
--- 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
--- a/hudi-spark/pom.xml
+++ b/hudi-spark/pom.xml
@@ -26,10 +26,6 @@
  <artifactId>hudi-spark</artifactId>
  <packaging>jar</packaging>

-  <properties>
-    <notice.dir>${project.basedir}/src/main/resources/META-INF</notice.dir>
-  </properties>
-
  <build>
    <resources>
      <resource>
--- 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
--- a/hudi-timeline-service/pom.xml
+++ b/hudi-timeline-service/pom.xml
@@ -26,10 +26,6 @@
  <artifactId>hudi-timeline-service</artifactId>
  <packaging>jar</packaging>

-  <properties>
-    <notice.dir>${project.basedir}/src/main/resources/META-INF</notice.dir>
-  </properties>
-
  <build>
    <plugins>
      <plugin>
--- 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
--- a/hudi-utilities/pom.xml
+++ b/hudi-utilities/pom.xml
@@ -26,10 +26,6 @@
  <artifactId>hudi-utilities</artifactId>
  <packaging>jar</packaging>

-  <properties>
-    <notice.dir>${project.basedir}/src/main/resources/META-INF</notice.dir>
-  </properties>
-
  <build>
    <plugins>
      <plugin>
--- 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
--- a/packaging/hudi-hadoop-mr-bundle/pom.xml
+++ b/packaging/hudi-hadoop-mr-bundle/pom.xml
@@ -28,8 +28,6 @@

  <properties>
    <checkstyle.skip>true</checkstyle.skip>
-    <notice.dir>${project.basedir}/src/main/resources/META-INF</notice.dir>
-    <notice.file>HUDI_NOTICE.txt</notice.file>
  </properties>

  <build>
--- a/packaging/hudi-hive-bundle/pom.xml
+++ b/packaging/hudi-hive-bundle/pom.xml
@@ -28,8 +28,6 @@

  <properties>
    <checkstyle.skip>true</checkstyle.skip>
-    <notice.dir>${project.basedir}/src/main/resources/META-INF</notice.dir>
-    <notice.file>HUDI_NOTICE.txt</notice.file>
  </properties>

  <build>
--- a/packaging/hudi-presto-bundle/pom.xml
+++ b/packaging/hudi-presto-bundle/pom.xml
@@ -28,8 +28,6 @@

  <properties>
    <checkstyle.skip>true</checkstyle.skip>
-    <notice.dir>${project.basedir}/src/main/resources/META-INF</notice.dir>
-    <notice.file>HUDI_NOTICE.txt</notice.file>
  </properties>

  <build>
--- a/packaging/hudi-spark-bundle/pom.xml
+++ b/packaging/hudi-spark-bundle/pom.xml
@@ -28,8 +28,6 @@

  <properties>
    <checkstyle.skip>true</checkstyle.skip>
-    <notice.dir>${project.basedir}/src/main/resources/META-INF</notice.dir>
-    <notice.file>HUDI_NOTICE.txt</notice.file>
  </properties>

  <build>
--- a/packaging/hudi-timeline-server-bundle/pom.xml
+++ b/packaging/hudi-timeline-server-bundle/pom.xml
@@ -229,8 +229,6 @@

    <properties>
        <checkstyle.skip>true</checkstyle.skip>
-        <notice.dir>${project.basedir}/src/main/resources/META-INF</notice.dir>
-        <notice.file>HUDI_NOTICE.txt</notice.file>
    </properties>


--- a/packaging/hudi-utilities-bundle/pom.xml
+++ b/packaging/hudi-utilities-bundle/pom.xml
@@ -29,8 +29,6 @@

  <properties>
    <checkstyle.skip>true</checkstyle.skip>
-    <notice.dir>${project.basedir}/src/main/resources/META-INF</notice.dir>
-    <notice.file>HUDI_NOTICE.txt</notice.file>
  </properties>

  <build>
--- a/pom.xml
+++ b/pom.xml
@@ -95,8 +95,6 @@
    <jetty.version>7.6.0.v20120127</jetty.version>
    <hbase.version>1.2.3</hbase.version>
    <codehaus-jackson.version>1.9.13</codehaus-jackson.version>
-    <notice.dir>${project.basedir}</notice.dir>
-    <notice.file>NOTICE.txt</notice.file>
    <skipTests>false</skipTests>
    <skipITs>${skipTests}</skipITs>
    <skipUTs>${skipTests}</skipUTs>
--- a/release/config/license-mappings.xml
+++ b/release/config/license-mappings.xml
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-->
-<license-lookup xmlns="https://source.jasig.org/schemas/maven-notice-plugin/license-lookup" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://source.jasig.org/schemas/maven-notice-plugin/license-lookup https://source.jasig.org/schemas/maven-notice-plugin/license-lookup/license-lookup-v1.0.xsd">
-    <artifact>
-        <groupId>asm</groupId>
-        <artifactId>asm-commons</artifactId>
-        <license>3-Clause BSD License</license>
-    </artifact>
-    <artifact>
-        <groupId>asm</groupId>
-        <artifactId>asm</artifactId>
-        <license>3-Clause BSD License</license>
-    </artifact>
-    <artifact>
-        <groupId>asm</groupId>
-        <artifactId>asm-tree</artifactId>
-        <license>3-Clause BSD License</license>
-    </artifact>
-    <artifact>
-        <groupId>commons-beanutils</groupId>
-        <artifactId>commons-beanutils</artifactId>
-        <license>Apache License</license>
-    </artifact>
-    <artifact>
-        <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
-        <license>CDDL</license>
-    </artifact>
-  <artifact>
-    <groupId>javax.servlet</groupId>
-    <artifactId>jsp-api</artifactId>
-    <license>CDDL</license>
-  </artifact>
-  <artifact>
-    <groupId>javax.xml.stream</groupId>
-    <artifactId>stax-api</artifactId>
-    <license>CDDL</license>
-  </artifact>
-  <artifact>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <license>CDDL</license>
-  </artifact>
-  <artifact>
-      <groupId>javax.transaction</groupId>
-      <artifactId>jta</artifactId>
-      <license>OWN LICENSE (See http://download.oracle.com/otndocs/jcp/jta-1.1-classes-oth-JSpec/jta-1.1-classes-oth-JSpec-license.html)</license>
-  </artifact>
-  <artifact>
-    <groupId>javax.transaction</groupId>
-    <artifactId>transaction-api</artifactId>
-    <license>OWN LICENSE (See http://download.oracle.com/otndocs/jcp/jta-1.1-classes-oth-JSpec/jta-1.1-classes-oth-JSpec-license.html)</license>
-  </artifact>
-    <artifact>
-        <groupId>jdk.tools</groupId>
-        <artifactId>jdk.tools</artifactId>
-        <license>Oracle Binary Code License Agreement for the Java SE</license>
-    </artifact>
-    <artifact>
-        <groupId>org.apache.zookeeper</groupId>
-        <artifactId>zookeeper</artifactId>
-        <license>Apache License, Version 2.0</license>
-    </artifact>
-    <artifact>
-        <groupId>org.codehaus.jettison</groupId>
-        <artifactId>jettison</artifactId>
-        <license>Apache License, Version 2.0</license>
-    </artifact>
-    <artifact>
-        <groupId>dnl.utils</groupId>
-        <artifactId>textutils</artifactId>
-        <license>3-Clause BSD License</license>
-    </artifact>
-    <artifact>
-        <groupId>io.confluent</groupId>
-        <artifactId>common-config</artifactId>
-        <license>Apache License, Version 2.0</license>
-    </artifact>
-    <artifact>
-        <groupId>io.confluent</groupId>
-        <artifactId>common-utils</artifactId>
-        <license>Apache License, Version 2.0</license>
-    </artifact>
-    <artifact>
-        <groupId>io.confluent</groupId>
-        <artifactId>kafka-avro-serializer</artifactId>
-        <license>Apache License, Version 2.0</license>
-    </artifact>
-    <artifact>
-        <groupId>io.confluent</groupId>
-        <artifactId>kafka-schema-registry-client</artifactId>
-        <license>Apache License, Version 2.0</license>
-    </artifact>
-    <artifact>
-        <groupId>org.pentaho</groupId>
-        <artifactId>pentaho-aggdesigner-algorithm</artifactId>
-        <license>Apache License, Version 2.0</license>
-    </artifact>
-    <artifact>
-        <groupId>oro</groupId>
-        <artifactId>oro</artifactId>
-        <license>Apache License, Version 2.0</license>
-    </artifact>
-    <artifact>
-        <groupId>org.antlr</groupId>
-        <artifactId>antlr-runtime</artifactId>
-        <license>BSD</license>
-    </artifact>
-  <artifact>
-    <groupId>xerces</groupId>
-    <artifactId>xercesImpl</artifactId>
-    <license>Apache License, Version 1.1</license>
-  </artifact>
-</license-lookup>