You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by kr...@apache.org on 2023/03/01 14:40:19 UTC
[solr] branch branch_9x updated (0727d9381ec -> 6598a97b2cf)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a change to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
from 0727d9381ec Update dependency com.fasterxml.woodstox:woodstox-core to v6.5.0 (#1398)
new df474328dc0 Update org.apache.zookeeper:* to v3.8.1 (#1395)
new 6598a97b2cf Cleanup unreferenced solr/licenses/netty-tcnative-* files
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
solr/licenses/netty-tcnative-2.0.48.Final.jar.sha1 | 1 -
solr/licenses/netty-tcnative-LICENSE-ASL.txt | 201 ---------------------
solr/licenses/netty-tcnative-NOTICE.txt | 51 ------
.../netty-tcnative-classes-2.0.48.Final.jar.sha1 | 1 -
solr/licenses/zookeeper-3.8.0-tests.jar.sha1 | 1 -
solr/licenses/zookeeper-3.8.0.jar.sha1 | 1 -
solr/licenses/zookeeper-3.8.1-tests.jar.sha1 | 1 +
solr/licenses/zookeeper-3.8.1.jar.sha1 | 1 +
solr/licenses/zookeeper-jute-3.8.0.jar.sha1 | 1 -
solr/licenses/zookeeper-jute-3.8.1.jar.sha1 | 1 +
versions.lock | 10 +-
versions.props | 2 +-
12 files changed, 8 insertions(+), 264 deletions(-)
delete mode 100644 solr/licenses/netty-tcnative-2.0.48.Final.jar.sha1
delete mode 100644 solr/licenses/netty-tcnative-LICENSE-ASL.txt
delete mode 100644 solr/licenses/netty-tcnative-NOTICE.txt
delete mode 100644 solr/licenses/netty-tcnative-classes-2.0.48.Final.jar.sha1
delete mode 100644 solr/licenses/zookeeper-3.8.0-tests.jar.sha1
delete mode 100644 solr/licenses/zookeeper-3.8.0.jar.sha1
create mode 100644 solr/licenses/zookeeper-3.8.1-tests.jar.sha1
create mode 100644 solr/licenses/zookeeper-3.8.1.jar.sha1
delete mode 100644 solr/licenses/zookeeper-jute-3.8.0.jar.sha1
create mode 100644 solr/licenses/zookeeper-jute-3.8.1.jar.sha1
[solr] 01/02: Update org.apache.zookeeper:* to v3.8.1 (#1395)
Posted by kr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit df474328dc0948d6833941b15855e991f63e6779
Author: Solr Bot <12...@users.noreply.github.com>
AuthorDate: Wed Mar 1 15:33:06 2023 +0100
Update org.apache.zookeeper:* to v3.8.1 (#1395)
---
solr/licenses/netty-tcnative-2.0.48.Final.jar.sha1 | 1 -
solr/licenses/netty-tcnative-classes-2.0.48.Final.jar.sha1 | 1 -
solr/licenses/zookeeper-3.8.0-tests.jar.sha1 | 1 -
solr/licenses/zookeeper-3.8.0.jar.sha1 | 1 -
solr/licenses/zookeeper-3.8.1-tests.jar.sha1 | 1 +
solr/licenses/zookeeper-3.8.1.jar.sha1 | 1 +
solr/licenses/zookeeper-jute-3.8.0.jar.sha1 | 1 -
solr/licenses/zookeeper-jute-3.8.1.jar.sha1 | 1 +
versions.lock | 10 ++++------
versions.props | 2 +-
10 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/solr/licenses/netty-tcnative-2.0.48.Final.jar.sha1 b/solr/licenses/netty-tcnative-2.0.48.Final.jar.sha1
deleted file mode 100644
index 0144fc9d3b1..00000000000
--- a/solr/licenses/netty-tcnative-2.0.48.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-83fb2aa2c4e1e5998aa67084581772ccc2f0156e
diff --git a/solr/licenses/netty-tcnative-classes-2.0.48.Final.jar.sha1 b/solr/licenses/netty-tcnative-classes-2.0.48.Final.jar.sha1
deleted file mode 100644
index a489458e8b3..00000000000
--- a/solr/licenses/netty-tcnative-classes-2.0.48.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9f62346df2f103045cad6f9416e2925a32ee8709
diff --git a/solr/licenses/zookeeper-3.8.0-tests.jar.sha1 b/solr/licenses/zookeeper-3.8.0-tests.jar.sha1
deleted file mode 100644
index 4e39b40f3b9..00000000000
--- a/solr/licenses/zookeeper-3.8.0-tests.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9b78a289a3aa34eb47fac8c432f664fc140387df
diff --git a/solr/licenses/zookeeper-3.8.0.jar.sha1 b/solr/licenses/zookeeper-3.8.0.jar.sha1
deleted file mode 100644
index 543d84714c7..00000000000
--- a/solr/licenses/zookeeper-3.8.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e395c1d8a71557b7569cc6a83487b2e30e2e58fe
diff --git a/solr/licenses/zookeeper-3.8.1-tests.jar.sha1 b/solr/licenses/zookeeper-3.8.1-tests.jar.sha1
new file mode 100644
index 00000000000..9f92a4f13fb
--- /dev/null
+++ b/solr/licenses/zookeeper-3.8.1-tests.jar.sha1
@@ -0,0 +1 @@
+15d43384e216f03166439f06584c78d35355a10c
diff --git a/solr/licenses/zookeeper-3.8.1.jar.sha1 b/solr/licenses/zookeeper-3.8.1.jar.sha1
new file mode 100644
index 00000000000..02c7bc328f6
--- /dev/null
+++ b/solr/licenses/zookeeper-3.8.1.jar.sha1
@@ -0,0 +1 @@
+edb7d70db4390b9f54a92994577a9e344ade5c9d
diff --git a/solr/licenses/zookeeper-jute-3.8.0.jar.sha1 b/solr/licenses/zookeeper-jute-3.8.0.jar.sha1
deleted file mode 100644
index 9b2e89a2aa1..00000000000
--- a/solr/licenses/zookeeper-jute-3.8.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6560f966bcf1aa78d27bcfa75fb6c4463a72c6c5
diff --git a/solr/licenses/zookeeper-jute-3.8.1.jar.sha1 b/solr/licenses/zookeeper-jute-3.8.1.jar.sha1
new file mode 100644
index 00000000000..087f7233f08
--- /dev/null
+++ b/solr/licenses/zookeeper-jute-3.8.1.jar.sha1
@@ -0,0 +1 @@
+aeb9b21ed9d2b99da9e0e3d1fd24d54f85fbf840
diff --git a/versions.lock b/versions.lock
index 59f97f4852f..24a80625682 100644
--- a/versions.lock
+++ b/versions.lock
@@ -114,14 +114,12 @@ io.netty:netty-codec-http:4.1.89.Final (3 constraints: 5e2461ef)
io.netty:netty-codec-http2:4.1.89.Final (1 constraints: ee0a9acb)
io.netty:netty-codec-socks:4.1.89.Final (1 constraints: 180fc66c)
io.netty:netty-common:4.1.89.Final (12 constraints: 54b38596)
-io.netty:netty-handler:4.1.89.Final (3 constraints: 732b5e3e)
+io.netty:netty-handler:4.1.89.Final (3 constraints: 772b7b3e)
io.netty:netty-handler-proxy:4.1.89.Final (1 constraints: ee0a9acb)
io.netty:netty-resolver:4.1.89.Final (2 constraints: 601aed32)
-io.netty:netty-tcnative:2.0.48.Final (1 constraints: d60fe48e)
-io.netty:netty-tcnative-classes:2.0.48.Final (1 constraints: 210d451b)
io.netty:netty-transport:4.1.89.Final (9 constraints: 1d8ce04d)
io.netty:netty-transport-classes-epoll:4.1.89.Final (1 constraints: b512131f)
-io.netty:netty-transport-native-epoll:4.1.89.Final (1 constraints: d70ffb8e)
+io.netty:netty-transport-native-epoll:4.1.89.Final (1 constraints: db0f188f)
io.netty:netty-transport-native-unix-common:4.1.89.Final (4 constraints: 653d1799)
io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692)
io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc)
@@ -258,8 +256,8 @@ org.apache.tika:tika-core:1.28.4 (2 constraints: d6116711)
org.apache.tika:tika-parsers:1.28.4 (1 constraints: 4105493b)
org.apache.tomcat:annotations-api:6.0.53 (1 constraints: 40054e3b)
org.apache.xmlbeans:xmlbeans:5.0.3 (2 constraints: 72173075)
-org.apache.zookeeper:zookeeper:3.8.0 (2 constraints: 9f13215f)
-org.apache.zookeeper:zookeeper-jute:3.8.0 (2 constraints: 97123223)
+org.apache.zookeeper:zookeeper:3.8.1 (2 constraints: a0134c5f)
+org.apache.zookeeper:zookeeper-jute:3.8.1 (2 constraints: 99125b23)
org.apiguardian:apiguardian-api:1.1.2 (2 constraints: 601bd5a8)
org.bitbucket.b_c:jose4j:0.7.9 (1 constraints: 12050936)
org.bouncycastle:bcmail-jdk15on:1.70 (1 constraints: 310c8af5)
diff --git a/versions.props b/versions.props
index 85b2816997e..4c78b654706 100644
--- a/versions.props
+++ b/versions.props
@@ -56,7 +56,7 @@ org.apache.lucene:*=9.4.2
org.apache.opennlp:opennlp-tools=1.9.4
org.apache.tika:*=1.28.4
org.apache.tomcat:annotations-api=6.0.53
-org.apache.zookeeper:*=3.8.0
+org.apache.zookeeper:*=3.8.1
org.bitbucket.b_c:jose4j=0.7.9
org.carrot2:carrot2-core=4.5.0
org.codehaus.woodstox:stax2-api=4.2.1
[solr] 02/02: Cleanup unreferenced solr/licenses/netty-tcnative-* files
Posted by kr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 6598a97b2cf59b776accf630ce7a6e65539f1ff8
Author: Kevin Risden <kr...@apache.org>
AuthorDate: Wed Mar 1 09:36:14 2023 -0500
Cleanup unreferenced solr/licenses/netty-tcnative-* files
---
solr/licenses/netty-tcnative-LICENSE-ASL.txt | 201 ---------------------------
solr/licenses/netty-tcnative-NOTICE.txt | 51 -------
2 files changed, 252 deletions(-)
diff --git a/solr/licenses/netty-tcnative-LICENSE-ASL.txt b/solr/licenses/netty-tcnative-LICENSE-ASL.txt
deleted file mode 100644
index 261eeb9e9f8..00000000000
--- a/solr/licenses/netty-tcnative-LICENSE-ASL.txt
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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
-
- 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.
diff --git a/solr/licenses/netty-tcnative-NOTICE.txt b/solr/licenses/netty-tcnative-NOTICE.txt
deleted file mode 100644
index 23dcbe30164..00000000000
--- a/solr/licenses/netty-tcnative-NOTICE.txt
+++ /dev/null
@@ -1,51 +0,0 @@
- The Netty Project
- =================
-
-Please visit the Netty web site for more information:
-
- * http://netty.io/
-
-Copyright 2016 The Netty Project
-
-The Netty Project 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.
-
--------------------------------------------------------------------------------
-This product contains a forked and modified version of Tomcat Native
-
- * LICENSE:
- * license/LICENSE.tomcat-native.txt (Apache License 2.0)
- * HOMEPAGE:
- * http://tomcat.apache.org/native-doc/
- * https://svn.apache.org/repos/asf/tomcat/native/
-
-This product contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build.
-
- * LICENSE:
- * license/LICENSE.mvn-wrapper.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/takari/maven-wrapper
-
-This product contains small piece of code to support AIX, taken from netbsd.
-
- * LICENSE:
- * license/LICENSE.aix-netbsd.txt (OpenSSL License)
- * HOMEPAGE:
- * https://ftp.netbsd.org/pub/NetBSD/NetBSD-current/src/crypto/external/bsd/openssl/dist
-
-
-This product contains code from boringssl.
-
- * LICENSE (Combination ISC and OpenSSL license)
- * license/LICENSE.boringssl.txt (Combination ISC and OpenSSL license)
- * HOMEPAGE:
- * https://boringssl.googlesource.com/boringssl/