You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@parquet.apache.org by ju...@apache.org on 2014/09/16 23:15:27 UTC

git commit: PARQUET-72: Fix NOTICE

Repository: incubator-parquet-format
Updated Branches:
  refs/heads/master 3a34ade0d -> 471ba0852


PARQUET-72: Fix NOTICE

Author: Ryan Blue <rb...@cloudera.com>

Closes #13 from rdblue/PARQUET-72-fix-notice and squashes the following commits:

92d25c2 [Ryan Blue] PARQUET-72: Remove unnecessary entries in NOTICE.


Project: http://git-wip-us.apache.org/repos/asf/incubator-parquet-format/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-parquet-format/commit/471ba085
Tree: http://git-wip-us.apache.org/repos/asf/incubator-parquet-format/tree/471ba085
Diff: http://git-wip-us.apache.org/repos/asf/incubator-parquet-format/diff/471ba085

Branch: refs/heads/master
Commit: 471ba08523165019c0fb3cb4aff3073d529c12e0
Parents: 3a34ade
Author: Ryan Blue <rb...@cloudera.com>
Authored: Tue Sep 16 14:15:15 2014 -0700
Committer: julien <ju...@twitter.com>
Committed: Tue Sep 16 14:15:15 2014 -0700

----------------------------------------------------------------------
 NOTICE  | 21 ---------------------
 pom.xml | 15 ---------------
 2 files changed, 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-parquet-format/blob/471ba085/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 7496235..0ea9b91 100644
--- a/NOTICE
+++ b/NOTICE
@@ -4,24 +4,3 @@ Copyright 2014 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
---------------------------------------------------------------------------------
-
-This product depends on SLF4J and shades SLF4J in some binary artifacts. SLF4J
-is a simple logging facade for Java.
-
-Copyright: 2004-2013 QOS.ch.
-Home page: http://www.slf4j.org/
-License: http://slf4j.org/license.html (MIT license)
-
-A copy of this license can be found in licenses/LICENSE.slf4j.txt
-
---------------------------------------------------------------------------------
-
-This product depends on Apache Thrift and shades it in some binary artifacts.
-
-Copyright: 2006-2010 The Apache Software Foundation.
-Home page: https://thrift.apache.org/
-License: http://www.apache.org/licenses/LICENSE-2.0
-
-The Apache License can be found in LICENSE
-

http://git-wip-us.apache.org/repos/asf/incubator-parquet-format/blob/471ba085/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3dfe7aa..819e226 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,21 +122,6 @@
   </properties>
 
   <build>
-    <resources>
-      <resource>
-        <!-- the default resources directory -->
-        <directory>src/main/resources</directory>
-      </resource>
-      <resource>
-        <!-- copy NOTICE and LICENSE -->
-        <directory>${basedir}</directory>
-        <targetPath>META-INF</targetPath>
-        <includes>
-          <include>NOTICE</include>
-          <include>LICENSE</include>
-        </includes>
-      </resource>
-    </resources>
     <pluginManagement>
       <plugins>
         <plugin>