NIFI-428 This closes #36
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/fe64d82c Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/fe64d82c Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/fe64d82c Branch: refs/heads/NIFI-250 Commit: fe64d82c5810e4c4d278ae101c2ce18ae5adddfa Parents: 230e48b Author: joewitt <[email protected]> Authored: Tue Mar 17 12:37:39 2015 -0400 Committer: joewitt <[email protected]> Committed: Tue Mar 17 12:37:39 2015 -0400 ---------------------------------------------------------------------- .../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/nifi-nar-bundles/nifi-kite-bundle/pom.xml | 14 ------- nifi/pom.xml | 1 + 6 files changed, 47 insertions(+), 99 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fe64d82c/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml ---------------------------------------------------------------------- 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 13479e0..66d837c 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 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-kite-processors</artifactId> - <!-- Hadoop client is inherited from nifi-hadoop-libraries-nar --> + <!-- The following are inherited from nifi-hadoop-libraries-nar --> <exclusions> <exclusion> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> </exclusion> + <exclusion> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + </exclusion> + <exclusion> + <groupId>com.thoughtworks.paranamer</groupId> + <artifactId>paranamer</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + </exclusion> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + </exclusion> </exclusions> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fe64d82c/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/src/main/resources/META-INF/LICENSE ---------------------------------------------------------------------- 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 6fb2525..d645695 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. - http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fe64d82c/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- 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 66204cf..330a9af 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 ([email protected]) - - =============================================================================== - - 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 http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fe64d82c/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml ---------------------------------------------------------------------- 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 b18aa7d..938854d 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 @@ <properties> <kite.version>1.0.0</kite.version> - <guava.version>11.0.2</guava.version> - <junit.version>4.10</junit.version> <findbugs-annotations.version>1.3.9-1</findbugs-annotations.version> </properties> @@ -40,16 +38,8 @@ </dependency> <dependency> <groupId>org.apache.nifi</groupId> - <artifactId>nifi-utils</artifactId> - </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> <artifactId>nifi-processor-utils</artifactId> </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-flowfile-packager</artifactId> - </dependency> <!-- Kite --> @@ -86,8 +76,6 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${guava.version}</version> - <scope>compile</scope> </dependency> <dependency> @@ -104,7 +92,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> - <version>${junit.version}</version> </dependency> <dependency> @@ -123,7 +110,6 @@ <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-servlet</artifactId> - <version>1.14</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fe64d82c/nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml index 6391aa9..21e378d 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 @@ <module>nifi-kite-processors</module> <module>nifi-kite-nar</module> </modules> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <redirectTestOutputToFile>true</redirectTestOutputToFile> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> <dependencyManagement> <dependencies> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fe64d82c/nifi/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/pom.xml b/nifi/pom.xml index 8547257..e7d8f5b 100644 --- a/nifi/pom.xml +++ b/nifi/pom.xml @@ -887,6 +887,7 @@ <artifactId>maven-surefire-plugin</artifactId> <version>2.18</version> <configuration> + <redirectTestOutputToFile>true</redirectTestOutputToFile> <argLine>-Xmx1G</argLine> </configuration> </plugin>
