From c96b37d8222945d516ba2e5eccff50655876fb9c Mon Sep 17 00:00:00 2001 From: Matt Burgess Date: Tue, 29 Oct 2024 18:04:07 -0400 Subject: [PATCH] NIFI-13944: Corrected L&N and banned dependency --- .../src/main/resources/META-INF/NOTICE | 65 ------------------ .../src/main/resources/META-INF/NOTICE | 66 +++++++++++++++++++ pom.xml | 2 +- 3 files changed, 67 insertions(+), 66 deletions(-) diff --git a/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-nar/src/main/resources/META-INF/NOTICE b/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-nar/src/main/resources/META-INF/NOTICE index 4eec0f35433e..784647484118 100644 --- a/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-nar/src/main/resources/META-INF/NOTICE @@ -13,72 +13,7 @@ Apache Software License v2 Apache Commons Pool Copyright 1999-2009 The Apache Software Foundation. - (ASLv2) Open JSON - The following NOTICE information applies: - Android JSON library - Copyright (C) 2010 The Android Open Source Project - - This product includes software developed by - The Android Open Source Project - (ASLv2) Spring Framework The following NOTICE information applies: Spring Framework 5 Copyright (c) 2002-2021 Pivotal, Inc. - - (ASLv2) Micrometer - The following NOTICE information applies: - Micrometer - - Copyright (c) 2017-Present VMware, Inc. All Rights Reserved. - - Licensed 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 - - https://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. - - ------------------------------------------------------------------------------- - - This product contains a modified portion of 'io.netty.util.internal.logging', - in the Netty/Common library distributed by The Netty Project: - - * Copyright 2013 The Netty Project - * License: Apache License v2.0 - * Homepage: https://netty.io - - This product contains a modified portion of 'StringUtils.isBlank()', - in the Commons Lang library distributed by The Apache Software Foundation: - - * Copyright 2001-2019 The Apache Software Foundation - * License: Apache License v2.0 - * Homepage: https://commons.apache.org/proper/commons-lang/ - - This product contains a modified portion of 'JsonUtf8Writer', - in the Moshi library distributed by Square, Inc: - - * Copyright 2010 Google Inc. - * License: Apache License v2.0 - * Homepage: https://github.com/square/moshi - - This product contains a modified portion of the 'org.springframework.lang' - package in the Spring Framework library, distributed by VMware, Inc: - - * Copyright 2002-2019 the original author or authors. - * License: Apache License v2.0 - * Homepage: https://spring.io/projects/spring-framework - -************************ -Eclipse Distribution License 1.0 -************************ - -The following binary components are provided under the Eclipse Distribution License 1.0. - - (EDL 1.0) Jakarta Activation API (jakarta.activation:jakarta.activation-api:jar:1.2.2) - (EDL 1.0) Jakarta XML Binding API (jakarta.xml.bind:jakarta.xml.bind-api:jar:2.3.3) diff --git a/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-service-api-nar/src/main/resources/META-INF/NOTICE b/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-service-api-nar/src/main/resources/META-INF/NOTICE index cf003248dfb3..87b9ff69cb40 100644 --- a/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-service-api-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-service-api-nar/src/main/resources/META-INF/NOTICE @@ -20,6 +20,62 @@ The following binary components are provided under the Apache Software License v Spring Framework 5 Copyright (c) 2002-2021 Pivotal, Inc. + (ASLv2) Micrometer + The following NOTICE information applies: + Micrometer + + Copyright (c) 2017-Present VMware, Inc. All Rights Reserved. + + Licensed 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 + + https://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. + + ------------------------------------------------------------------------------- + + This product contains a modified portion of 'io.netty.util.internal.logging', + in the Netty/Common library distributed by The Netty Project: + + * Copyright 2013 The Netty Project + * License: Apache License v2.0 + * Homepage: https://netty.io + + This product contains a modified portion of 'StringUtils.isBlank()', + in the Commons Lang library distributed by The Apache Software Foundation: + + * Copyright 2001-2019 The Apache Software Foundation + * License: Apache License v2.0 + * Homepage: https://commons.apache.org/proper/commons-lang/ + + This product contains a modified portion of 'JsonUtf8Writer', + in the Moshi library distributed by Square, Inc: + + * Copyright 2010 Google Inc. + * License: Apache License v2.0 + * Homepage: https://github.com/square/moshi + + This product contains a modified portion of the 'org.springframework.lang' + package in the Spring Framework library, distributed by VMware, Inc: + + * Copyright 2002-2019 the original author or authors. + * License: Apache License v2.0 + * Homepage: https://spring.io/projects/spring-framework + + + (ASLv2) Open JSON + The following NOTICE information applies: + Android JSON library + Copyright (C) 2010 The Android Open Source Project + + This product includes software developed by + The Android Open Source Project ************************ The MIT License @@ -29,3 +85,13 @@ The following binary components are provided under the MIT License. See project (MIT License) Jedis (redis.clients:jedis:2.9.0 - https://github.com/xetorthio/jedis) +************************ +Eclipse Distribution License 1.0 +************************ + +The following binary components are provided under the Eclipse Distribution License 1.0. + + (EDL 1.0) Jakarta Activation API (jakarta.activation:jakarta.activation-api:jar:1.2.2) + (EDL 1.0) Jakarta XML Binding API (jakarta.xml.bind:jakarta.xml.bind-api:jar:2.3.3) + + diff --git a/pom.xml b/pom.xml index 9a099f4b09d7..3b012184bc99 100644 --- a/pom.xml +++ b/pom.xml @@ -853,7 +853,7 @@ org.testng:testng - org.json:json:[,20240303]:compile + org.json:json:(,20240303):compile c3p0:c3p0:*:*:compile com.google.code.findbugs:jsr305:[,3.0.0]:compile