From fe64d82c5810e4c4d278ae101c2ce18ae5adddfa Mon Sep 17 00:00:00 2001 From: joewitt Date: Tue, 17 Mar 2015 12:37:39 -0400 Subject: [PATCH] NIFI-428 This closes #36 --- .../nifi-kite-bundle/nifi-kite-nar/pom.xml | 42 ++++++++++++++++++- .../src/main/resources/META-INF/LICENSE | 38 ----------------- .../src/main/resources/META-INF/NOTICE | 37 +++------------- .../nifi-kite-processors/pom.xml | 14 ------- .../nifi-nar-bundles/nifi-kite-bundle/pom.xml | 14 ------- nifi/pom.xml | 1 + 6 files changed, 47 insertions(+), 99 deletions(-) diff --git a/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml index 13479e0be3..66d837c702 100644 --- a/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml @@ -33,12 +33,52 @@ org.apache.nifi nifi-kite-processors - + org.apache.hadoop hadoop-client + + org.xerial.snappy + snappy-java + + + com.thoughtworks.paranamer + paranamer + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + + com.google.guava + guava + + + com.google.guava + guava + + + commons-logging + commons-logging + + + org.apache.commons + commons-compress + + + commons-codec + commons-codec + + + org.apache.avro + avro + diff --git a/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/src/main/resources/META-INF/LICENSE b/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/src/main/resources/META-INF/LICENSE index 6fb2525c34..d645695673 100644 --- a/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/src/main/resources/META-INF/LICENSE +++ b/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/src/main/resources/META-INF/LICENSE @@ -200,41 +200,3 @@ 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. - -APACHE NIFI SUBCOMPONENTS: - -The Apache NiFi project contains subcomponents with separate copyright -notices and license terms. Your use of the source code for the these -subcomponents is subject to the terms and conditions of the following -licenses. - -This product bundles 'ParaNamer' which is available under a BSD style license. -For details see http://asm.ow2.org/asmdex-license.html - - Copyright (c) 2006 Paul Hammant & ThoughtWorks Inc - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - THE POSSIBILITY OF SUCH DAMAGE. - diff --git a/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/src/main/resources/META-INF/NOTICE b/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/src/main/resources/META-INF/NOTICE index 66204cfa7f..330a9af666 100644 --- a/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/src/main/resources/META-INF/NOTICE +++ b/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/src/main/resources/META-INF/NOTICE @@ -15,33 +15,19 @@ The following binary components are provided under the Apache Software License v Apache Avro Copyright 2009-2013 The Apache Software Foundation - (ASLv2) Apache Commons Codec + (ASLv2) Apache Commons Lang The following NOTICE information applies: - Apache Commons Codec - Copyright 2002-2014 The Apache Software Foundation + Apache Commons Lang + Copyright 2001-2014 The Apache Software Foundation - src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java - contains test data from http://aspell.net/test/orig/batch0.tab. - Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org) - - =============================================================================== - - The content of package org.apache.commons.codec.language.bm has been translated - from the original php source code available at http://stevemorse.org/phoneticinfo.htm - with permission from the original authors. - Original source copyright: - Copyright (c) 2008 Alexander Beider & Stephen P. Morse. + This product includes software from the Spring Framework, + under the Apache License 2.0 (see: StringUtils.containsWhitespace()) (ASLv2) Apache Commons JEXL The following NOTICE information applies: Apache Commons JEXL Copyright 2001-2011 The Apache Software Foundation - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2013 The Apache Software Foundation - (ASLv2) Kite SDK The following NOTICE information applies: This product includes software developed by Cloudera, Inc. @@ -53,19 +39,6 @@ The following binary components are provided under the Apache Software License v This product includes software developed by Saxonica (http://www.saxonica.com/). - (ASLv2) Snappy Java - The following NOTICE information applies: - This product includes software developed by Google - Snappy: http://code.google.com/p/snappy/ (New BSD License) - - This product includes software developed by Apache - PureJavaCrc32C from apache-hadoop-common http://hadoop.apache.org/ - (Apache 2.0 license) - - This library contains statically linked libstdc++. This inclusion is allowed by - "GCC RUntime Library Exception" - http://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html - (ASLv2) Parquet MR The following NOTICE information applies: Parquet MR diff --git a/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml index b18aa7d95a..938854d3a1 100644 --- a/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml @@ -26,8 +26,6 @@ 1.0.0 - 11.0.2 - 4.10 1.3.9-1 @@ -38,18 +36,10 @@ org.apache.nifi nifi-api - - org.apache.nifi - nifi-utils - org.apache.nifi nifi-processor-utils - - org.apache.nifi - nifi-flowfile-packager - @@ -86,8 +76,6 @@ com.google.guava guava - ${guava.version} - compile @@ -104,7 +92,6 @@ junit junit test - ${junit.version} @@ -123,7 +110,6 @@ com.sun.jersey jersey-servlet - 1.14 test diff --git a/nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml index 6391aa983e..21e378d7a3 100644 --- a/nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml @@ -30,20 +30,6 @@ nifi-kite-processors nifi-kite-nar - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - - diff --git a/nifi/pom.xml b/nifi/pom.xml index 8547257972..e7d8f5ba5e 100644 --- a/nifi/pom.xml +++ b/nifi/pom.xml @@ -887,6 +887,7 @@ maven-surefire-plugin 2.18 + true -Xmx1G