Skip to content

Commit 41edb12

Browse files
mattyb149mattyb149
authored
NIFI-13944 Upgraded Jedis from 3.10.0 to 5.2.0 (#9465)
- Updated License and Notice files in Redis NARs to reflect current dependencies and versions Signed-off-by: David Handermann <[email protected]>
1 parent 047f52a commit 41edb12

File tree

7 files changed

+311
-35
lines changed

7 files changed

+311
-35
lines changed

‎nifi-assembly/NOTICE‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2560,6 +2560,7 @@ The following binary components are provided to the 'Public Domain'. See projec
25602560

25612561
(Public Domain) XZ for Java (org.tukaani:xz:jar:1.5 - http://tukaani.org/xz/java.html
25622562
(Public Domain) AOP Alliance 1.0 (http://aopalliance.sourceforge.net/)
2563+
(Public Domain) JSON (org.json:json:jar:20240303)
25632564

25642565
The following binary components are provided under the Creative Commons Zero license version 1.0. See project link for details.
25652566

‎nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@
5353
<version>${spring.data.redis.version}</version>
5454
<scope>provided</scope>
5555
</dependency>
56-
<dependency>
57-
<groupId>org.springframework</groupId>
58-
<artifactId>spring-beans</artifactId>
59-
</dependency>
6056
<dependency>
6157
<groupId>redis.clients</groupId>
6258
<artifactId>jedis</artifactId>

‎nifi-extension-bundles/nifi-redis-bundle/nifi-redis-nar/src/main/resources/META-INF/LICENSE‎

Lines changed: 238 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,238 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.
203+
204+
APACHE NIFI SUBCOMPONENTS:
205+
206+
The Apache NiFi project contains subcomponents with separate copyright
207+
notices and license terms. Your use of the source code for the these
208+
subcomponents is subject to the terms and conditions of the following
209+
licenses.
210+
211+
The binary distribution of this product bundles 'Antlr 3' which is available
212+
under a "3-clause BSD" license. For details see http://www.antlr3.org/license.html
213+
214+
Copyright (c) 2013 Terence Parr
215+
All rights reserved.
216+
217+
Redistribution and use in source and binary forms, with or without
218+
modification, are permitted provided that the following conditions are met:
219+
220+
Redistributions of source code must retain the above copyright notice, this
221+
list of conditions and the following disclaimer.
222+
Redistributions in binary form must reproduce the above copyright notice,
223+
this list of conditions and the following disclaimer in the documentation
224+
and/or other materials provided with the distribution.
225+
Neither the name of the author nor the names of its contributors may be used
226+
to endorse or promote products derived from this software without specific
227+
prior written permission.
228+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
229+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
230+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
231+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
232+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
233+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
234+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
235+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
236+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
237+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
238+
THE POSSIBILITY OF SUCH DAMAGE.

‎nifi-extension-bundles/nifi-redis-bundle/nifi-redis-nar/src/main/resources/META-INF/NOTICE‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,3 @@ Copyright 2014-2024 The Apache Software Foundation
44
This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).
66

7-
******************
8-
Apache Software License v2
9-
******************
10-
11-
(ASLv2) Jackson JSON processor
12-
The following NOTICE information applies:
13-
# Jackson JSON processor
14-
15-
Jackson is a high-performance, Free/Open Source JSON processing library.
16-
It was originally written by Tatu Saloranta ([email protected]), and has
17-
been in development since 2007.
18-
It is currently developed by a community of developers, as well as supported
19-
commercially by FasterXML.com.
20-
21-
## Licensing
22-
23-
Jackson core and extension components may licensed under different licenses.
24-
To find the details that apply to this artifact see the accompanying LICENSE file.
25-
For more information, including possible other licensing options, contact
26-
FasterXML.com (http://fasterxml.com).
27-
28-
## Credits
29-
30-
A list of contributors may be found from CREDITS file, which is included
31-
in some artifacts (usually source distributions); but is always available
32-
from the source code management (SCM) system project uses.

‎nifi-extension-bundles/nifi-redis-bundle/nifi-redis-service-api-nar/src/main/resources/META-INF/NOTICE‎

Lines changed: 69 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,84 @@ The following binary components are provided under the Apache Software License v
1515
Apache Commons Pool
1616
Copyright 1999-2009 The Apache Software Foundation.
1717

18+
(ASLv2) Google GSON
19+
The following NOTICE information applies:
20+
Copyright 2008 Google Inc.
21+
1822
(ASLv2) Spring Framework
1923
The following NOTICE information applies:
20-
Spring Framework 5
24+
Spring Framework 6
2125
Copyright (c) 2002-2021 Pivotal, Inc.
2226

27+
(ASLv2) Micrometer
28+
The following NOTICE information applies:
29+
Micrometer
30+
31+
Copyright (c) 2017-Present VMware, Inc. All Rights Reserved.
32+
33+
Licensed under the Apache License, Version 2.0 (the "License");
34+
you may not use this file except in compliance with the License.
35+
You may obtain a copy of the License at
36+
37+
https://www.apache.org/licenses/LICENSE-2.0
38+
39+
Unless required by applicable law or agreed to in writing, software
40+
distributed under the License is distributed on an "AS IS" BASIS,
41+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
42+
See the License for the specific language governing permissions and
43+
limitations under the License.
44+
45+
-------------------------------------------------------------------------------
46+
47+
This product contains a modified portion of 'io.netty.util.internal.logging',
48+
in the Netty/Common library distributed by The Netty Project:
49+
50+
* Copyright 2013 The Netty Project
51+
* License: Apache License v2.0
52+
* Homepage: https://netty.io
53+
54+
This product contains a modified portion of 'StringUtils.isBlank()',
55+
in the Commons Lang library distributed by The Apache Software Foundation:
56+
57+
* Copyright 2001-2019 The Apache Software Foundation
58+
* License: Apache License v2.0
59+
* Homepage: https://commons.apache.org/proper/commons-lang/
60+
61+
This product contains a modified portion of 'JsonUtf8Writer',
62+
in the Moshi library distributed by Square, Inc:
63+
64+
* Copyright 2010 Google Inc.
65+
* License: Apache License v2.0
66+
* Homepage: https://github.com/square/moshi
67+
68+
This product contains a modified portion of the 'org.springframework.lang'
69+
package in the Spring Framework library, distributed by VMware, Inc:
70+
71+
* Copyright 2002-2019 the original author or authors.
72+
* License: Apache License v2.0
73+
* Homepage: https://spring.io/projects/spring-framework
2374

2475
************************
2576
The MIT License
2677
************************
2778

2879
The following binary components are provided under the MIT License. See project link for details.
2980

30-
(MIT License) Jedis (redis.clients:jedis:2.9.0 - https://github.com/xetorthio/jedis)
81+
(MIT License) Jedis (redis.clients:jedis:5.2.0 - https://github.com/redis/jedis)
82+
83+
************************
84+
Eclipse Distribution License 1.0
85+
************************
86+
87+
The following binary components are provided under the Eclipse Distribution License 1.0.
88+
89+
(EDL 1.0) Jakarta Activation API (jakarta.activation:jakarta.activation-api:jar:2.1.3)
90+
(EDL 1.0) Jakarta XML Binding API (jakarta.xml.bind:jakarta.xml.bind-api:jar:4.0.2)
91+
92+
*****************
93+
Public Domain
94+
*****************
95+
96+
The following binary components are provided to the 'Public Domain'.
3197

98+
(Public Domain) JSON (org.json:json:jar:20240303)

‎nifi-extension-bundles/nifi-redis-bundle/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<packaging>pom</packaging>
2626

2727
<properties>
28-
<spring.data.redis.version>2.7.18</spring.data.redis.version>
29-
<jedis.version>3.10.0</jedis.version>
28+
<spring.data.redis.version>3.3.5</spring.data.redis.version>
29+
<jedis.version>5.2.0</jedis.version>
3030
</properties>
3131

3232
<modules>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@
853853
<!-- JUnit 5 is the preferred test framework -->
854854
<exclude>org.testng:testng</exclude>
855855
<!-- Cat-X Deps -->
856-
<exclude>org.json:json:*:*:compile</exclude>
856+
<exclude>org.json:json:(,20240303):compile</exclude>
857857
<exclude>c3p0:c3p0:*:*:compile</exclude>
858858
<!-- FindBugs Annotations is LGPL-2 -->
859859
<exclude>com.google.code.findbugs:annotations:*</exclude>

0 commit comments

Comments
 (0)