parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject incubator-parquet-format git commit: PARQUET-111: Update LICENSE and pom.
Date Fri, 06 Feb 2015 22:12:19 GMT
Repository: incubator-parquet-format
Updated Branches:
  refs/heads/master af1e5b833 -> e1850e729


PARQUET-111: Update LICENSE and pom.

This updates the LICENSE and shading configuration in the pom for
problem found while working on PARQUET-111 in parquet-mr.

Author: Ryan Blue <blue@apache.org>

Closes #19 from rdblue/PARQUET-111-fixes-from-mr and squashes the following commits:

ed98c6a [Ryan Blue] PARQUET-111: Update LICENSE and pom.


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/e1850e72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-parquet-format/tree/e1850e72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-parquet-format/diff/e1850e72

Branch: refs/heads/master
Commit: e1850e72935f9007292969328c9e9dc0db51a66e
Parents: af1e5b8
Author: Ryan Blue <blue@apache.org>
Authored: Fri Feb 6 14:12:02 2015 -0800
Committer: Ryan Blue <blue@apache.org>
Committed: Fri Feb 6 14:12:02 2015 -0800

----------------------------------------------------------------------
 LICENSE | 11 +++++++++++
 pom.xml |  8 ++++++++
 2 files changed, 19 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-parquet-format/blob/e1850e72/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index d645695..1016ee3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -200,3 +200,14 @@
    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.
+
+--------------------------------------------------------------------------------
+
+This product includes code from Apache Spark.
+
+* dev/merge_parquet_pr.py is based on Spark's dev/merge_spark_pr.py
+
+Copyright: 2014 The Apache Software Foundation.
+Home page: https://spark.apache.org/
+License: http://www.apache.org/licenses/LICENSE-2.0
+

http://git-wip-us.apache.org/repos/asf/incubator-parquet-format/blob/e1850e72/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 33f64b9..f3eb785 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,6 +134,14 @@
               </artifactSet>
               <filters>
                 <filter>
+                  <!-- Exclude SLF4J's meta files, covered by LICENSE and NOTICE -->
+                  <artifact>org.slf4j:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/LICENSE.txt</exclude>
+                    <exclude>META-INF/NOTICE.txt</exclude>
+                  </excludes>
+                </filter>
+                <filter>
                   <!-- Sigh. The Thrift jar contains its source -->
                   <artifact>org.apache.thrift:libthrift</artifact>
                   <excludes>


Mime
View raw message