NIFI-3709: Added XMLENC to L&N file. Moved inclusion of nifi-atlas-nar to a profile named include-atlas. This closes #2335.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/9750cf2f Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/9750cf2f Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/9750cf2f Branch: refs/heads/master Commit: 9750cf2fcda0209e897e98e632f7e42f3f17e3d9 Parents: fc73c60 Author: Mark Payne <[email protected]> Authored: Mon Dec 18 09:28:50 2017 -0500 Committer: Mark Payne <[email protected]> Committed: Mon Dec 18 12:24:09 2017 -0500 ---------------------------------------------------------------------- nifi-assembly/pom.xml | 24 +++++++++----- .../src/main/resources/META-INF/LICENSE | 33 +++++++++++++++++++- 2 files changed, 48 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/9750cf2f/nifi-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml index 17b79cf..ba66d75 100755 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -544,19 +544,11 @@ language governing permissions and limitations under the License. --> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-livy-controller-service-api-nar</artifactId> - <version>1.5.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-livy-nar</artifactId> - <version>1.5.0-SNAPSHOT</version> - <type>nar</type> - </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-atlas-nar</artifactId> - <version>1.5.0-SNAPSHOT</version> <type>nar</type> </dependency> </dependencies> @@ -578,6 +570,22 @@ language governing permissions and limitations under the License. --> </dependencies> </profile> <profile> + <id>include-atlas</id> + <!-- This profile handles the inclusion of atlas artifacts. The NAR + is quite large and makes the resultant binary distribution significantly + larger (60+ MB). --> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-atlas-nar</artifactId> + <type>nar</type> + </dependency> + </dependencies> + </profile> + <profile> <id>rpm</id> <activation> <activeByDefault>false</activeByDefault> http://git-wip-us.apache.org/repos/asf/nifi/blob/9750cf2f/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-nar/src/main/resources/META-INF/LICENSE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-nar/src/main/resources/META-INF/LICENSE b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-nar/src/main/resources/META-INF/LICENSE index 36cb3e9..5955406 100644 --- a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-nar/src/main/resources/META-INF/LICENSE +++ b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-nar/src/main/resources/META-INF/LICENSE @@ -361,4 +361,35 @@ licenses. INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file + THE POSSIBILITY OF SUCH DAMAGE. + + The binary distribution of this product bundles 'XMLENC' which is available + under a BSD license. More details found here: http://xmlenc.sourceforge.net. + + Copyright 2003-2005, Ernst de Haan <[email protected]> + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + 3. Neither the name of the copyright holder nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file
