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/02 00:27:59 UTC
[solr] branch branch_9x updated: Update io.dropwizard.metrics:* to v4.2.17 (#1391)
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
The following commit(s) were added to refs/heads/branch_9x by this push:
new 5eadc39946a Update io.dropwizard.metrics:* to v4.2.17 (#1391)
5eadc39946a is described below
commit 5eadc39946a5bc8ccf2cbcbd220f02dcb8cc9c04
Author: Solr Bot <12...@users.noreply.github.com>
AuthorDate: Thu Mar 2 01:22:37 2023 +0100
Update io.dropwizard.metrics:* to v4.2.17 (#1391)
Co-authored-by: Kevin Risden <kr...@apache.org>
---
solr/licenses/metrics-annotation-4.2.17.jar.sha1 | 1 +
solr/licenses/metrics-annotation-LICENSE-ASL.txt | 202 +++++++++++++++++++++++
solr/licenses/metrics-annotation-NOTICE.txt | 11 ++
solr/licenses/metrics-core-4.2.12.jar.sha1 | 1 -
solr/licenses/metrics-core-4.2.17.jar.sha1 | 1 +
solr/licenses/metrics-graphite-4.2.12.jar.sha1 | 1 -
solr/licenses/metrics-graphite-4.2.17.jar.sha1 | 1 +
solr/licenses/metrics-jetty10-4.2.12.jar.sha1 | 1 -
solr/licenses/metrics-jetty10-4.2.17.jar.sha1 | 1 +
solr/licenses/metrics-jmx-4.2.12.jar.sha1 | 1 -
solr/licenses/metrics-jmx-4.2.17.jar.sha1 | 1 +
solr/licenses/metrics-jvm-4.2.12.jar.sha1 | 1 -
solr/licenses/metrics-jvm-4.2.17.jar.sha1 | 1 +
versions.lock | 21 +--
versions.props | 2 +-
15 files changed, 231 insertions(+), 16 deletions(-)
diff --git a/solr/licenses/metrics-annotation-4.2.17.jar.sha1 b/solr/licenses/metrics-annotation-4.2.17.jar.sha1
new file mode 100644
index 00000000000..861d133da5c
--- /dev/null
+++ b/solr/licenses/metrics-annotation-4.2.17.jar.sha1
@@ -0,0 +1 @@
+4b19f1caeeaf1c57ccac0f20cc7872660c8d0f09
diff --git a/solr/licenses/metrics-annotation-LICENSE-ASL.txt b/solr/licenses/metrics-annotation-LICENSE-ASL.txt
new file mode 100644
index 00000000000..e4ba40426da
--- /dev/null
+++ b/solr/licenses/metrics-annotation-LICENSE-ASL.txt
@@ -0,0 +1,202 @@
+
+ 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 2010-2012 Coda Hale and Yammer, Inc.
+
+ 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/metrics-annotation-NOTICE.txt b/solr/licenses/metrics-annotation-NOTICE.txt
new file mode 100644
index 00000000000..4fe83de38a5
--- /dev/null
+++ b/solr/licenses/metrics-annotation-NOTICE.txt
@@ -0,0 +1,11 @@
+Metrics
+Copyright 2010-2013 Coda Hale and Yammer, Inc.
+
+This product includes software developed by Coda Hale and Yammer, Inc.
+
+This product includes code derived from the JSR-166 project (ThreadLocalRandom, Striped64,
+LongAdder), which was released with the following comments:
+
+ 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/
diff --git a/solr/licenses/metrics-core-4.2.12.jar.sha1 b/solr/licenses/metrics-core-4.2.12.jar.sha1
deleted file mode 100644
index 1de8b5c88c9..00000000000
--- a/solr/licenses/metrics-core-4.2.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-25b3a0a32da943a30104630216abeccf4eeb9e81
diff --git a/solr/licenses/metrics-core-4.2.17.jar.sha1 b/solr/licenses/metrics-core-4.2.17.jar.sha1
new file mode 100644
index 00000000000..df83ded665f
--- /dev/null
+++ b/solr/licenses/metrics-core-4.2.17.jar.sha1
@@ -0,0 +1 @@
+6add1dd4f8b11be3edf97b0f9dc537af1c3beda0
diff --git a/solr/licenses/metrics-graphite-4.2.12.jar.sha1 b/solr/licenses/metrics-graphite-4.2.12.jar.sha1
deleted file mode 100644
index 6e4dada9b09..00000000000
--- a/solr/licenses/metrics-graphite-4.2.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-943e9b874364db842bb1a85f9b4d05f149691a1a
diff --git a/solr/licenses/metrics-graphite-4.2.17.jar.sha1 b/solr/licenses/metrics-graphite-4.2.17.jar.sha1
new file mode 100644
index 00000000000..e17b2acd177
--- /dev/null
+++ b/solr/licenses/metrics-graphite-4.2.17.jar.sha1
@@ -0,0 +1 @@
+6a096245721bc03bf04b1c79357b365d40f03299
diff --git a/solr/licenses/metrics-jetty10-4.2.12.jar.sha1 b/solr/licenses/metrics-jetty10-4.2.12.jar.sha1
deleted file mode 100644
index 0b2c38fa2e3..00000000000
--- a/solr/licenses/metrics-jetty10-4.2.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-85178b2cdd52226492e3341b0ad03851d42e6969
diff --git a/solr/licenses/metrics-jetty10-4.2.17.jar.sha1 b/solr/licenses/metrics-jetty10-4.2.17.jar.sha1
new file mode 100644
index 00000000000..74588db646e
--- /dev/null
+++ b/solr/licenses/metrics-jetty10-4.2.17.jar.sha1
@@ -0,0 +1 @@
+c647304e5975afab6ccdbbd0938431426d3ff182
diff --git a/solr/licenses/metrics-jmx-4.2.12.jar.sha1 b/solr/licenses/metrics-jmx-4.2.12.jar.sha1
deleted file mode 100644
index cf6b4bc2dc0..00000000000
--- a/solr/licenses/metrics-jmx-4.2.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fc1d861de6ab0ae46d0257b17d4129979597f41c
diff --git a/solr/licenses/metrics-jmx-4.2.17.jar.sha1 b/solr/licenses/metrics-jmx-4.2.17.jar.sha1
new file mode 100644
index 00000000000..cdf55209a3e
--- /dev/null
+++ b/solr/licenses/metrics-jmx-4.2.17.jar.sha1
@@ -0,0 +1 @@
+9e0dfff64c755cbf918d5b3babd9a072652d73a8
diff --git a/solr/licenses/metrics-jvm-4.2.12.jar.sha1 b/solr/licenses/metrics-jvm-4.2.12.jar.sha1
deleted file mode 100644
index 8c804c96bfb..00000000000
--- a/solr/licenses/metrics-jvm-4.2.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9f0b5bbdf50590453d362283f827136e65fb1040
diff --git a/solr/licenses/metrics-jvm-4.2.17.jar.sha1 b/solr/licenses/metrics-jvm-4.2.17.jar.sha1
new file mode 100644
index 00000000000..a49ab7d1878
--- /dev/null
+++ b/solr/licenses/metrics-jvm-4.2.17.jar.sha1
@@ -0,0 +1 @@
+2a8b8f2e09e373fef4d5dc95b8ee7e1b6c1d982d
diff --git a/versions.lock b/versions.lock
index a9cbe8decd5..7203c7f19fc 100644
--- a/versions.lock
+++ b/versions.lock
@@ -87,11 +87,12 @@ edu.ucar:httpservices:4.5.5 (2 constraints: 8f122834)
edu.ucar:netcdf4:4.5.5 (1 constraints: 650c0402)
edu.ucar:udunits:4.5.5 (1 constraints: 2b06034e)
edu.usc.ir:sentiment-analysis-parser:0.1 (1 constraints: fa0b50e9)
-io.dropwizard.metrics:metrics-core:4.2.12 (5 constraints: 384468fe)
-io.dropwizard.metrics:metrics-graphite:4.2.12 (1 constraints: 3b05413b)
-io.dropwizard.metrics:metrics-jetty10:4.2.12 (1 constraints: 3b05413b)
-io.dropwizard.metrics:metrics-jmx:4.2.12 (1 constraints: 3b05413b)
-io.dropwizard.metrics:metrics-jvm:4.2.12 (1 constraints: 3b05413b)
+io.dropwizard.metrics:metrics-annotation:4.2.17 (1 constraints: 361072b0)
+io.dropwizard.metrics:metrics-core:4.2.17 (5 constraints: 51443707)
+io.dropwizard.metrics:metrics-graphite:4.2.17 (1 constraints: 4005463b)
+io.dropwizard.metrics:metrics-jetty10:4.2.17 (1 constraints: 4005463b)
+io.dropwizard.metrics:metrics-jmx:4.2.17 (1 constraints: 4005463b)
+io.dropwizard.metrics:metrics-jvm:4.2.17 (1 constraints: 4005463b)
io.grpc:grpc-alts:1.51.0 (1 constraints: 1b1002a6)
io.grpc:grpc-api:1.51.0 (5 constraints: 8b3646b1)
io.grpc:grpc-auth:1.51.0 (1 constraints: 1b1002a6)
@@ -282,15 +283,15 @@ org.eclipse.jetty:jetty-alpn-java-server:10.0.13 (1 constraints: 67058f40)
org.eclipse.jetty:jetty-alpn-server:10.0.13 (2 constraints: f116a548)
org.eclipse.jetty:jetty-client:10.0.13 (2 constraints: 1b1b136e)
org.eclipse.jetty:jetty-deploy:10.0.13 (1 constraints: 67058f40)
-org.eclipse.jetty:jetty-http:10.0.13 (6 constraints: 684f3f86)
-org.eclipse.jetty:jetty-io:10.0.13 (9 constraints: a17dc0d4)
+org.eclipse.jetty:jetty-http:10.0.13 (6 constraints: 6a4f9787)
+org.eclipse.jetty:jetty-io:10.0.13 (9 constraints: a37d28d7)
org.eclipse.jetty:jetty-jmx:10.0.13 (1 constraints: 67058f40)
org.eclipse.jetty:jetty-rewrite:10.0.13 (1 constraints: 67058f40)
org.eclipse.jetty:jetty-security:10.0.13 (2 constraints: b813c378)
-org.eclipse.jetty:jetty-server:10.0.13 (7 constraints: c46d3518)
+org.eclipse.jetty:jetty-server:10.0.13 (7 constraints: c66d391a)
org.eclipse.jetty:jetty-servlet:10.0.13 (2 constraints: 3213f160)
org.eclipse.jetty:jetty-servlets:10.0.13 (1 constraints: 67058f40)
-org.eclipse.jetty:jetty-util:10.0.13 (9 constraints: 93811081)
+org.eclipse.jetty:jetty-util:10.0.13 (9 constraints: 95819283)
org.eclipse.jetty:jetty-webapp:10.0.13 (2 constraints: 40137961)
org.eclipse.jetty:jetty-xml:10.0.13 (3 constraints: 0b21bab9)
org.eclipse.jetty.http2:http2-client:10.0.13 (2 constraints: 1b1b136e)
@@ -347,7 +348,7 @@ org.reactivestreams:reactive-streams:1.0.3 (3 constraints: 3c2b02fd)
org.semver4j:semver4j:2.2.0 (1 constraints: 0605fb35)
org.slf4j:jcl-over-slf4j:2.0.6 (3 constraints: cc171ba6)
org.slf4j:jul-to-slf4j:2.0.6 (3 constraints: 26283448)
-org.slf4j:slf4j-api:2.0.6 (62 constraints: 233af9cf)
+org.slf4j:slf4j-api:2.0.6 (62 constraints: c0378e3f)
org.tallison:isoparser:1.9.41.7 (1 constraints: fb0c5528)
org.tallison:jmatio:1.5 (1 constraints: ff0b57e9)
org.tallison:metadata-extractor:2.17.1.0 (1 constraints: f00c3b28)
diff --git a/versions.props b/versions.props
index a42d9f7ed20..5470464b189 100644
--- a/versions.props
+++ b/versions.props
@@ -19,7 +19,7 @@ commons-cli:commons-cli=1.5.0
commons-codec:commons-codec=1.15
commons-collections:commons-collections=3.2.2
commons-io:commons-io=2.11.0
-io.dropwizard.metrics:*=4.2.12
+io.dropwizard.metrics:*=4.2.17
io.grpc:grpc-*=1.51.0
io.jaegertracing:*=1.8.1
io.netty:*=4.1.89.Final