From deeb014c0d2d43bb0bad7f6ca4308d04a2d1c170 Mon Sep 17 00:00:00 2001 From: Aldrin Piri Date: Fri, 7 Jun 2019 14:20:14 -0400 Subject: [PATCH] MINIFI-499: * Changed URLs for repositories, project description, and mailing lists to use HTTPS. * Changed URLs for XMLNS schema locations to use HTTPS (the XMLNS and schema identifier remain http:// because they are not designed to be resolvable). * Fixed Maven XML schema descriptor URLs. MINIFI-499 Updated additional URLs to HTTPS in NOTICE files, README files, pom.xml files, and Spring XML files. MINIFI-499 Removed references to Jasypt from pom.xml and NOTICE & README files as it is no longer used. This closes # 154. Co-authored-by: Andy LoPresto Signed-off-by: Andy LoPresto --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- NOTICE | 2 +- README.md | 11 +- minifi-api/pom.xml | 2 +- minifi-assembly/NOTICE | 146 +++++++++--------- minifi-assembly/README.md | 21 ++- minifi-assembly/pom.xml | 4 +- minifi-bootstrap/pom.xml | 2 +- minifi-c2/c2-integration-test.graphml | 2 +- minifi-c2/minifi-c2-api/pom.xml | 2 +- minifi-c2/minifi-c2-assembly/NOTICE | 58 ++++--- minifi-c2/minifi-c2-assembly/README.md | 7 +- minifi-c2/minifi-c2-assembly/pom.xml | 2 +- .../main/resources/conf/minifi-c2-context.xml | 2 +- .../conf/minifi-c2-web-security-context.xml | 2 +- .../src/main/resources/conf/webdefault.xml | 2 +- .../minifi-c2-cache-filesystem/pom.xml | 2 +- .../minifi-c2-cache-s3/pom.xml | 2 +- minifi-c2/minifi-c2-cache/pom.xml | 2 +- minifi-c2/minifi-c2-docker/pom.xml | 28 ++-- minifi-c2/minifi-c2-integration-tests/pom.xml | 2 +- .../conf/minifi-c2-context.xml | 8 +- .../c2-secure-rest/conf/minifi-c2-context.xml | 8 +- .../conf/minifi-c2-context.xml | 8 +- .../conf/minifi-c2-context.xml | 8 +- minifi-c2/minifi-c2-jetty/pom.xml | 2 +- .../minifi-c2-provider-cache/pom.xml | 2 +- .../minifi-c2-provider-delegating/pom.xml | 2 +- .../minifi-c2-provider-nifi-rest/pom.xml | 2 +- .../minifi-c2-provider-util/pom.xml | 2 +- minifi-c2/minifi-c2-provider/pom.xml | 2 +- minifi-c2/minifi-c2-service/pom.xml | 2 +- .../nifi/minifi/c2/service/ConfigService.java | 2 +- .../src/main/webapp/WEB-INF/web.xml | 2 +- minifi-c2/pom.xml | 2 +- minifi-commons/minifi-commons-schema/pom.xml | 2 +- minifi-commons/minifi-utils/pom.xml | 2 +- minifi-commons/pom.xml | 2 +- minifi-docker/pom.xml | 28 ++-- minifi-docs/NOTICE | 2 +- minifi-docs/pom.xml | 2 +- .../src/main/markdown/System_Admin_Guide.md | 2 +- .../markdown/minifi-java-agent-quick-start.md | 8 +- minifi-integration-tests/pom.xml | 2 +- .../conf/minifi-c2-context.xml | 8 +- .../c2-edge2/conf/minifi-c2-context.xml | 8 +- .../minifi-framework-nar/pom.xml | 2 +- .../src/main/resources/META-INF/NOTICE | 4 +- .../minifi-framework-core/pom.xml | 2 +- .../minifi-framework/minifi-nar-utils/pom.xml | 2 +- .../minifi-framework/minifi-resources/NOTICE | 2 +- .../minifi-framework/minifi-resources/pom.xml | 28 ++-- .../minifi-framework/minifi-runtime/pom.xml | 2 +- .../minifi-framework/pom.xml | 2 +- .../minifi-framework-bundle/pom.xml | 2 +- .../minifi-provenance-reporting-nar/pom.xml | 31 ++-- .../src/main/resources/META-INF/NOTICE | 6 +- .../pom.xml | 33 ++-- .../pom.xml | 2 +- .../minifi-provenance-repositories/pom.xml | 2 +- .../minifi-provenance-repository-nar/pom.xml | 2 +- .../src/main/resources/META-INF/NOTICE | 4 +- .../pom.xml | 2 +- .../minifi-ssl-context-service-nar/pom.xml | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../minifi-standard-nar/pom.xml | 2 +- .../src/main/resources/META-INF/LICENSE | 2 +- .../src/main/resources/META-INF/NOTICE | 30 ++-- .../minifi-update-attribute-nar/pom.xml | 2 +- .../src/main/resources/META-INF/NOTICE | 4 +- minifi-nar-bundles/pom.xml | 29 ++-- .../minifi-toolkit-assembly/LICENSE | 6 +- minifi-toolkit/minifi-toolkit-assembly/NOTICE | 34 ++-- .../minifi-toolkit-assembly/README.md | 7 +- .../minifi-toolkit-assembly/pom.xml | 2 +- .../minifi-toolkit-configuration/pom.xml | 2 +- minifi-toolkit/pom.xml | 2 +- pom.xml | 25 ++- 78 files changed, 351 insertions(+), 349 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index e76fd4362..7af845962 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -16,7 +16,7 @@ to ensure the following steps have been taken: ### For code changes: - [ ] Have you ensured that the full suite of tests is executed via mvn -Pcontrib-check clean install at the root nifi-minifi folder? - [ ] Have you written or updated unit tests to verify your changes? -- [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)? +- [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](https://www.apache.org/legal/resolved.html#category-a)? - [ ] If applicable, have you updated the LICENSE file, including the main LICENSE file under minifi-assembly? - [ ] If applicable, have you updated the NOTICE file, including the main NOTICE file found under minifi-assembly? diff --git a/NOTICE b/NOTICE index db373ef0a..b1f6404b6 100644 --- a/NOTICE +++ b/NOTICE @@ -2,6 +2,6 @@ Apache NiFi - MiNiFi Copyright 2014-2018 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). This includes derived works from the Apache NiFi (ASLv2) project including numerous source files from the core framework API.   diff --git a/README.md b/README.md index b9e149fab..bafae742b 100644 --- a/README.md +++ b/README.md @@ -108,9 +108,9 @@ docker run -d -v YOUR_CONFIG.YML:/opt/minifi/minifi-${minifi.version}/conf/confi ## Getting Help If you have questions, you can reach out to our mailing list: dev@nifi.apache.org -([archive](http://mail-archives.apache.org/mod_mbox/nifi-dev)). +([archive](https://mail-archives.apache.org/mod_mbox/nifi-dev)). For more interactive conversations and chat, we're also often available in IRC: #nifi on -[irc.freenode.net](http://webchat.freenode.net/?channels=#nifi) and in #NiFi on [ASF HipChat](https://www.hipchat.com/gzh2m5YML). +[irc.freenode.net](https://webchat.freenode.net/?channels=#nifi) and in #NiFi on [ASF HipChat](https://www.hipchat.com/gzh2m5YML). ## Documentation @@ -140,7 +140,7 @@ currently reside may have restrictions on the import, possession, use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check your country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption -software, to see if this is permitted. See for more +software, to see if this is permitted. See for more information. The U.S. Government Department of Commerce, Bureau of Industry and Security @@ -154,11 +154,10 @@ source code. The following provides more details on the included cryptographic software: -Apache NiFi - MiNiFi uses BouncyCastle, Jasypt, JCraft Inc., and the built-in +Apache NiFi - MiNiFi uses BouncyCastle, JCraft Inc., and the built-in java cryptography libraries for SSL, SSH, and the protection of sensitive configuration parameters. See https://bouncycastle.org/about.html -http://www.jasypt.org/faq.html -http://jcraft.com/c-info.html +https://jcraft.com/c-info.html https://www.oracle.com/us/products/export/export-regulations-345813.html for more details on each of these libraries cryptography features. diff --git a/minifi-api/pom.xml b/minifi-api/pom.xml index 6dcf082c1..4a288b1ac 100644 --- a/minifi-api/pom.xml +++ b/minifi-api/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi diff --git a/minifi-assembly/NOTICE b/minifi-assembly/NOTICE index 826cfe500..24a99bfab 100644 --- a/minifi-assembly/NOTICE +++ b/minifi-assembly/NOTICE @@ -2,7 +2,7 @@ Apache NiFi MiNiFi Copyright 2014-2018 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). =========================================== Apache Software License v2 @@ -16,7 +16,7 @@ The following binary components are provided under the Apache Software License v Copyright 2014-2018 The Apache Software Foundation This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). + The Apache Software Foundation (https://www.apache.org/). This product includes the following work from the Apache Hadoop project: @@ -51,7 +51,7 @@ The following binary components are provided under the Apache Software License v were derived from the LZMA SDK, version 9.20 (C/ and CPP/7zip/), which has been placed in the public domain: - "LZMA SDK is placed in the public domain." (http://www.7-zip.org/sdk.html) + "LZMA SDK is placed in the public domain." (https://www.7-zip.org/sdk.html) (ASLv2) Apache Commons Codec The following NOTICE information applies: @@ -65,7 +65,7 @@ The following binary components are provided under the Apache Software License v =============================================================================== 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 + from the original php source code available at https://stevemorse.org/phoneticinfo.htm with permission from the original authors. Original source copyright: Copyright (c) 2008 Alexander Beider & Stephen P. Morse. @@ -87,7 +87,7 @@ The following binary components are provided under the Apache Software License v Copyright 1999-2013 The Apache Software Foundation This project contains annotations derived from JCIP-ANNOTATIONS - Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net + Copyright (c) 2005 Brian Goetz and Tim Peierls. See https://www.jcip.net (ASLv2) Apache Jakarta HttpClient The following NOTICE information applies: @@ -124,13 +124,13 @@ The following binary components are provided under the Apache Software License v (ASLv2) Xalan This product includes software developed by - The Apache Software Foundation (http://www.apache.org/). + The Apache Software Foundation (https://www.apache.org/). Portions of this software was originally based on the following: - - software copyright (c) 1999-2002, Lotus Development Corporation., http://www.lotus.com. - - software copyright (c) 2001-2002, Sun Microsystems., http://www.sun.com. - - software copyright (c) 2003, IBM Corporation., http://www.ibm.com. + - software copyright (c) 1999-2002, Lotus Development Corporation., https://www.lotus.com. + - software copyright (c) 2001-2002, Sun Microsystems., https://www.sun.com. + - software copyright (c) 2003, IBM Corporation., https://www.ibm.com. - voluntary contributions made by Ovidiu Predescu (ovidiu@cup.hp.com) on behalf of the Apache Software Foundation and was originally developed at Hewlett Packard Company. @@ -138,12 +138,12 @@ The following binary components are provided under the Apache Software License v Copyright 2006 The Apache Software Foundation. This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). + The Apache Software Foundation (https://www.apache.org/). Portions of this software were originally based on the following: - - software copyright (c) 1999, IBM Corporation., http://www.ibm.com. - - software copyright (c) 1999, Sun Microsystems., http://www.sun.com. - - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org + - software copyright (c) 1999, IBM Corporation., https://www.ibm.com. + - software copyright (c) 1999, Sun Microsystems., https://www.sun.com. + - software copyright (c) 2000 World Wide Web Consortium, https://www.w3.org (ASLv2) Jackson JSON processor The following NOTICE information applies: @@ -160,7 +160,7 @@ The following binary components are provided under the Apache Software License v Jackson core and extension components may licensed under different licenses. To find the details that apply to this artifact see the accompanying LICENSE file. For more information, including possible other licensing options, contact - FasterXML.com (http://fasterxml.com). + FasterXML.com (https://fasterxml.com). ## Credits @@ -194,21 +194,21 @@ The following binary components are provided under the Apache Software License v Copyright 2001-2012 The Apache Software Foundation This product includes software developed by - The Apache Software Foundation (http://www.apache.org/). + The Apache Software Foundation (https://www.apache.org/). =============================================================================== The BracketFinder (package org.apache.commons.math3.optimization.univariate) and PowellOptimizer (package org.apache.commons.math3.optimization.general) classes are based on the Python code in module "optimize.py" (version 0.5) - developed by Travis E. Oliphant for the SciPy library (http://www.scipy.org/) + developed by Travis E. Oliphant for the SciPy library (https://www.scipy.org/) Copyright © 2003-2009 SciPy Developers. =============================================================================== The LinearConstraint, LinearObjectiveFunction, LinearOptimizer, RelationShip, SimplexSolver and SimplexTableau classes in package org.apache.commons.math3.optimization.linear include software developed by - Benjamin McCann (http://www.benmccann.com) and distributed with + Benjamin McCann (https://www.benmccann.com) and distributed with the following copyright: Copyright 2009 Google Inc. =============================================================================== @@ -270,13 +270,13 @@ The following binary components are provided under the Apache Software License v Copyright 2015 The Apache Software Foundation This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). + The Apache Software Foundation (https://www.apache.org/). Copyright 1993-2010 University Corporation for Atmospheric Research/Unidata This software contains code derived from UCAR/Unidata's NetCDF library. - Tika-server component uses CDDL-licensed dependencies: jersey (http://jersey.java.net/) and - Grizzly (http://grizzly.java.net/) + Tika-server component uses CDDL-licensed dependencies: jersey (https://jersey.java.net/) and + Grizzly (https://grizzly.java.net/) Tika-parsers component uses CDDL/LGPL dual-licensed dependency: jhighlight (https://github.com/codelibs/jhighlight) @@ -299,22 +299,18 @@ The following binary components are provided under the Apache Software License v Apache Avro Copyright 2009-2013 The Apache Software Foundation - (ASLv2) Jasypt - The following NOTICE information applies: - Copyright (c) 2007-2010, The JASYPT team (http://www.jasypt.org) - (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) + Snappy: https://code.google.com/p/snappy/ (New BSD License) This product includes software developed by Apache - PureJavaCrc32C from apache-hadoop-common http://hadoop.apache.org/ + PureJavaCrc32C from apache-hadoop-common https://hadoop.apache.org/ (Apache 2.0 license) This library containd statically linked libstdc++. This inclusion is allowed by "GCC RUntime Library Exception" - http://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html + https://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html (ASLv2) Apache Lucene The following NOTICE information applies: @@ -332,30 +328,30 @@ The following binary components are provided under the Apache Software License v and Copyright (c) 1995-2008 International Business Machines Corporation and others Some data files (under analysis/icu/src/data) are derived from Unicode data such - as the Unicode Character Database. See http://unicode.org/copyright.html for more + as the Unicode Character Database. See https://unicode.org/copyright.html for more details. Brics Automaton (under core/src/java/org/apache/lucene/util/automaton) is - BSD-licensed, created by Anders Møller. See http://www.brics.dk/automaton/ + BSD-licensed, created by Anders Møller. See https://www.brics.dk/automaton/ The levenshtein automata tables (under core/src/java/org/apache/lucene/util/automaton) were automatically generated with the moman/finenight FSA library, created by Jean-Philippe Barrette-LaPierre. This library is available under an MIT license, - see http://sites.google.com/site/rrettesite/moman and - http://bitbucket.org/jpbarrette/moman/overview/ + see https://sites.google.com/site/rrettesite/moman and + https://bitbucket.org/jpbarrette/moman/overview/ The class org.apache.lucene.util.WeakIdentityMap was derived from the Apache CXF project and is Apache License 2.0. The Google Code Prettify is Apache License 2.0. - See http://code.google.com/p/google-code-prettify/ + See https://code.google.com/p/google-code-prettify/ JUnit (junit-4.10) is licensed under the Common Public License v. 1.0 - See http://junit.sourceforge.net/cpl-v10.html + See https://junit.sourceforge.net/cpl-v10.html This product includes code (JaspellTernarySearchTrie) from Java Spelling Checkin - g Package (jaspell): http://jaspell.sourceforge.net/ - License: The BSD License (http://www.opensource.org/licenses/bsd-license.php) + g Package (jaspell): https://jaspell.sourceforge.net/ + License: The BSD License (https://www.opensource.org/licenses/bsd-license.php) The snowball stemmers in analysis/common/src/java/net/sf/snowball @@ -364,7 +360,7 @@ The following binary components are provided under the Apache Software License v analysis/common/src/resources/org/apache/lucene/analysis/snowball were developed by Martin Porter and Richard Boulton. The full snowball package is available from - http://snowball.tartarus.org/ + https://snowball.tartarus.org/ The KStem stemmer in analysis/common/src/org/apache/lucene/analysis/en @@ -378,7 +374,7 @@ The following binary components are provided under the Apache Software License v analysis/common/src/resources/org/apache/lucene/analysis/ro/stopwords.txt, analysis/common/src/resources/org/apache/lucene/analysis/bg/stopwords.txt, analysis/common/src/resources/org/apache/lucene/analysis/hi/stopwords.txt - See http://members.unine.ch/jacques.savoy/clef/index.html. + See https://members.unine.ch/jacques.savoy/clef/index.html. The German,Spanish,Finnish,French,Hungarian,Italian,Portuguese,Russian and Swedish light stemmers (common) are based on BSD-licensed reference implementations created by Jacques Savoy and @@ -396,33 +392,33 @@ The following binary components are provided under the Apache Software License v analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemmer.java The Stempel analyzer (stempel) includes BSD-licensed software developed - by the Egothor project http://egothor.sf.net/, created by Leo Galambos, Martin Kvapil, + by the Egothor project https://egothor.sf.net/, created by Leo Galambos, Martin Kvapil, and Edmond Nolan. The Polish analyzer (stempel) comes with a default stopword list that is BSD-licensed created by the Carrot2 project. The file resides in stempel/src/resources/org/apache/lucene/analysis/pl/stopwords.txt. - See http://project.carrot2.org/license.html. + See https://project.carrot2.org/license.html. The SmartChineseAnalyzer source code (smartcn) was provided by Xiaoping Gao and copyright 2009 by www.imdict.net. WordBreakTestUnicode_*.java (under modules/analysis/common/src/test/) is derived from Unicode data such as the Unicode Character Database. - See http://unicode.org/copyright.html for more details. + See https://www.unicode.org/copyright.html for more details. The Morfologik analyzer (morfologik) includes BSD-licensed software - developed by Dawid Weiss and Marcin Miłkowski (http://morfologik.blogspot.com/). + developed by Dawid Weiss and Marcin Miłkowski (https://morfologik.blogspot.com/). Morfologik uses data from Polish ispell/myspell dictionary - (http://www.sjp.pl/slownik/en/) licenced on the terms of (inter alia) + (https://www.sjp.pl/slownik/en/) licenced on the terms of (inter alia) LGPL and Creative Commons ShareAlike. Morfologic includes data from BSD-licensed dictionary of Polish (SGJP) - (http://sgjp.pl/morfeusz/) + (https://sgjp.pl/morfeusz/) Servlet-api.jar and javax.servlet-*.jar are under the CDDL license, the original - source code for this can be found at http://www.eclipse.org/jetty/downloads.php + source code for this can be found at https://www.eclipse.org/jetty/downloads.php =========================================================================== Kuromoji Japanese Morphological Analyzer - Apache Lucene Integration @@ -434,11 +430,11 @@ The following binary components are provided under the Apache Software License v which can be obtained from - http://atilika.com/releases/mecab-ipadic/mecab-ipadic-2.7.0-20070801.tar.gz + https://atilika.com/releases/mecab-ipadic/mecab-ipadic-2.7.0-20070801.tar.gz or - http://jaist.dl.sourceforge.net/project/mecab/mecab-ipadic/2.7.0-20070801/mecab-ipadic-2.7.0-20070801.tar.gz + https://jaist.dl.sourceforge.net/project/mecab/mecab-ipadic/2.7.0-20070801/mecab-ipadic-2.7.0-20070801.tar.gz =========================================================================== mecab-ipadic-2.7.0-20070801 Notice @@ -510,7 +506,7 @@ The following binary components are provided under the Apache Software License v (ASLv2) Joda Time The following NOTICE information applies: This product includes software developed by - Joda.org (http://www.joda.org/). + Joda.org (https://www.joda.org/). (ASLv2) Apache ActiveMQ The following NOTICE information applies: @@ -561,11 +557,11 @@ The following binary components are provided under the Apache Software License v Copyright 1999-2007 The Apache Software Foundation This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). + The Apache Software Foundation (https://www.apache.org/). Portions of this software were originally based on the following: - - software copyright (c) 1999, IBM Corporation., http://www.ibm.com. - - software copyright (c) 1999, Sun Microsystems., http://www.sun.com. + - software copyright (c) 1999, IBM Corporation., https://www.ibm.com. + - software copyright (c) 1999, Sun Microsystems., https://www.sun.com. - voluntary contributions made by Paul Eng on behalf of the Apache Software Foundation that were originally developed at iClick, Inc., software copyright (c) 1999. @@ -625,13 +621,13 @@ The following binary components are provided under the Apache Software License v The name Software AG and all Software AG product names are either trademarks or registered trademarks of Software AG and/or Software AG USA Inc. and/or its subsidiaries and/or its affiliates and/or their licensors. Other company and product names mentioned herein may be trademarks of their respective owners. - Detailed information on trademarks and patents owned by Software AG and/or its subsidiaries is located at http://softwareag.com/licenses. + Detailed information on trademarks and patents owned by Software AG and/or its subsidiaries is located at https://softwareag.com/licenses. Third Party declaration This software may include portions of third-party products. For third-party copyright notices, license terms, additional rights or restrictions, please refer to "License Texts, Copyright Notices and Disclaimers of Third Party Products". For certain specific third-party license restrictions, please refer to section E of the Legal Notices available under "License Terms and Conditions for Use of Software AG Products / Copyright and Trademark Notices of Software AG Products". These documents are part of the product documentation, located at - http://softwareag.com/licenses and/or in the root installation directory of the licensed product(s). + https://softwareag.com/licenses and/or in the root installation directory of the licensed product(s). Confidentiality Disclaimer: Use, reproduction, transfer, publication or disclosure is prohibited except as specifically provided for in your License Agreement with Software AG. @@ -654,21 +650,21 @@ The following binary components are provided under the Common Development and Di (CDDL 1.1) (GPL2 w/ CPE) aopalliance-repackaged (org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) (CDDL 1.1) (GPL2 w/ CPE) javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:javax.inject:jar:2.5.0-b42 - https://hk2.java.net/external/javax.inject) - (CDDL 1.1) (GPL2 w/ CPE) JavaMail API (compat) (javax.mail:mail:jar:1.4.7 - http://kenai.com/projects/javamail/mail) - (CDDL 1.1) (GPL2 w/ CPE) JSP Implementation (org.glassfish.web:javax.servlet.jsp:jar:2.3.2 - http://jsp.java.net) - (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages (TM) TagLib Implementation (org.glassfish.web:javax.servlet.jsp.jstl:jar:1.2.2 - http://jstl.java.net) - (CDDL 1.1) (GPL2 w/ CPE) Expression Language 3.0 (org.glassfish:javax.el:jar:3.0.0 - http://el-spec.java.net) - (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages(TM) API (javax.servlet.jsp:javax.servlet.jsp-api:jar:2.3.1 - http://jsp.java.net) - (CDDL 1.1) (GPL2 w/ CPE) Expression Language 3.0 API (javax.el:javax.el-api:jar:3.0.0 - http://uel-spec.java.net) - (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages(TM) Standard Tag Library API (javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:jar:1.2.1 - http://jcp.org/en/jsr/detail?id=52) - (CDDL 1.1) (GPL2 w/ CPE) Java Servlet API (javax.servlet:javax.servlet-api:jar:3.1.0 - http://servlet-spec.java.net) - (CDDL 1.1) (GPL2 w/ CPE) Javax JMS Api (javax.jms:javax.jms-api:jar:2.0.1 - http://java.net/projects/jms-spec/pages/Home) - (CDDL 1.1) (GPL2 w/ CPE) JSON Processing API (javax.json:javax.json-api:jar:1.0 - http://json-processing-spec.java.net) + (CDDL 1.1) (GPL2 w/ CPE) JavaMail API (compat) (javax.mail:mail:jar:1.4.7 - https://kenai.com/projects/javamail/mail) + (CDDL 1.1) (GPL2 w/ CPE) JSP Implementation (org.glassfish.web:javax.servlet.jsp:jar:2.3.2 - https://jsp.java.net) + (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages (TM) TagLib Implementation (org.glassfish.web:javax.servlet.jsp.jstl:jar:1.2.2 - https://jstl.java.net) + (CDDL 1.1) (GPL2 w/ CPE) Expression Language 3.0 (org.glassfish:javax.el:jar:3.0.0 - https://el-spec.java.net) + (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages(TM) API (javax.servlet.jsp:javax.servlet.jsp-api:jar:2.3.1 - https://jsp.java.net) + (CDDL 1.1) (GPL2 w/ CPE) Expression Language 3.0 API (javax.el:javax.el-api:jar:3.0.0 - https://uel-spec.java.net) + (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages(TM) Standard Tag Library API (javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:jar:1.2.1 - https://jcp.org/en/jsr/detail?id=52) + (CDDL 1.1) (GPL2 w/ CPE) Java Servlet API (javax.servlet:javax.servlet-api:jar:3.1.0 - https://servlet-spec.java.net) + (CDDL 1.1) (GPL2 w/ CPE) Javax JMS Api (javax.jms:javax.jms-api:jar:2.0.1 - https://java.net/projects/jms-spec/pages/Home) + (CDDL 1.1) (GPL2 w/ CPE) JSON Processing API (javax.json:javax.json-api:jar:1.0 - https://json-processing-spec.java.net) (CDDL 1.1) (GPL2 w/ CPE) JSON Processing Default Provider (org.glassfish:javax.json:jar:1.0.4 - https://jsonp.java.net) - (CDDL 1.1) (GPL2 w/ CPE) OSGi resource locator bundle (org.glassfish.hk2:osgi-resource-locator:jar:1.0.1 - http://glassfish.org/osgi-resource-locator) - (CDDL 1.1) (GPL2 w/ CPE) javax.annotation API (javax.annotation:javax.annotation-api:jar:1.2 - http://jcp.org/en/jsr/detail?id=250) + (CDDL 1.1) (GPL2 w/ CPE) OSGi resource locator bundle (org.glassfish.hk2:osgi-resource-locator:jar:1.0.1 - https://glassfish.org/osgi-resource-locator) + (CDDL 1.1) (GPL2 w/ CPE) javax.annotation API (javax.annotation:javax.annotation-api:jar:1.2 - https://jcp.org/en/jsr/detail?id=250) (CDDL 1.1) (GPL2 w/ CPE) javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:javax.inject:jar:2.4.0-b25 - https://hk2.java.net/external/javax.inject) - (CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:jar:2.1 - http://jax-rs-spec.java.net) + (CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:jar:2.1 - https://jax-rs-spec.java.net) ************************ Common Development and Distribution License 1.0 @@ -676,7 +672,7 @@ Common Development and Distribution License 1.0 The following binary components are provided under the Common Development and Distribution License 1.0. See project link for details. - (CDDL 1.0) JavaBeans Activation Framework (JAF) (javax.activation:activation:jar:1.1 - http://java.sun.com/products/javabeans/jaf/index.jsp) + (CDDL 1.0) JavaBeans Activation Framework (JAF) (javax.activation:activation:jar:1.1 - https://java.sun.com/products/javabeans/jaf/index.jsp) (CDDL 1.0) (GPL3) Streaming API For XML (javax.xml.stream:stax-api:jar:1.0-2 - no url provided) ************************ @@ -685,10 +681,10 @@ Eclipse Public License 1.0 The following binary components are provided under the Eclipse Public License 1.0. See project link for details. - (EPL 1.0) AspectJ Weaver (org.aspectj:aspectjweaver:jar:1.8.5 - http://www.aspectj.org) - (EPL 1.0)(MPL 2.0) H2 Database (com.h2database:h2:jar:1.3.176 - http://www.h2database.com/html/license.html) - (EPL 1.0)(LGPL 2.1) Logback Classic (ch.qos.logback:logback-classic:jar:1.1.8 - http://logback.qos.ch/) - (EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.1.8 - http://logback.qos.ch/) + (EPL 1.0) AspectJ Weaver (org.aspectj:aspectjweaver:jar:1.8.5 - https://www.aspectj.org) + (EPL 1.0)(MPL 2.0) H2 Database (com.h2database:h2:jar:1.3.176 - https://www.h2database.com/html/license.html) + (EPL 1.0)(LGPL 2.1) Logback Classic (ch.qos.logback:logback-classic:jar:1.1.8 - https://logback.qos.ch/) + (EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.1.8 - https://logback.qos.ch/) ***************** Mozilla Public License v2.0 @@ -696,7 +692,7 @@ Mozilla Public License v2.0 The following binary components are provided under the Mozilla Public License v2.0. See project link for details. - (MPL 2.0) Saxon HE (net.sf.saxon:Saxon-HE:jar:9.6.0-5 - http://www.saxonica.com/) + (MPL 2.0) Saxon HE (net.sf.saxon:Saxon-HE:jar:9.6.0-5 - https://www.saxonica.com/) ***************** Mozilla Public License v1.1 @@ -704,8 +700,8 @@ Mozilla Public License v1.1 The following binary components are provided under the Mozilla Public License v1.1. See project link for details. - (MPL 1.1) HAPI Base (ca.uhn.hapi:hapi-base:2.2 - http://hl7api.sourceforge.net/) - (MPL 1.1) HAPI Structures (ca.uhn.hapi:hapi-structures-v*:2.2 - http://hl7api.sourceforge.net/) + (MPL 1.1) HAPI Base (ca.uhn.hapi:hapi-base:2.2 - https://hl7api.sourceforge.net/) + (MPL 1.1) HAPI Structures (ca.uhn.hapi:hapi-structures-v*:2.2 - https://hl7api.sourceforge.net/) ***************** Public Domain @@ -713,8 +709,8 @@ Public Domain The following binary components are provided to the 'Public Domain'. See project link for details. - (Public Domain) XZ for Java (org.tukaani:xz:jar:1.5 - http://tukaani.org/xz/java.html - (Public Domain) AOP Alliance 1.0 (http://aopalliance.sourceforge.net/) + (Public Domain) XZ for Java (org.tukaani:xz:jar:1.5 - https://tukaani.org/xz/java.html + (Public Domain) AOP Alliance 1.0 (https://aopalliance.sourceforge.net/) The following binary components are provided under the Creative Commons Zero license version 1.0. See project link for details. diff --git a/minifi-assembly/README.md b/minifi-assembly/README.md index 0b0cd281d..17c87ad33 100644 --- a/minifi-assembly/README.md +++ b/minifi-assembly/README.md @@ -28,7 +28,7 @@ MiNiFi is a child project effort of Apache NiFi ## Features -Apache NiFi - MiNiFi is a complementary data collection approach that supplements the core tenets of [NiFi](http://nifi.apache.org/) in dataflow management, focusing on the collection of data at the source of its creation. +Apache NiFi - MiNiFi is a complementary data collection approach that supplements the core tenets of [NiFi](https://nifi.apache.org/) in dataflow management, focusing on the collection of data at the source of its creation. Specific goals for MiNiFi are comprised of: - small and lightweight footprint @@ -59,18 +59,18 @@ To run MiNiFi: ## Getting Help If you have questions, you can reach out to our mailing list: dev@nifi.apache.org -([archive](http://mail-archives.apache.org/mod_mbox/nifi-dev)). +([archive](https://mail-archives.apache.org/mod_mbox/nifi-dev)). We're also often available in IRC: #nifi on -[irc.freenode.net](http://webchat.freenode.net/?channels=#nifi). +[irc.freenode.net](https://webchat.freenode.net/?channels=#nifi). ## Documentation -See http://nifi.apache.org/minifi and https://cwiki.apache.org/confluence/display/NIFI/MiNiFi for the latest documentation. +See https://nifi.apache.org/minifi and https://cwiki.apache.org/confluence/display/NIFI/MiNiFi for the latest documentation. ## License Except as otherwise noted this software is licensed under the -[Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) +[Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.html) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -91,7 +91,7 @@ currently reside may have restrictions on the import, possession, use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check your country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption -software, to see if this is permitted. See for more +software, to see if this is permitted. See for more information. The U.S. Government Department of Commerce, Bureau of Industry and Security @@ -105,11 +105,10 @@ source code. The following provides more details on the included cryptographic software: -Apache NiFi - MiNiFi uses BouncyCastle, Jasypt, JCraft Inc., and the built-in +Apache NiFi - MiNiFi uses BouncyCastle, JCraft Inc., and the built-in java cryptography libraries for SSL, SSH, and the protection of sensitive configuration parameters. See -http://bouncycastle.org/about.html -http://www.jasypt.org/faq.html -http://jcraft.com/c-info.html -http://www.oracle.com/us/products/export/export-regulations-345813.html +https://bouncycastle.org/about.html +https://jcraft.com/c-info.html +https://www.oracle.com/us/products/export/export-regulations-345813.html for more details on each of these libraries cryptography features. diff --git a/minifi-assembly/pom.xml b/minifi-assembly/pom.xml index f44c0d4f8..efb35bb95 100644 --- a/minifi-assembly/pom.xml +++ b/minifi-assembly/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi @@ -54,7 +54,7 @@ limitations under the License. - + diff --git a/minifi-bootstrap/pom.xml b/minifi-bootstrap/pom.xml index baddf27de..2d08e40ca 100644 --- a/minifi-bootstrap/pom.xml +++ b/minifi-bootstrap/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi diff --git a/minifi-c2/c2-integration-test.graphml b/minifi-c2/c2-integration-test.graphml index 82fbbf514..3171924b3 100644 --- a/minifi-c2/c2-integration-test.graphml +++ b/minifi-c2/c2-integration-test.graphml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + diff --git a/minifi-c2/minifi-c2-api/pom.xml b/minifi-c2/minifi-c2-api/pom.xml index 9345e4ebc..c87a9b859 100644 --- a/minifi-c2/minifi-c2-api/pom.xml +++ b/minifi-c2/minifi-c2-api/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi-c2 diff --git a/minifi-c2/minifi-c2-assembly/NOTICE b/minifi-c2/minifi-c2-assembly/NOTICE index bf1b82511..d978874a1 100644 --- a/minifi-c2/minifi-c2-assembly/NOTICE +++ b/minifi-c2/minifi-c2-assembly/NOTICE @@ -2,7 +2,7 @@ Apache NiFi MiNiFi Copyright 2014-2018 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). =========================================== Apache Software License v2 @@ -19,7 +19,7 @@ The following binary components are provided under the Apache Software License v Copyright 2014-2018 The Apache Software Foundation This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). + The Apache Software Foundation (https://www.apache.org/). This product includes the following work from the Apache Hadoop project: @@ -27,7 +27,7 @@ The following binary components are provided under the Apache Software License v This includes derived works from the Apache Software License V2 library python-evtx (https://github.com/williballenthin/python-evtx) Copyright 2012, 2013 Willi Ballenthin william.ballenthin@mandiant.com - while at Mandiant http://www.mandiant.com + while at Mandiant https://www.mandiant.com The derived work is adapted from Evtx/Evtx.py, Evtx/BinaryParser.py, Evtx/Nodes.py, Evtx/Views.py and can be found in the org.apache.nifi.processors.evtx.parser package. @@ -65,7 +65,7 @@ The following binary components are provided under the Apache Software License v =============================================================================== 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 + from the original php source code available at https://stevemorse.org/phoneticinfo.htm with permission from the original authors. Original source copyright: Copyright (c) 2008 Alexander Beider & Stephen P. Morse. @@ -75,7 +75,7 @@ The following binary components are provided under the Apache Software License v Copyright 2010-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved. This product includes software developed by - Amazon Technologies, Inc (http://www.amazon.com/). + Amazon Technologies, Inc (https://www.amazon.com/). ********************** THIRD PARTY COMPONENTS @@ -109,7 +109,7 @@ The following binary components are provided under the Apache Software License v Jackson core and extension components may licensed under different licenses. To find the details that apply to this artifact see the accompanying LICENSE file. For more information, including possible other licensing options, contact - FasterXML.com (http://fasterxml.com). + FasterXML.com (https://fasterxml.com). ## Credits @@ -138,7 +138,7 @@ The following binary components are provided under the Apache Software License v Copyright 1999-2013 The Apache Software Foundation This project contains annotations derived from JCIP-ANNOTATIONS - Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net + Copyright (c) 2005 Brian Goetz and Tim Peierls. See https://www.jcip.net (ASLv2) Apache Commons Logging The following NOTICE information applies: @@ -174,22 +174,18 @@ The following binary components are provided under the Apache Software License v The name Software AG and all Software AG product names are either trademarks or registered trademarks of Software AG and/or Software AG USA Inc. and/or its subsidiaries and/or its affiliates and/or their licensors. Other company and product names mentioned herein may be trademarks of their respective owners. - Detailed information on trademarks and patents owned by Software AG and/or its subsidiaries is located at http://softwareag.com/licenses. + Detailed information on trademarks and patents owned by Software AG and/or its subsidiaries is located at https://softwareag.com/licenses. Third Party declaration This software may include portions of third-party products. For third-party copyright notices, license terms, additional rights or restrictions, please refer to "License Texts, Copyright Notices and Disclaimers of Third Party Products". For certain specific third-party license restrictions, please refer to section E of the Legal Notices available under "License Terms and Conditions for Use of Software AG Products / Copyright and Trademark Notices of Software AG Products". These documents are part of the product documentation, located at - http://softwareag.com/licenses and/or in the root installation directory of the licensed product(s). + https://softwareag.com/licenses and/or in the root installation directory of the licensed product(s). Confidentiality Disclaimer: Use, reproduction, transfer, publication or disclosure is prohibited except as specifically provided for in your License Agreement with Software AG. Contact GitHub API Training Shop Blog About - (ASLv2) Jasypt - The following NOTICE information applies: - Copyright (c) 2007-2010, The JASYPT team (http://www.jasypt.org) - (ASLv2) Apache Commons IO The following NOTICE information applies: Apache Commons IO @@ -238,21 +234,21 @@ The following binary components are provided under the Common Development and Di (CDDL 1.1) (GPL2 w/ CPE) aopalliance-repackaged (org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) (CDDL 1.1) (GPL2 w/ CPE) javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:javax.inject:jar:2.5.0-b42 - https://hk2.java.net/external/javax.inject) - (CDDL 1.1) (GPL2 w/ CPE) JavaMail API (compat) (javax.mail:mail:jar:1.4.7 - http://kenai.com/projects/javamail/mail) - (CDDL 1.1) (GPL2 w/ CPE) JSP Implementation (org.glassfish.web:javax.servlet.jsp:jar:2.3.2 - http://jsp.java.net) - (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages (TM) TagLib Implementation (org.glassfish.web:javax.servlet.jsp.jstl:jar:1.2.2 - http://jstl.java.net) - (CDDL 1.1) (GPL2 w/ CPE) Expression Language 3.0 (org.glassfish:javax.el:jar:3.0.0 - http://el-spec.java.net) - (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages(TM) API (javax.servlet.jsp:javax.servlet.jsp-api:jar:2.3.1 - http://jsp.java.net) - (CDDL 1.1) (GPL2 w/ CPE) Expression Language 3.0 API (javax.el:javax.el-api:jar:3.0.0 - http://uel-spec.java.net) - (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages(TM) Standard Tag Library API (javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:jar:1.2.1 - http://jcp.org/en/jsr/detail?id=52) - (CDDL 1.1) (GPL2 w/ CPE) Java Servlet API (javax.servlet:javax.servlet-api:jar:3.1.0 - http://servlet-spec.java.net) - (CDDL 1.1) (GPL2 w/ CPE) Javax JMS Api (javax.jms:javax.jms-api:jar:2.0.1 - http://java.net/projects/jms-spec/pages/Home) - (CDDL 1.1) (GPL2 w/ CPE) JSON Processing API (javax.json:javax.json-api:jar:1.0 - http://json-processing-spec.java.net) + (CDDL 1.1) (GPL2 w/ CPE) JavaMail API (compat) (javax.mail:mail:jar:1.4.7 - https://kenai.com/projects/javamail/mail) + (CDDL 1.1) (GPL2 w/ CPE) JSP Implementation (org.glassfish.web:javax.servlet.jsp:jar:2.3.2 - https://jsp.java.net) + (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages (TM) TagLib Implementation (org.glassfish.web:javax.servlet.jsp.jstl:jar:1.2.2 - https://jstl.java.net) + (CDDL 1.1) (GPL2 w/ CPE) Expression Language 3.0 (org.glassfish:javax.el:jar:3.0.0 - https://el-spec.java.net) + (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages(TM) API (javax.servlet.jsp:javax.servlet.jsp-api:jar:2.3.1 - https://jsp.java.net) + (CDDL 1.1) (GPL2 w/ CPE) Expression Language 3.0 API (javax.el:javax.el-api:jar:3.0.0 - https://uel-spec.java.net) + (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages(TM) Standard Tag Library API (javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:jar:1.2.1 - https://jcp.org/en/jsr/detail?id=52) + (CDDL 1.1) (GPL2 w/ CPE) Java Servlet API (javax.servlet:javax.servlet-api:jar:3.1.0 - https://servlet-spec.java.net) + (CDDL 1.1) (GPL2 w/ CPE) Javax JMS Api (javax.jms:javax.jms-api:jar:2.0.1 - https://java.net/projects/jms-spec/pages/Home) + (CDDL 1.1) (GPL2 w/ CPE) JSON Processing API (javax.json:javax.json-api:jar:1.0 - https://json-processing-spec.java.net) (CDDL 1.1) (GPL2 w/ CPE) JSON Processing Default Provider (org.glassfish:javax.json:jar:1.0.4 - https://jsonp.java.net) - (CDDL 1.1) (GPL2 w/ CPE) OSGi resource locator bundle (org.glassfish.hk2:osgi-resource-locator:jar:1.0.1 - http://glassfish.org/osgi-resource-locator) - (CDDL 1.1) (GPL2 w/ CPE) javax.annotation API (javax.annotation:javax.annotation-api:jar:1.2 - http://jcp.org/en/jsr/detail?id=250) + (CDDL 1.1) (GPL2 w/ CPE) OSGi resource locator bundle (org.glassfish.hk2:osgi-resource-locator:jar:1.0.1 - https://glassfish.org/osgi-resource-locator) + (CDDL 1.1) (GPL2 w/ CPE) javax.annotation API (javax.annotation:javax.annotation-api:jar:1.2 - https://jcp.org/en/jsr/detail?id=250) (CDDL 1.1) (GPL2 w/ CPE) javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:javax.inject:jar:2.4.0-b25 - https://hk2.java.net/external/javax.inject) - (CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:jar:2.1 - http://jax-rs-spec.java.net) + (CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:jar:2.1 - https://jax-rs-spec.java.net) ************************ @@ -261,7 +257,7 @@ Common Development and Distribution License 1.0 The following binary components are provided under the Common Development and Distribution License 1.0. See project link for details. - (CDDL 1.0) JavaBeans Activation Framework (JAF) (javax.activation:activation:jar:1.1 - http://java.sun.com/products/javabeans/jaf/index.jsp) + (CDDL 1.0) JavaBeans Activation Framework (JAF) (javax.activation:activation:jar:1.1 - https://java.sun.com/products/javabeans/jaf/index.jsp) (CDDL 1.0) (GPL3) Streaming API For XML (javax.xml.stream:stax-api:jar:1.0-2 - no url provided) (CDDL 1.0) JSR311 API (javax.ws.rs:jsr311-api:jar:1.1.1 - https://jsr311.dev.java.net) @@ -272,7 +268,7 @@ Eclipse Public License 1.0 The following binary components are provided under the Eclipse Public License 1.0. See project link for details. - (EPL 1.0) AspectJ Weaver (org.aspectj:aspectjweaver:jar:1.8.5 - http://www.eclipse.org/aspectj/) - (EPL 1.0)(LGPL 2.1) Logback Classic (ch.qos.logback:logback-classic:jar:1.1.3 - http://logback.qos.ch/) - (EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.1.3 - http://logback.qos.ch/) - (EPL 1.0)(MPL 2.0) H2 Database (com.h2database:h2:jar:1.3.176 - http://www.h2database.com/html/license.html) + (EPL 1.0) AspectJ Weaver (org.aspectj:aspectjweaver:jar:1.8.5 - https://www.eclipse.org/aspectj/) + (EPL 1.0)(LGPL 2.1) Logback Classic (ch.qos.logback:logback-classic:jar:1.1.3 - https://logback.qos.ch/) + (EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.1.3 - https://logback.qos.ch/) + (EPL 1.0)(MPL 2.0) H2 Database (com.h2database:h2:jar:1.3.176 - https://www.h2database.com/html/license.html) diff --git a/minifi-c2/minifi-c2-assembly/README.md b/minifi-c2/minifi-c2-assembly/README.md index c77e3e260..1c048441d 100644 --- a/minifi-c2/minifi-c2-assembly/README.md +++ b/minifi-c2/minifi-c2-assembly/README.md @@ -73,7 +73,7 @@ currently reside may have restrictions on the import, possession, use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check your country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption -software, to see if this is permitted. See for more +software, to see if this is permitted. See for more information. The U.S. Government Department of Commerce, Bureau of Industry and Security @@ -87,11 +87,10 @@ source code. The following provides more details on the included cryptographic software: -Apache NiFi - MiNiFi uses BouncyCastle, Jasypt, JCraft Inc., and the built-in +Apache NiFi - MiNiFi uses BouncyCastle, JCraft Inc., and the built-in java cryptography libraries for SSL, SSH, and the protection of sensitive configuration parameters. See https://bouncycastle.org/about.html -http://www.jasypt.org/faq.html -http://jcraft.com/c-info.html +https://jcraft.com/c-info.html https://www.oracle.com/us/products/export/export-regulations-345813.html for more details on each of these libraries cryptography features. diff --git a/minifi-c2/minifi-c2-assembly/pom.xml b/minifi-c2/minifi-c2-assembly/pom.xml index 5ce77f354..bc58c28b5 100644 --- a/minifi-c2/minifi-c2-assembly/pom.xml +++ b/minifi-c2/minifi-c2-assembly/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi-c2 diff --git a/minifi-c2/minifi-c2-assembly/src/main/resources/conf/minifi-c2-context.xml b/minifi-c2/minifi-c2-assembly/src/main/resources/conf/minifi-c2-context.xml index da0ed65cf..f66d48630 100644 --- a/minifi-c2/minifi-c2-assembly/src/main/resources/conf/minifi-c2-context.xml +++ b/minifi-c2/minifi-c2-assembly/src/main/resources/conf/minifi-c2-context.xml @@ -18,7 +18,7 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"> diff --git a/minifi-c2/minifi-c2-assembly/src/main/resources/conf/minifi-c2-web-security-context.xml b/minifi-c2/minifi-c2-assembly/src/main/resources/conf/minifi-c2-web-security-context.xml index 9b3f15c1b..9035c2fe1 100644 --- a/minifi-c2/minifi-c2-assembly/src/main/resources/conf/minifi-c2-web-security-context.xml +++ b/minifi-c2/minifi-c2-assembly/src/main/resources/conf/minifi-c2-web-security-context.xml @@ -15,7 +15,7 @@ --> + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"> diff --git a/minifi-c2/minifi-c2-assembly/src/main/resources/conf/webdefault.xml b/minifi-c2/minifi-c2-assembly/src/main/resources/conf/webdefault.xml index 8a89e1bbe..811eeb2f6 100644 --- a/minifi-c2/minifi-c2-assembly/src/main/resources/conf/webdefault.xml +++ b/minifi-c2/minifi-c2-assembly/src/main/resources/conf/webdefault.xml @@ -16,7 +16,7 @@ diff --git a/minifi-c2/minifi-c2-cache/minifi-c2-cache-filesystem/pom.xml b/minifi-c2/minifi-c2-cache/minifi-c2-cache-filesystem/pom.xml index 77cb4d4aa..3057f3c9f 100644 --- a/minifi-c2/minifi-c2-cache/minifi-c2-cache-filesystem/pom.xml +++ b/minifi-c2/minifi-c2-cache/minifi-c2-cache-filesystem/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi-c2-cache diff --git a/minifi-c2/minifi-c2-cache/minifi-c2-cache-s3/pom.xml b/minifi-c2/minifi-c2-cache/minifi-c2-cache-s3/pom.xml index 9952528fb..c3c7be8b6 100644 --- a/minifi-c2/minifi-c2-cache/minifi-c2-cache-s3/pom.xml +++ b/minifi-c2/minifi-c2-cache/minifi-c2-cache-s3/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi-c2-cache diff --git a/minifi-c2/minifi-c2-cache/pom.xml b/minifi-c2/minifi-c2-cache/pom.xml index a4688da27..78897f255 100644 --- a/minifi-c2/minifi-c2-cache/pom.xml +++ b/minifi-c2/minifi-c2-cache/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi-c2 diff --git a/minifi-c2/minifi-c2-docker/pom.xml b/minifi-c2/minifi-c2-docker/pom.xml index 2e8e1f797..f2c9e3a3b 100644 --- a/minifi-c2/minifi-c2-docker/pom.xml +++ b/minifi-c2/minifi-c2-docker/pom.xml @@ -1,15 +1,21 @@ - - + + 4.0.0 diff --git a/minifi-c2/minifi-c2-integration-tests/pom.xml b/minifi-c2/minifi-c2-integration-tests/pom.xml index adbf0e780..755f509a9 100644 --- a/minifi-c2/minifi-c2-integration-tests/pom.xml +++ b/minifi-c2/minifi-c2-integration-tests/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi-c2 diff --git a/minifi-c2/minifi-c2-integration-tests/src/test/resources/c2-secure-delegating/conf/minifi-c2-context.xml b/minifi-c2/minifi-c2-integration-tests/src/test/resources/c2-secure-delegating/conf/minifi-c2-context.xml index e3e4976db..5696552b3 100644 --- a/minifi-c2/minifi-c2-integration-tests/src/test/resources/c2-secure-delegating/conf/minifi-c2-context.xml +++ b/minifi-c2/minifi-c2-integration-tests/src/test/resources/c2-secure-delegating/conf/minifi-c2-context.xml @@ -22,10 +22,10 @@ xmlns:util="http://www.springframework.org/schema/util" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-3.1.xsd + http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.1.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-3.1.xsd"> diff --git a/minifi-c2/minifi-c2-integration-tests/src/test/resources/c2-secure-rest/conf/minifi-c2-context.xml b/minifi-c2/minifi-c2-integration-tests/src/test/resources/c2-secure-rest/conf/minifi-c2-context.xml index 42c98ea68..d5436a5a2 100644 --- a/minifi-c2/minifi-c2-integration-tests/src/test/resources/c2-secure-rest/conf/minifi-c2-context.xml +++ b/minifi-c2/minifi-c2-integration-tests/src/test/resources/c2-secure-rest/conf/minifi-c2-context.xml @@ -23,10 +23,10 @@ xmlns:util="http://www.springframework.org/schema/util" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-3.1.xsd + http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.1.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-3.1.xsd"> diff --git a/minifi-c2/minifi-c2-integration-tests/src/test/resources/c2-unsecure-delegating/conf/minifi-c2-context.xml b/minifi-c2/minifi-c2-integration-tests/src/test/resources/c2-unsecure-delegating/conf/minifi-c2-context.xml index a24621977..c35c470e1 100644 --- a/minifi-c2/minifi-c2-integration-tests/src/test/resources/c2-unsecure-delegating/conf/minifi-c2-context.xml +++ b/minifi-c2/minifi-c2-integration-tests/src/test/resources/c2-unsecure-delegating/conf/minifi-c2-context.xml @@ -22,10 +22,10 @@ xmlns:util="http://www.springframework.org/schema/util" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-3.1.xsd + http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.1.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-3.1.xsd"> diff --git a/minifi-c2/minifi-c2-integration-tests/src/test/resources/c2-unsecure-rest/conf/minifi-c2-context.xml b/minifi-c2/minifi-c2-integration-tests/src/test/resources/c2-unsecure-rest/conf/minifi-c2-context.xml index 3834cc8a6..df02d77a9 100644 --- a/minifi-c2/minifi-c2-integration-tests/src/test/resources/c2-unsecure-rest/conf/minifi-c2-context.xml +++ b/minifi-c2/minifi-c2-integration-tests/src/test/resources/c2-unsecure-rest/conf/minifi-c2-context.xml @@ -22,10 +22,10 @@ xmlns:util="http://www.springframework.org/schema/util" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-3.1.xsd + http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.1.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-3.1.xsd"> diff --git a/minifi-c2/minifi-c2-jetty/pom.xml b/minifi-c2/minifi-c2-jetty/pom.xml index 9e28aea93..52ada9170 100644 --- a/minifi-c2/minifi-c2-jetty/pom.xml +++ b/minifi-c2/minifi-c2-jetty/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi-c2 diff --git a/minifi-c2/minifi-c2-provider/minifi-c2-provider-cache/pom.xml b/minifi-c2/minifi-c2-provider/minifi-c2-provider-cache/pom.xml index 1a333b571..7b78a1715 100644 --- a/minifi-c2/minifi-c2-provider/minifi-c2-provider-cache/pom.xml +++ b/minifi-c2/minifi-c2-provider/minifi-c2-provider-cache/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi-c2-provider diff --git a/minifi-c2/minifi-c2-provider/minifi-c2-provider-delegating/pom.xml b/minifi-c2/minifi-c2-provider/minifi-c2-provider-delegating/pom.xml index c82873b8b..e070fb95d 100644 --- a/minifi-c2/minifi-c2-provider/minifi-c2-provider-delegating/pom.xml +++ b/minifi-c2/minifi-c2-provider/minifi-c2-provider-delegating/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi-c2-provider diff --git a/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/pom.xml b/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/pom.xml index 16a3b4639..36f4e1dfa 100644 --- a/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/pom.xml +++ b/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi-c2-provider diff --git a/minifi-c2/minifi-c2-provider/minifi-c2-provider-util/pom.xml b/minifi-c2/minifi-c2-provider/minifi-c2-provider-util/pom.xml index 4c5cebe8b..a49b4faf9 100644 --- a/minifi-c2/minifi-c2-provider/minifi-c2-provider-util/pom.xml +++ b/minifi-c2/minifi-c2-provider/minifi-c2-provider-util/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi-c2-provider diff --git a/minifi-c2/minifi-c2-provider/pom.xml b/minifi-c2/minifi-c2-provider/pom.xml index bf9af6bbf..e8b6efd69 100644 --- a/minifi-c2/minifi-c2-provider/pom.xml +++ b/minifi-c2/minifi-c2-provider/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi-c2 diff --git a/minifi-c2/minifi-c2-service/pom.xml b/minifi-c2/minifi-c2-service/pom.xml index a10ea31ee..631bd7a62 100644 --- a/minifi-c2/minifi-c2-service/pom.xml +++ b/minifi-c2/minifi-c2-service/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi-c2 diff --git a/minifi-c2/minifi-c2-service/src/main/java/org/apache/nifi/minifi/c2/service/ConfigService.java b/minifi-c2/minifi-c2-service/src/main/java/org/apache/nifi/minifi/c2/service/ConfigService.java index efe334ae2..30c95bb37 100644 --- a/minifi-c2/minifi-c2-service/src/main/java/org/apache/nifi/minifi/c2/service/ConfigService.java +++ b/minifi-c2/minifi-c2-service/src/main/java/org/apache/nifi/minifi/c2/service/ConfigService.java @@ -250,7 +250,7 @@ public Response getConfig(@Context HttpServletRequest request, @Context HttpHead } } - // see: http://stackoverflow.com/questions/15429257/how-to-convert-byte-array-to-hexstring-in-java#answer-15429408 + // see: https://stackoverflow.com/questions/15429257/how-to-convert-byte-array-to-hexstring-in-java#answer-15429408 protected static String bytesToHex(byte[] in) { final StringBuilder builder = new StringBuilder(); for (byte b : in) { diff --git a/minifi-c2/minifi-c2-service/src/main/webapp/WEB-INF/web.xml b/minifi-c2/minifi-c2-service/src/main/webapp/WEB-INF/web.xml index b9efff8ec..beeb5f19d 100644 --- a/minifi-c2/minifi-c2-service/src/main/webapp/WEB-INF/web.xml +++ b/minifi-c2/minifi-c2-service/src/main/webapp/WEB-INF/web.xml @@ -15,7 +15,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + minifi-c2 diff --git a/minifi-c2/pom.xml b/minifi-c2/pom.xml index e4a708b59..661a34b47 100644 --- a/minifi-c2/pom.xml +++ b/minifi-c2/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi diff --git a/minifi-commons/minifi-commons-schema/pom.xml b/minifi-commons/minifi-commons-schema/pom.xml index 6a7623dd4..72a0b0023 100644 --- a/minifi-commons/minifi-commons-schema/pom.xml +++ b/minifi-commons/minifi-commons-schema/pom.xml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.nifi.minifi diff --git a/minifi-commons/minifi-utils/pom.xml b/minifi-commons/minifi-utils/pom.xml index a5911443f..e6da186dd 100644 --- a/minifi-commons/minifi-utils/pom.xml +++ b/minifi-commons/minifi-utils/pom.xml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.nifi.minifi diff --git a/minifi-commons/pom.xml b/minifi-commons/pom.xml index d40435b5b..93b4f54bf 100644 --- a/minifi-commons/pom.xml +++ b/minifi-commons/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi diff --git a/minifi-docker/pom.xml b/minifi-docker/pom.xml index bc8e45c78..1867e9bb0 100644 --- a/minifi-docker/pom.xml +++ b/minifi-docker/pom.xml @@ -1,15 +1,21 @@ - - + + 4.0.0 diff --git a/minifi-docs/NOTICE b/minifi-docs/NOTICE index 541988b0c..ebfa4682c 100644 --- a/minifi-docs/NOTICE +++ b/minifi-docs/NOTICE @@ -2,4 +2,4 @@ minifi-docs Copyright 2014-2018 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). diff --git a/minifi-docs/pom.xml b/minifi-docs/pom.xml index 5105f3e00..7be0a3cd5 100644 --- a/minifi-docs/pom.xml +++ b/minifi-docs/pom.xml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.nifi.minifi diff --git a/minifi-docs/src/main/markdown/System_Admin_Guide.md b/minifi-docs/src/main/markdown/System_Admin_Guide.md index 0e8b482d0..6db25c1c3 100644 --- a/minifi-docs/src/main/markdown/System_Admin_Guide.md +++ b/minifi-docs/src/main/markdown/System_Admin_Guide.md @@ -342,7 +342,7 @@ Bootstrap Config File: /Users/user/projects/nifi-minifi/minifi-assembly/target/m # Config File -The *config.yml* in the `conf` directory is the main configuration file for controlling how MiNiFi runs. This section provides an overview of the properties in this file. The file is a YAML file and follows the YAML format laid out [here](http://www.yaml.org/). +The *config.yml* in the `conf` directory is the main configuration file for controlling how MiNiFi runs. This section provides an overview of the properties in this file. The file is a YAML file and follows the YAML format laid out [here](https://www.yaml.org/). Alternatively, the MiNiFi Toolkit Converter can aid in creating a *config.yml* from a generated template exported from a NiFi instance. This tool can be downloaded from https://nifi.apache.org/minifi/download.html under the "MiNiFi Toolkit Binaries" section. Information on the toolkit's usage is available at https://nifi.apache.org/minifi/minifi-toolkit.html. diff --git a/minifi-docs/src/main/markdown/minifi-java-agent-quick-start.md b/minifi-docs/src/main/markdown/minifi-java-agent-quick-start.md index babecddf6..2ed193ad3 100644 --- a/minifi-docs/src/main/markdown/minifi-java-agent-quick-start.md +++ b/minifi-docs/src/main/markdown/minifi-java-agent-quick-start.md @@ -19,7 +19,7 @@ [Apache NiFi Team](dev@nifi.apache.org) -[NiFi Homepage](http://nifi.apache.org) +[NiFi Homepage](https://nifi.apache.org) # Overview @@ -40,14 +40,14 @@ MiNiFi Java Agent is supported on the following operating systems: * Debian 7 * SUSE Linux Enterprise Server (SLES) 11 SP3 (64-bit) -You can download the MiNiFi Java Agent and the MiNiFi Toolkit from the [MiNiFi download page](http://nifi.apache.org/minifi/download.html). +You can download the MiNiFi Java Agent and the MiNiFi Toolkit from the [MiNiFi download page](https://nifi.apache.org/minifi/download.html). # Installing and Starting MiNiFi You have several options for installing and starting MiNiFi. ## For Linux and Mac OS X Users To install MiNiFi: -1. [Download](http://nifi.apache.org/minifi/download.html) MiNiFi. +1. [Download](https://nifi.apache.org/minifi/download.html) MiNiFi. 2. Extract the file to the location from which you want to the application. You can also install MiNiFi as a service: @@ -271,7 +271,7 @@ minifi.sh flowStatus processor:TailFile:health,stats,bulletins **Note:** Any connections, remote process groups or processors names that contain ":", ";" or "," will cause parsing errors when querying. -For details on the `flowStatus` option, see the "FlowStatus Query Option" section of the [Administration Guide](http://nifi.apache.org/minifi/system-admin-guide.html). +For details on the `flowStatus` option, see the "FlowStatus Query Option" section of the [Administration Guide](https://nifi.apache.org/minifi/system-admin-guide.html). ## Loading a New Dataflow You can load a new dataflow for a MiNiFi instance to run: diff --git a/minifi-integration-tests/pom.xml b/minifi-integration-tests/pom.xml index 8f191cf01..1e0b814b1 100644 --- a/minifi-integration-tests/pom.xml +++ b/minifi-integration-tests/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi diff --git a/minifi-integration-tests/src/test/resources/c2/hierarchical/c2-authoritative/conf/minifi-c2-context.xml b/minifi-integration-tests/src/test/resources/c2/hierarchical/c2-authoritative/conf/minifi-c2-context.xml index 95db87102..7e2c6a868 100644 --- a/minifi-integration-tests/src/test/resources/c2/hierarchical/c2-authoritative/conf/minifi-c2-context.xml +++ b/minifi-integration-tests/src/test/resources/c2/hierarchical/c2-authoritative/conf/minifi-c2-context.xml @@ -21,10 +21,10 @@ xmlns:util="http://www.springframework.org/schema/util" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-3.1.xsd + http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.1.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-3.1.xsd"> diff --git a/minifi-integration-tests/src/test/resources/c2/hierarchical/c2-edge2/conf/minifi-c2-context.xml b/minifi-integration-tests/src/test/resources/c2/hierarchical/c2-edge2/conf/minifi-c2-context.xml index 3c11dd7e8..5dd27d916 100644 --- a/minifi-integration-tests/src/test/resources/c2/hierarchical/c2-edge2/conf/minifi-c2-context.xml +++ b/minifi-integration-tests/src/test/resources/c2/hierarchical/c2-edge2/conf/minifi-c2-context.xml @@ -22,10 +22,10 @@ xmlns:util="http://www.springframework.org/schema/util" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-3.1.xsd + http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.1.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-3.1.xsd"> diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml index 28b63d3e1..c03203a19 100644 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml +++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml @@ -15,7 +15,7 @@ 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. --> - + minifi-framework-bundle org.apache.nifi.minifi diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/src/main/resources/META-INF/NOTICE b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/src/main/resources/META-INF/NOTICE index 03df4d3d3..e85461eb4 100644 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/src/main/resources/META-INF/NOTICE +++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/src/main/resources/META-INF/NOTICE @@ -2,7 +2,7 @@ minifi-framework-nar Copyright 2014-2018 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). ****************** Apache Software License v2 @@ -16,7 +16,7 @@ The following binary components are provided under the Apache Software License v Copyright 2014-2018 The Apache Software Foundation This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). + The Apache Software Foundation (https://www.apache.org/). (ASLv2) Apache Commons IO The following NOTICE information applies: diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml index ff806671a..efa3c6702 100644 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml +++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 org.apache.nifi.minifi diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-nar-utils/pom.xml b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-nar-utils/pom.xml index a8e44861e..821c3f8d5 100644 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-nar-utils/pom.xml +++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-nar-utils/pom.xml @@ -15,7 +15,7 @@ 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. --> - + minifi-framework org.apache.nifi.minifi diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/NOTICE b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/NOTICE index 627722c18..41d0acc42 100644 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/NOTICE +++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/NOTICE @@ -2,7 +2,7 @@ minifi-resources Copyright 2014-2018 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). =========================================== Apache Software License v2 diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/pom.xml b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/pom.xml index 45f9d6eb2..713c8f2b1 100644 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/pom.xml +++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/pom.xml @@ -1,19 +1,21 @@ - + 4.0.0 org.apache.nifi.minifi diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/pom.xml b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/pom.xml index 9702a23f3..b91557bc4 100644 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/pom.xml +++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 org.apache.nifi.minifi diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/pom.xml b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/pom.xml index 8bf531554..13618401e 100644 --- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/pom.xml +++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi-framework-bundle diff --git a/minifi-nar-bundles/minifi-framework-bundle/pom.xml b/minifi-nar-bundles/minifi-framework-bundle/pom.xml index 0497cc4ee..27df2d7c8 100644 --- a/minifi-nar-bundles/minifi-framework-bundle/pom.xml +++ b/minifi-nar-bundles/minifi-framework-bundle/pom.xml @@ -15,7 +15,7 @@ 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. --> - + minifi-nar-bundles org.apache.nifi.minifi diff --git a/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-nar/pom.xml b/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-nar/pom.xml index 9db820961..36a905348 100644 --- a/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-nar/pom.xml +++ b/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-nar/pom.xml @@ -1,18 +1,21 @@ - - + 4.0.0 org.apache.nifi.minifi diff --git a/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-nar/src/main/resources/META-INF/NOTICE b/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-nar/src/main/resources/META-INF/NOTICE index 0b666b2ed..117fcf792 100644 --- a/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-nar/src/main/resources/META-INF/NOTICE +++ b/minifi-nar-bundles/minifi-provenance-reporting-bundle/minifi-provenance-reporting-nar/src/main/resources/META-INF/NOTICE @@ -2,7 +2,7 @@ minifi-provenance-reporting-nar Copyright 2014-2018 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). =========================================== Apache Software License v2 @@ -16,7 +16,7 @@ The following binary components are provided under the Apache Software License v Copyright 2014-2018 The Apache Software Foundation This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). + The Apache Software Foundation (https://www.apache.org/). ************************ Common Development and Distribution License 1.1 @@ -24,5 +24,5 @@ Common Development and Distribution License 1.1 The following binary components are provided under the Common Development and Distribution License 1.1. See project link for details. - (CDDL 1.1) (GPL2 w/ CPE) JSON Processing API (javax.json:javax.json-api:jar:1.0 - http://json-processing-spec.java.net) + (CDDL 1.1) (GPL2 w/ CPE) JSON Processing API (javax.json:javax.json-api:jar:1.0 - https://json-processing-spec.java.net) (CDDL 1.1) (GPL2 w/ CPE) JSON Processing Default Provider (org.glassfish:javax.json:jar:1.0.4 - https://jsonp.java.net) diff --git a/minifi-nar-bundles/minifi-provenance-reporting-bundle/pom.xml b/minifi-nar-bundles/minifi-provenance-reporting-bundle/pom.xml index 16a48e967..48d515541 100644 --- a/minifi-nar-bundles/minifi-provenance-reporting-bundle/pom.xml +++ b/minifi-nar-bundles/minifi-provenance-reporting-bundle/pom.xml @@ -1,19 +1,22 @@ - - - + 4.0.0 org.apache.nifi.minifi diff --git a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-persistent-provenance-repository/pom.xml b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-persistent-provenance-repository/pom.xml index 884db3b45..307e6366b 100644 --- a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-persistent-provenance-repository/pom.xml +++ b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-persistent-provenance-repository/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 org.apache.nifi.minifi diff --git a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/pom.xml b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/pom.xml index f3dd8a1bd..0936131b6 100644 --- a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/pom.xml +++ b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 org.apache.nifi.minifi diff --git a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/pom.xml b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/pom.xml index 6b4aaa6be..89c943fa1 100644 --- a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/pom.xml +++ b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi-provenance-repository-bundle diff --git a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/src/main/resources/META-INF/NOTICE b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/src/main/resources/META-INF/NOTICE index 060028785..e25c0fecf 100644 --- a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/src/main/resources/META-INF/NOTICE +++ b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/src/main/resources/META-INF/NOTICE @@ -2,7 +2,7 @@ minifi-provenance-repository-nar Copyright 2014-2018 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). =========================================== Apache Software License v2 @@ -16,4 +16,4 @@ The following binary components are provided under the Apache Software License v Copyright 2014-2018 The Apache Software Foundation This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). + The Apache Software Foundation (https://www.apache.org/). diff --git a/minifi-nar-bundles/minifi-provenance-repository-bundle/pom.xml b/minifi-nar-bundles/minifi-provenance-repository-bundle/pom.xml index 985ca860b..23086075c 100644 --- a/minifi-nar-bundles/minifi-provenance-repository-bundle/pom.xml +++ b/minifi-nar-bundles/minifi-provenance-repository-bundle/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 diff --git a/minifi-nar-bundles/minifi-ssl-context-service-nar/pom.xml b/minifi-nar-bundles/minifi-ssl-context-service-nar/pom.xml index 417bbfaa1..3cdd1e0a8 100644 --- a/minifi-nar-bundles/minifi-ssl-context-service-nar/pom.xml +++ b/minifi-nar-bundles/minifi-ssl-context-service-nar/pom.xml @@ -1,4 +1,4 @@ - + - + minifi-nar-bundles org.apache.nifi.minifi diff --git a/minifi-nar-bundles/minifi-standard-nar/src/main/resources/META-INF/LICENSE b/minifi-nar-bundles/minifi-standard-nar/src/main/resources/META-INF/LICENSE index 43fcd4761..0923b9037 100644 --- a/minifi-nar-bundles/minifi-standard-nar/src/main/resources/META-INF/LICENSE +++ b/minifi-nar-bundles/minifi-standard-nar/src/main/resources/META-INF/LICENSE @@ -268,7 +268,7 @@ This product bundles 'JCraft Jzlib' which is available under a 3-Clause BSD Lice EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. This product bundles 'asm' which is available under a 3-Clause BSD style license. -For details see http://asm.ow2.org/asmdex-license.html +For details see https://asm.ow2.org/asmdex-license.html Copyright (c) 2012 France Télécom All rights reserved. diff --git a/minifi-nar-bundles/minifi-standard-nar/src/main/resources/META-INF/NOTICE b/minifi-nar-bundles/minifi-standard-nar/src/main/resources/META-INF/NOTICE index 312a5042c..a95768049 100644 --- a/minifi-nar-bundles/minifi-standard-nar/src/main/resources/META-INF/NOTICE +++ b/minifi-nar-bundles/minifi-standard-nar/src/main/resources/META-INF/NOTICE @@ -7,7 +7,7 @@ The derived work is adapted from com.bazaarvoice.jolt.chainr.ChainrBuilder.java, This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). ****************** Apache Software License v2 @@ -21,7 +21,7 @@ The following binary components are provided under the Apache Software License v Copyright 2014-2018 The Apache Software Foundation This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). + The Apache Software Foundation (https://www.apache.org/). This product includes the following work from the Apache Hadoop project: @@ -46,12 +46,12 @@ The following binary components are provided under the Apache Software License v were derived from the LZMA SDK, version 9.20 (C/ and CPP/7zip/), which has been placed in the public domain: - "LZMA SDK is placed in the public domain." (http://www.7-zip.org/sdk.html) + "LZMA SDK is placed in the public domain." (https://www.7-zip.org/sdk.html) (ASLv2) Joda Time The following NOTICE information applies: This product includes software developed by - Joda.org (http://www.joda.org/). + Joda.org (https://www.joda.org/). (ASLv2) Apache ActiveMQ The following NOTICE information applies: @@ -75,7 +75,7 @@ The following binary components are provided under the Apache Software License v Written by Doug Lea with assistance from members of JCP JSR-166 Expert Group and released to the public domain, as explained at - http://creativecommons.org/publicdomain/zero/1.0/ + https://creativecommons.org/publicdomain/zero/1.0/ (ASLv2) JSON-SMART The following NOTICE information applies: @@ -97,7 +97,7 @@ The following binary components are provided under the Apache Software License v =============================================================================== 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 + from the original php source code available at https://stevemorse.org/phoneticinfo.htm with permission from the original authors. Original source copyright: Copyright (c) 2008 Alexander Beider & Stephen P. Morse. @@ -122,7 +122,7 @@ The following binary components are provided under the Apache Software License v Jackson core and extension components may licensed under different licenses. To find the details that apply to this artifact see the accompanying LICENSE file. For more information, including possible other licensing options, contact - FasterXML.com (http://fasterxml.com). + FasterXML.com (https://fasterxml.com). ## Credits @@ -138,15 +138,15 @@ The following binary components are provided under the Apache Software License v (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) + Snappy: https://code.google.com/p/snappy/ (New BSD License) This product includes software developed by Apache - PureJavaCrc32C from apache-hadoop-common http://hadoop.apache.org/ + PureJavaCrc32C from apache-hadoop-common https://hadoop.apache.org/ (Apache 2.0 license) This library containd statically linked libstdc++. This inclusion is allowed by "GCC RUntime Library Exception" - http://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html + https://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html (ASLv2) Jolt The following NOTICE information applies: @@ -164,8 +164,8 @@ The following binary components are provided under the Common Development and Di (CDDL 1.1) (GPL2 w/ CPE) jersey-core (com.sun.jersey:jersey-core:jar:1.19 - https://jersey.java.net/jersey-core/) (CDDL 1.1) (GPL2 w/ CPE) jersey-client (com.sun.jersey:jersey-client:jar:1.19 - https://jersey.java.net/jersey-client/) - (CDDL 1.1) (GPL2 w/ CPE) JavaMail API (compat) (javax.mail:mail:jar:1.4.7 - http://kenai.com/projects/javamail/mail) - (CDDL 1.1) (GPL2 w/ CPE) Javax JMS Api (javax.jms:javax.jms-api:jar:2.0.1 - http://java.net/projects/jms-spec/pages/Home) + (CDDL 1.1) (GPL2 w/ CPE) JavaMail API (compat) (javax.mail:mail:jar:1.4.7 - https://kenai.com/projects/javamail/mail) + (CDDL 1.1) (GPL2 w/ CPE) Javax JMS Api (javax.jms:javax.jms-api:jar:2.0.1 - https://java.net/projects/jms-spec/pages/Home) ***************** Common Development and Distribution License v1.0: @@ -173,7 +173,7 @@ Common Development and Distribution License v1.0: The following binary components are provided under the Common Development and Distribution License v1.0. See project link for details. - (CDDL 1.0) JavaBeans Activation Framework (JAF) (javax.activation:activation:jar:1.1 - http://java.sun.com/products/javabeans/jaf/index.jsp) + (CDDL 1.0) JavaBeans Activation Framework (JAF) (javax.activation:activation:jar:1.1 - https://java.sun.com/products/javabeans/jaf/index.jsp) (CDDL 1.0) JSR311 API (javax.ws.rs:jsr311-api:jar:1.1.1 - https://jsr311.dev.java.net) ***************** @@ -182,7 +182,7 @@ Mozilla Public License v2.0 The following binary components are provided under the Mozilla Public License v2.0. See project link for details. - (MPL 2.0) Saxon HE (net.sf.saxon:Saxon-HE:jar:9.6.0-5 - http://www.saxonica.com/) + (MPL 2.0) Saxon HE (net.sf.saxon:Saxon-HE:jar:9.6.0-5 - https://www.saxonica.com/) ***************** Public Domain @@ -190,7 +190,7 @@ Public Domain The following binary components are provided to the 'Public Domain'. See project link for details. - (Public Domain) XZ for Java (org.tukaani:xz:jar:1.5 - http://tukaani.org/xz/java.html + (Public Domain) XZ for Java (org.tukaani:xz:jar:1.5 - https://tukaani.org/xz/java.html diff --git a/minifi-nar-bundles/minifi-update-attribute-nar/pom.xml b/minifi-nar-bundles/minifi-update-attribute-nar/pom.xml index afba40272..b6e658cb4 100644 --- a/minifi-nar-bundles/minifi-update-attribute-nar/pom.xml +++ b/minifi-nar-bundles/minifi-update-attribute-nar/pom.xml @@ -15,7 +15,7 @@ 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. --> - + minifi-nar-bundles org.apache.nifi.minifi diff --git a/minifi-nar-bundles/minifi-update-attribute-nar/src/main/resources/META-INF/NOTICE b/minifi-nar-bundles/minifi-update-attribute-nar/src/main/resources/META-INF/NOTICE index 5afd780c4..6d36e383f 100644 --- a/minifi-nar-bundles/minifi-update-attribute-nar/src/main/resources/META-INF/NOTICE +++ b/minifi-nar-bundles/minifi-update-attribute-nar/src/main/resources/META-INF/NOTICE @@ -2,7 +2,7 @@ minifi-update-attribute-nar Copyright 2014-2018 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). =========================================== Apache Software License v2 @@ -16,7 +16,7 @@ The following binary components are provided under the Apache Software License v Copyright 2014-2018 The Apache Software Foundation This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). + The Apache Software Foundation (https://www.apache.org/). (ASLv2) Apache Commons Lang The following NOTICE information applies: diff --git a/minifi-nar-bundles/pom.xml b/minifi-nar-bundles/pom.xml index 62c433a02..8a9453d2d 100644 --- a/minifi-nar-bundles/pom.xml +++ b/minifi-nar-bundles/pom.xml @@ -1,18 +1,21 @@ +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. +--> + 4.0.0 diff --git a/minifi-toolkit/minifi-toolkit-assembly/LICENSE b/minifi-toolkit/minifi-toolkit-assembly/LICENSE index a4b4e878b..9326a8449 100644 --- a/minifi-toolkit/minifi-toolkit-assembly/LICENSE +++ b/minifi-toolkit/minifi-toolkit-assembly/LICENSE @@ -210,7 +210,7 @@ subcomponents is subject to the terms and conditions of the following licenses. The binary distribution of this product bundles 'Slf4j' which is available -under a "3-clause BSD" license. For details see http://www.slf4j.org/ +under a "3-clause BSD" license. For details see https://www.slf4j.org/ Copyright (c) 2004-2013 QOS.ch All rights reserved. @@ -235,7 +235,7 @@ under a "3-clause BSD" license. For details see http://www.slf4j.org/ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. The binary distribution of this product bundles 'Antlr 3' which is available -under a "3-clause BSD" license. For details see http://www.antlr3.org/license.html +under a "3-clause BSD" license. For details see https://www.antlr3.org/license.html Copyright (c) 2010 Terence Parr All rights reserved. @@ -264,7 +264,7 @@ under a "3-clause BSD" license. For details see http://www.antlr3.org/license.h THE POSSIBILITY OF SUCH DAMAGE. This product bundles 'asm' which is available under a 3-Clause BSD style license. -For details see http://asm.ow2.org/asmdex-license.html +For details see https://asm.ow2.org/asmdex-license.html Copyright (c) 2012 France Télécom All rights reserved. diff --git a/minifi-toolkit/minifi-toolkit-assembly/NOTICE b/minifi-toolkit/minifi-toolkit-assembly/NOTICE index 2621631d0..c876a12de 100644 --- a/minifi-toolkit/minifi-toolkit-assembly/NOTICE +++ b/minifi-toolkit/minifi-toolkit-assembly/NOTICE @@ -2,7 +2,7 @@ Apache NiFi Copyright 2014-2018 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). =========================================== Apache Software License v2 @@ -16,7 +16,7 @@ The following binary components are provided under the Apache Software License v Copyright 2014-2018 The Apache Software Foundation This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). + The Apache Software Foundation (https://www.apache.org/). This product includes the following work from the Apache Hadoop project: @@ -24,7 +24,7 @@ The following binary components are provided under the Apache Software License v This includes derived works from the Apache Software License V2 library python-evtx (https://github.com/williballenthin/python-evtx) Copyright 2012, 2013 Willi Ballenthin william.ballenthin@mandiant.com - while at Mandiant http://www.mandiant.com + while at Mandiant https://www.mandiant.com The derived work is adapted from Evtx/Evtx.py, Evtx/BinaryParser.py, Evtx/Nodes.py, Evtx/Views.py and can be found in the org.apache.nifi.processors.evtx.parser package. @@ -62,7 +62,7 @@ The following binary components are provided under the Apache Software License v =============================================================================== 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 + from the original php source code available at https://stevemorse.org/phoneticinfo.htm with permission from the original authors. Original source copyright: Copyright (c) 2008 Alexander Beider & Stephen P. Morse. @@ -90,7 +90,7 @@ The following binary components are provided under the Apache Software License v Jackson core and extension components may licensed under different licenses. To find the details that apply to this artifact see the accompanying LICENSE file. For more information, including possible other licensing options, contact - FasterXML.com (http://fasterxml.com). + FasterXML.com (https://fasterxml.com). ## Credits @@ -119,7 +119,7 @@ The following binary components are provided under the Apache Software License v Copyright 1999-2013 The Apache Software Foundation This project contains annotations derived from JCIP-ANNOTATIONS - Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net + Copyright (c) 2005 Brian Goetz and Tim Peierls. See https://www.jcip.net (ASLv2) Apache Commons Logging The following NOTICE information applies: @@ -155,22 +155,18 @@ The following binary components are provided under the Apache Software License v The name Software AG and all Software AG product names are either trademarks or registered trademarks of Software AG and/or Software AG USA Inc. and/or its subsidiaries and/or its affiliates and/or their licensors. Other company and product names mentioned herein may be trademarks of their respective owners. - Detailed information on trademarks and patents owned by Software AG and/or its subsidiaries is located at http://softwareag.com/licenses. + Detailed information on trademarks and patents owned by Software AG and/or its subsidiaries is located at https://softwareag.com/licenses. Third Party declaration This software may include portions of third-party products. For third-party copyright notices, license terms, additional rights or restrictions, please refer to "License Texts, Copyright Notices and Disclaimers of Third Party Products". For certain specific third-party license restrictions, please refer to section E of the Legal Notices available under "License Terms and Conditions for Use of Software AG Products / Copyright and Trademark Notices of Software AG Products". These documents are part of the product documentation, located at - http://softwareag.com/licenses and/or in the root installation directory of the licensed product(s). + https://softwareag.com/licenses and/or in the root installation directory of the licensed product(s). Confidentiality Disclaimer: Use, reproduction, transfer, publication or disclosure is prohibited except as specifically provided for in your License Agreement with Software AG. Contact GitHub API Training Shop Blog About - (ASLv2) Jasypt - The following NOTICE information applies: - Copyright (c) 2007-2010, The JASYPT team (http://www.jasypt.org) - (ASLv2) Apache Commons IO The following NOTICE information applies: Apache Commons IO @@ -208,9 +204,9 @@ Common Development and Distribution License 1.1 The following binary components are provided under the Common Development and Distribution License 1.1. See project link for details. - (CDDL 1.1) (GPL2 w/ CPE) JavaMail API (compat) (javax.mail:mail:jar:1.4.7 - http://kenai.com/projects/javamail/mail) + (CDDL 1.1) (GPL2 w/ CPE) JavaMail API (compat) (javax.mail:mail:jar:1.4.7 - https://kenai.com/projects/javamail/mail) (CDDL 1.1) (GPL2 w/ CPE) jersey-json (com.sun.jersey:jersey-json:jar:1.19 - https://jersey.java.net/jersey-json/) - (CDDL 1.1) (GPL2 w/ CPE) Old JAXB Runtime (com.sun.xml.bind:jaxb-impl:jar:2.2.3-1 - http://jaxb.java.net/) + (CDDL 1.1) (GPL2 w/ CPE) Old JAXB Runtime (com.sun.xml.bind:jaxb-impl:jar:2.2.3-1 - https://jaxb.java.net/) (CDDL 1.1) (GPL2 w/ CPE) Java Architecture For XML Binding (javax.xml.bind:jaxb-api:jar:2.2.2 - https://jaxb.dev.java.net/) (CDDL 1.1) (GPL2 w/ CPE) aopalliance version 1.0 repackaged as a module (org.glassfish.hk2.external:aopalliance-repackaged:jar:2.4.0-b25 - https://hk2.java.net/external/aopalliance-repackaged) (CDDL 1.1) (GPL2 w/ CPE) jersey-client (com.sun.jersey:jersey-client:jar:1.19 - https://jersey.java.net/jersey-client/) @@ -223,7 +219,7 @@ Common Development and Distribution License 1.0 The following binary components are provided under the Common Development and Distribution License 1.0. See project link for details. - (CDDL 1.0) JavaBeans Activation Framework (JAF) (javax.activation:activation:jar:1.1 - http://java.sun.com/products/javabeans/jaf/index.jsp) + (CDDL 1.0) JavaBeans Activation Framework (JAF) (javax.activation:activation:jar:1.1 - https://java.sun.com/products/javabeans/jaf/index.jsp) (CDDL 1.0) (GPL3) Streaming API For XML (javax.xml.stream:stax-api:jar:1.0-2 - no url provided) (CDDL 1.0) JSR311 API (javax.ws.rs:jsr311-api:jar:1.1.1 - https://jsr311.dev.java.net) @@ -234,7 +230,7 @@ Eclipse Public License 1.0 The following binary components are provided under the Eclipse Public License 1.0. See project link for details. - (EPL 1.0) AspectJ Weaver (org.aspectj:aspectjweaver:jar:1.8.5 - http://www.eclipse.org/aspectj/) - (EPL 1.0)(LGPL 2.1) Logback Classic (ch.qos.logback:logback-classic:jar:1.1.3 - http://logback.qos.ch/) - (EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.1.3 - http://logback.qos.ch/) - (EPL 1.0)(MPL 2.0) H2 Database (com.h2database:h2:jar:1.3.176 - http://www.h2database.com/html/license.html) + (EPL 1.0) AspectJ Weaver (org.aspectj:aspectjweaver:jar:1.8.5 - https://www.eclipse.org/aspectj/) + (EPL 1.0)(LGPL 2.1) Logback Classic (ch.qos.logback:logback-classic:jar:1.1.3 - https://logback.qos.ch/) + (EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.1.3 - https://logback.qos.ch/) + (EPL 1.0)(MPL 2.0) H2 Database (com.h2database:h2:jar:1.3.176 - https://www.h2database.com/html/license.html) diff --git a/minifi-toolkit/minifi-toolkit-assembly/README.md b/minifi-toolkit/minifi-toolkit-assembly/README.md index d50959fbe..fb8bfc4e1 100644 --- a/minifi-toolkit/minifi-toolkit-assembly/README.md +++ b/minifi-toolkit/minifi-toolkit-assembly/README.md @@ -86,7 +86,7 @@ currently reside may have restrictions on the import, possession, use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check your country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption -software, to see if this is permitted. See for more +software, to see if this is permitted. See for more information. The U.S. Government Department of Commerce, Bureau of Industry and Security @@ -100,11 +100,10 @@ source code. The following provides more details on the included cryptographic software: -Apache NiFi - MiNiFi uses BouncyCastle, Jasypt, JCraft Inc., and the built-in +Apache NiFi - MiNiFi uses BouncyCastle, JCraft Inc., and the built-in java cryptography libraries for SSL, SSH, and the protection of sensitive configuration parameters. See https://bouncycastle.org/about.html -http://www.jasypt.org/faq.html -http://jcraft.com/c-info.html +https://jcraft.com/c-info.html https://www.oracle.com/us/products/export/export-regulations-345813.html for more details on each of these libraries cryptography features. diff --git a/minifi-toolkit/minifi-toolkit-assembly/pom.xml b/minifi-toolkit/minifi-toolkit-assembly/pom.xml index f2b326a78..c4bc0e1b9 100644 --- a/minifi-toolkit/minifi-toolkit-assembly/pom.xml +++ b/minifi-toolkit/minifi-toolkit-assembly/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi-toolkit diff --git a/minifi-toolkit/minifi-toolkit-configuration/pom.xml b/minifi-toolkit/minifi-toolkit-configuration/pom.xml index 5fc9245e2..09e849db6 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/pom.xml +++ b/minifi-toolkit/minifi-toolkit-configuration/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi-toolkit diff --git a/minifi-toolkit/pom.xml b/minifi-toolkit/pom.xml index f137cf6bf..ae28c4eac 100644 --- a/minifi-toolkit/pom.xml +++ b/minifi-toolkit/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 minifi diff --git a/pom.xml b/pom.xml index c48e6da31..a6b769eb9 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 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. --> - + 4.0.0 org.apache @@ -43,15 +43,15 @@ limitations under the License. minifi-integration-tests - http://nifi.apache.org/minifi + https://nifi.apache.org/minifi Apache NiFi Project - http://nifi.apache.org/ + https://nifi.apache.org/ Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 @@ -60,21 +60,21 @@ limitations under the License. dev-subscribe@nifi.apache.org dev-unsubscribe@nifi.apache.org dev@nifi.apache.org - http://mail-archives.apache.org/mod_mbox/nifi-dev + https://mail-archives.apache.org/mod_mbox/nifi-dev Users users-subscribe@nifi.apache.org users-unsubscribe@nifi.apache.org users@nifi.apache.org - http://mail-archives.apache.org/mod_mbox/nifi-users + https://mail-archives.apache.org/mod_mbox/nifi-users Commits commits-subscribe@nifi.apache.org commits-unsubscribe@nifi.apache.org commits@nifi.apache.org - http://mail-archives.apache.org/mod_mbox/nifi-commits + https://mail-archives.apache.org/mod_mbox/nifi-commits @@ -82,8 +82,8 @@ limitations under the License. scm:git:git://git.apache.org/nifi-minifi.git - scm:git:https://git-wip-us.apache.org/repos/asf/nifi-minifi.git - https://git-wip-us.apache.org/repos/asf?p=nifi-minifi.git + scm:git:https://gitbox.apache.org/repos/asf/nifi-minifi.git + https://gitbox.apache.org/repos/asf?p=nifi-minifi.git HEAD @@ -1076,11 +1076,6 @@ limitations under the License. h2 1.3.176 - - org.jasypt - jasypt - 1.9.2 - org.codehaus.jackson jackson-mapper-asl @@ -1319,7 +1314,7 @@ limitations under the License. - +