From 69b722cf5e7c51f4e63cdc2a184bac9879db69bf Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Tue, 14 May 2024 22:53:48 -0400 Subject: [PATCH 01/13] Bump com.google.cloud:google-cloud-storage from 1.113.1 to 2.38.0 Signed-off-by: Craig Perkins --- plugins/repository-gcs/build.gradle | 161 ++++++- .../licenses/checker-qual-3.29.0.jar.sha1 | 1 + .../licenses/checker-qual-LICENSE.txt | 413 ++++++++++++++++++ .../licenses/checker-qual-NOTICE.txt | 0 .../google-cloud-storage-1.113.1.jar.sha1 | 1 - .../google-cloud-storage-2.38.0.jar.sha1 | 1 + 6 files changed, 574 insertions(+), 3 deletions(-) create mode 100644 plugins/repository-gcs/licenses/checker-qual-3.29.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/checker-qual-LICENSE.txt create mode 100644 plugins/repository-gcs/licenses/checker-qual-NOTICE.txt delete mode 100644 plugins/repository-gcs/licenses/google-cloud-storage-1.113.1.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/google-cloud-storage-2.38.0.jar.sha1 diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 110df89f25de8..16875db01994d 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -68,7 +68,8 @@ dependencies { api 'com.google.cloud:google-cloud-core:2.30.0' api 'com.google.cloud:google-cloud-core-http:2.23.0' - api 'com.google.cloud:google-cloud-storage:1.113.1' + api 'com.google.cloud:google-cloud-storage:2.38.0' + implementation 'org.checkerframework:checker-qual:3.29.0' api 'com.google.code.gson:gson:2.10.1' @@ -212,7 +213,163 @@ thirdPartyAudit { 'javax.servlet.ServletContextListener', // Bump for gax 2.42.0 'com.google.api.gax.rpc.EndpointContext', - 'com.google.api.gax.rpc.RequestMutator' + 'com.google.api.gax.rpc.RequestMutator', + 'com.google.api.gax.grpc.GrpcCallContext', + 'com.google.api.gax.grpc.GrpcCallSettings', + 'com.google.api.gax.grpc.GrpcCallSettings$Builder', + 'com.google.api.gax.grpc.GrpcInterceptorProvider', + 'com.google.api.gax.grpc.GrpcStatusCode', + 'com.google.api.gax.grpc.GrpcStubCallableFactory', + 'com.google.api.gax.grpc.InstantiatingGrpcChannelProvider', + 'com.google.api.gax.grpc.InstantiatingGrpcChannelProvider$Builder', + 'com.google.api.services.storage.Storage$Objects$Restore', + 'com.google.api.services.storage.model.Bucket$HierarchicalNamespace', + 'com.google.api.services.storage.model.Bucket$ObjectRetention', + 'com.google.api.services.storage.model.Bucket$SoftDeletePolicy', + 'com.google.api.services.storage.model.StorageObject$Retention', + 'com.google.cloud.grpc.GrpcTransportOptions', + 'com.google.cloud.grpc.GrpcTransportOptions$Builder', + 'com.google.storage.v2.BidiWriteObjectRequest', + 'com.google.storage.v2.BidiWriteObjectRequest$Builder', + 'com.google.storage.v2.BidiWriteObjectResponse', + 'com.google.storage.v2.Bucket', + 'com.google.storage.v2.Bucket$Autoclass', + 'com.google.storage.v2.Bucket$Autoclass$Builder', + 'com.google.storage.v2.Bucket$Billing', + 'com.google.storage.v2.Bucket$Billing$Builder', + 'com.google.storage.v2.Bucket$Builder', + 'com.google.storage.v2.Bucket$Cors', + 'com.google.storage.v2.Bucket$Cors$Builder', + 'com.google.storage.v2.Bucket$CustomPlacementConfig', + 'com.google.storage.v2.Bucket$CustomPlacementConfig$Builder', + 'com.google.storage.v2.Bucket$Encryption', + 'com.google.storage.v2.Bucket$Encryption$Builder', + 'com.google.storage.v2.Bucket$HierarchicalNamespace', + 'com.google.storage.v2.Bucket$HierarchicalNamespace$Builder', + 'com.google.storage.v2.Bucket$IamConfig', + 'com.google.storage.v2.Bucket$IamConfig$Builder', + 'com.google.storage.v2.Bucket$IamConfig$UniformBucketLevelAccess', + 'com.google.storage.v2.Bucket$IamConfig$UniformBucketLevelAccess$Builder', + 'com.google.storage.v2.Bucket$Lifecycle', + 'com.google.storage.v2.Bucket$Lifecycle$Builder', + 'com.google.storage.v2.Bucket$Lifecycle$Rule', + 'com.google.storage.v2.Bucket$Lifecycle$Rule$Action', + 'com.google.storage.v2.Bucket$Lifecycle$Rule$Action$Builder', + 'com.google.storage.v2.Bucket$Lifecycle$Rule$Builder', + 'com.google.storage.v2.Bucket$Lifecycle$Rule$Condition', + 'com.google.storage.v2.Bucket$Lifecycle$Rule$Condition$Builder', + 'com.google.storage.v2.Bucket$Logging', + 'com.google.storage.v2.Bucket$Logging$Builder', + 'com.google.storage.v2.Bucket$RetentionPolicy', + 'com.google.storage.v2.Bucket$RetentionPolicy$Builder', + 'com.google.storage.v2.Bucket$SoftDeletePolicy', + 'com.google.storage.v2.Bucket$SoftDeletePolicy$Builder', + 'com.google.storage.v2.Bucket$Versioning', + 'com.google.storage.v2.Bucket$Versioning$Builder', + 'com.google.storage.v2.Bucket$Website', + 'com.google.storage.v2.Bucket$Website$Builder', + 'com.google.storage.v2.BucketAccessControl', + 'com.google.storage.v2.BucketAccessControl$Builder', + 'com.google.storage.v2.BucketName', + 'com.google.storage.v2.ChecksummedData', + 'com.google.storage.v2.ChecksummedData$Builder', + 'com.google.storage.v2.CommonObjectRequestParams', + 'com.google.storage.v2.CommonObjectRequestParams$Builder', + 'com.google.storage.v2.ComposeObjectRequest', + 'com.google.storage.v2.ComposeObjectRequest$Builder', + 'com.google.storage.v2.ComposeObjectRequest$SourceObject', + 'com.google.storage.v2.ComposeObjectRequest$SourceObject$Builder', + 'com.google.storage.v2.CreateBucketRequest', + 'com.google.storage.v2.CreateBucketRequest$Builder', + 'com.google.storage.v2.CreateHmacKeyRequest', + 'com.google.storage.v2.CreateHmacKeyRequest$Builder', + 'com.google.storage.v2.CreateHmacKeyResponse', + 'com.google.storage.v2.CreateNotificationConfigRequest', + 'com.google.storage.v2.CreateNotificationConfigRequest$Builder', + 'com.google.storage.v2.CryptoKeyName', + 'com.google.storage.v2.CustomerEncryption', + 'com.google.storage.v2.CustomerEncryption$Builder', + 'com.google.storage.v2.DeleteBucketRequest', + 'com.google.storage.v2.DeleteBucketRequest$Builder', + 'com.google.storage.v2.DeleteHmacKeyRequest', + 'com.google.storage.v2.DeleteHmacKeyRequest$Builder', + 'com.google.storage.v2.DeleteNotificationConfigRequest', + 'com.google.storage.v2.DeleteNotificationConfigRequest$Builder', + 'com.google.storage.v2.DeleteObjectRequest', + 'com.google.storage.v2.DeleteObjectRequest$Builder', + 'com.google.storage.v2.GetBucketRequest', + 'com.google.storage.v2.GetBucketRequest$Builder', + 'com.google.storage.v2.GetHmacKeyRequest', + 'com.google.storage.v2.GetHmacKeyRequest$Builder', + 'com.google.storage.v2.GetNotificationConfigRequest', + 'com.google.storage.v2.GetNotificationConfigRequest$Builder', + 'com.google.storage.v2.GetObjectRequest', + 'com.google.storage.v2.GetObjectRequest$Builder', + 'com.google.storage.v2.GetServiceAccountRequest', + 'com.google.storage.v2.GetServiceAccountRequest$Builder', + 'com.google.storage.v2.HmacKeyMetadata', + 'com.google.storage.v2.HmacKeyMetadata$Builder', + 'com.google.storage.v2.ListBucketsRequest', + 'com.google.storage.v2.ListBucketsRequest$Builder', + 'com.google.storage.v2.ListHmacKeysRequest', + 'com.google.storage.v2.ListHmacKeysRequest$Builder', + 'com.google.storage.v2.ListNotificationConfigsRequest', + 'com.google.storage.v2.ListNotificationConfigsRequest$Builder', + 'com.google.storage.v2.ListObjectsRequest', + 'com.google.storage.v2.ListObjectsRequest$Builder', + 'com.google.storage.v2.ListObjectsResponse', + 'com.google.storage.v2.LockBucketRetentionPolicyRequest', + 'com.google.storage.v2.LockBucketRetentionPolicyRequest$Builder', + 'com.google.storage.v2.NotificationConfig', + 'com.google.storage.v2.NotificationConfig$Builder', + 'com.google.storage.v2.NotificationConfigName', + 'com.google.storage.v2.Object', + 'com.google.storage.v2.Object$Builder', + 'com.google.storage.v2.ObjectAccessControl', + 'com.google.storage.v2.ObjectAccessControl$Builder', + 'com.google.storage.v2.ObjectChecksums', + 'com.google.storage.v2.ObjectChecksums$Builder', + 'com.google.storage.v2.Owner', + 'com.google.storage.v2.Owner$Builder', + 'com.google.storage.v2.ProjectName', + 'com.google.storage.v2.QueryWriteStatusRequest', + 'com.google.storage.v2.QueryWriteStatusRequest$Builder', + 'com.google.storage.v2.QueryWriteStatusResponse', + 'com.google.storage.v2.ReadObjectRequest', + 'com.google.storage.v2.ReadObjectRequest$Builder', + 'com.google.storage.v2.ReadObjectResponse', + 'com.google.storage.v2.RestoreObjectRequest', + 'com.google.storage.v2.RestoreObjectRequest$Builder', + 'com.google.storage.v2.RewriteObjectRequest', + 'com.google.storage.v2.RewriteObjectRequest$Builder', + 'com.google.storage.v2.RewriteResponse', + 'com.google.storage.v2.ServiceAccount', + 'com.google.storage.v2.ServiceAccount$Builder', + 'com.google.storage.v2.StartResumableWriteRequest', + 'com.google.storage.v2.StartResumableWriteRequest$Builder', + 'com.google.storage.v2.StartResumableWriteResponse', + 'com.google.storage.v2.StorageClient', + 'com.google.storage.v2.StorageClient$ListBucketsPagedResponse', + 'com.google.storage.v2.StorageClient$ListHmacKeysPagedResponse', + 'com.google.storage.v2.StorageClient$ListNotificationConfigsPagedResponse', + 'com.google.storage.v2.StorageSettings', + 'com.google.storage.v2.StorageSettings$Builder', + 'com.google.storage.v2.UpdateBucketRequest', + 'com.google.storage.v2.UpdateBucketRequest$Builder', + 'com.google.storage.v2.UpdateHmacKeyRequest', + 'com.google.storage.v2.UpdateHmacKeyRequest$Builder', + 'com.google.storage.v2.UpdateObjectRequest', + 'com.google.storage.v2.UpdateObjectRequest$Builder', + 'com.google.storage.v2.WriteObjectRequest', + 'com.google.storage.v2.WriteObjectRequest$Builder', + 'com.google.storage.v2.WriteObjectResponse', + 'com.google.storage.v2.WriteObjectResponse$Builder', + 'com.google.storage.v2.WriteObjectSpec', + 'com.google.storage.v2.WriteObjectSpec$Builder', + 'com.google.storage.v2.stub.GrpcStorageStub', + 'com.google.storage.v2.stub.StorageStub', + 'com.google.storage.v2.stub.StorageStubSettings', + 'io.grpc.protobuf.ProtoUtils' ) } diff --git a/plugins/repository-gcs/licenses/checker-qual-3.29.0.jar.sha1 b/plugins/repository-gcs/licenses/checker-qual-3.29.0.jar.sha1 new file mode 100644 index 0000000000000..d8f22c5178e95 --- /dev/null +++ b/plugins/repository-gcs/licenses/checker-qual-3.29.0.jar.sha1 @@ -0,0 +1 @@ +a805a761b7a734d69f9c1766ead1ff78698a1497 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/checker-qual-LICENSE.txt b/plugins/repository-gcs/licenses/checker-qual-LICENSE.txt new file mode 100644 index 0000000000000..827585f1d41a2 --- /dev/null +++ b/plugins/repository-gcs/licenses/checker-qual-LICENSE.txt @@ -0,0 +1,413 @@ +The Checker Framework +Copyright 2004-present by the Checker Framework developers + + +Most of the Checker Framework is licensed under the GNU General Public +License, version 2 (GPL2), with the classpath exception. The text of this +license appears below. This is the same license used for OpenJDK. + +A few parts of the Checker Framework have more permissive licenses, notably +the parts that you might want to include with your own program. + + * The annotations and utility files are licensed under the MIT License. + (The text of this license also appears below.) This applies to + checker-qual*.jar and checker-util.jar and all the files that appear in + them, which is all files in checker-qual and checker-util directories. + It also applies to the cleanroom implementations of + third-party annotations (in checker/src/testannotations/, + framework/src/main/java/org/jmlspecs/, and + framework/src/main/java/com/google/). + +The Checker Framework includes annotations for some libraries. Those in +.astub files use the MIT License. Those in https://github.com/typetools/jdk +(which appears in the annotated-jdk directory of file checker.jar) use the +GPL2 license. + +Some external libraries that are included with the Checker Framework +distribution have different licenses. Here are some examples. + + * JavaParser is dual licensed under the LGPL or the Apache license -- you + may use it under whichever one you want. (The JavaParser source code + contains a file with the text of the GPL, but it is not clear why, since + JavaParser does not use the GPL.) See + https://github.com/typetools/stubparser . + + * Annotation Tools (https://github.com/typetools/annotation-tools) uses + the MIT license. + + * Libraries in plume-lib (https://github.com/plume-lib/) are licensed + under the MIT License. + +=========================================================================== + +The GNU General Public License (GPL) + +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share +and change it. By contrast, the GNU General Public License is intended to +guarantee your freedom to share and change free software--to make sure the +software is free for all its users. This General Public License applies to +most of the Free Software Foundation's software and to any other program whose +authors commit to using it. (Some other Free Software Foundation software is +covered by the GNU Library General Public License instead.) You can apply it to +your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom to +distribute copies of free software (and charge for this service if you wish), +that you receive source code or can get it if you want it, that you can change +the software or use pieces of it in new free programs; and that you know you +can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny +you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of the +software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for +a fee, you must give the recipients all the rights that you have. You must +make sure that they, too, receive or can get the source code. And you must +show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) +offer you this license which gives you legal permission to copy, distribute +and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If the +software is modified by someone else and passed on, we want its recipients to +know that what they have is not the original, so that any problems introduced +by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We +wish to avoid the danger that redistributors of a free program will +individually obtain patent licenses, in effect making the program proprietary. +To prevent this, we have made it clear that any patent must be licensed for +everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms of +this General Public License. The "Program", below, refers to any such program +or work, and a "work based on the Program" means either the Program or any +derivative work under copyright law: that is to say, a work containing the +Program or a portion of it, either verbatim or with modifications and/or +translated into another language. (Hereinafter, translation is included +without limitation in the term "modification".) Each licensee is addressed as +"you". + +Activities other than copying, distribution and modification are not covered by +this License; they are outside its scope. The act of running the Program is +not restricted, and the output from the Program is covered only if its contents +constitute a work based on the Program (independent of having been made by +running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as +you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this License +and to the absence of any warranty; and give any other recipients of the +Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may +at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus +forming a work based on the Program, and copy and distribute such modifications +or work under the terms of Section 1 above, provided that you also meet all of +these conditions: + + a) You must cause the modified files to carry prominent notices stating + that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in whole or + in part contains or is derived from the Program or any part thereof, to be + licensed as a whole at no charge to all third parties under the terms of + this License. + + c) If the modified program normally reads commands interactively when run, + you must cause it, when started running for such interactive use in the + most ordinary way, to print or display an announcement including an + appropriate copyright notice and a notice that there is no warranty (or + else, saying that you provide a warranty) and that users may redistribute + the program under these conditions, and telling the user how to view a copy + of this License. (Exception: if the Program itself is interactive but does + not normally print such an announcement, your work based on the Program is + not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be reasonably +considered independent and separate works in themselves, then this License, and +its terms, do not apply to those sections when you distribute them as separate +works. But when you distribute the same sections as part of a whole which is a +work based on the Program, the distribution of the whole must be on the terms +of this License, whose permissions for other licensees extend to the entire +whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your +rights to work written entirely by you; rather, the intent is to exercise the +right to control the distribution of derivative or collective works based on +the Program. + +In addition, mere aggregation of another work not based on the Program with the +Program (or with a work based on the Program) on a volume of a storage or +distribution medium does not bring the other work under the scope of this +License. + +3. You may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of Sections 1 and +2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable source + code, which must be distributed under the terms of Sections 1 and 2 above + on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three years, to + give any third party, for a charge no more than your cost of physically + performing source distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of Sections 1 + and 2 above on a medium customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer to + distribute corresponding source code. (This alternative is allowed only + for noncommercial distribution and only if you received the program in + object code or executable form with such an offer, in accord with + Subsection b above.) + +The source code for a work means the preferred form of the work for making +modifications to it. For an executable work, complete source code means all +the source code for all modules it contains, plus any associated interface +definition files, plus the scripts used to control compilation and installation +of the executable. However, as a special exception, the source code +distributed need not include anything that is normally distributed (in either +source or binary form) with the major components (compiler, kernel, and so on) +of the operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the source +code from the same place counts as distribution of the source code, even though +third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as +expressly provided under this License. Any attempt otherwise to copy, modify, +sublicense or distribute the Program is void, and will automatically terminate +your rights under this License. However, parties who have received copies, or +rights, from you under this License will not have their licenses terminated so +long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. +However, nothing else grants you permission to modify or distribute the Program +or its derivative works. These actions are prohibited by law if you do not +accept this License. Therefore, by modifying or distributing the Program (or +any work based on the Program), you indicate your acceptance of this License to +do so, and all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), +the recipient automatically receives a license from the original licensor to +copy, distribute or modify the Program subject to these terms and conditions. +You may not impose any further restrictions on the recipients' exercise of the +rights granted herein. You are not responsible for enforcing compliance by +third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), conditions +are imposed on you (whether by court order, agreement or otherwise) that +contradict the conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as to satisfy +simultaneously your obligations under this License and any other pertinent +obligations, then as a consequence you may not distribute the Program at all. +For example, if a patent license would not permit royalty-free redistribution +of the Program by all those who receive copies directly or indirectly through +you, then the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and +the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or +other property right claims or to contest validity of any such claims; this +section has the sole purpose of protecting the integrity of the free software +distribution system, which is implemented by public license practices. Many +people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose that +choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original +copyright holder who places the Program under this License may add an explicit +geographical distribution limitation excluding those countries, so that +distribution is permitted only in or among countries not thus excluded. In +such case, this License incorporates the limitation as if written in the body +of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the +General Public License from time to time. Such new versions will be similar in +spirit to the present version, but may differ in detail to address new problems +or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any later +version", you have the option of following the terms and conditions either of +that version or of any later version published by the Free Software Foundation. +If the Program does not specify a version number of this License, you may +choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software Foundation, +write to the Free Software Foundation; we sometimes make exceptions for this. +Our decision will be guided by the two goals of preserving the free status of +all derivatives of our free software and of promoting the sharing and reuse of +software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR +THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE +PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, +YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL +ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE +PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR +INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA +BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER +OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible +use to the public, the best way to achieve this is to make it free software +which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach +them to the start of each source file to most effectively convey the exclusion +of warranty; and each file should have at least the "copyright" line and a +pointer to where the full notice is found. + + One line to give the program's name and a brief idea of what it does. + + Copyright (C) + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., 59 + Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it +starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes + with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free + software, and you are welcome to redistribute it under certain conditions; + type 'show c' for details. + +The hypothetical commands 'show w' and 'show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may be +called something other than 'show w' and 'show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, +if any, to sign a "copyright disclaimer" for the program, if necessary. Here +is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + 'Gnomovision' (which makes passes at compilers) written by James Hacker. + + signature of Ty Coon, 1 April 1989 + + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General Public +License instead of this License. + + +"CLASSPATH" EXCEPTION TO THE GPL + +Certain source files distributed by Oracle America and/or its affiliates are +subject to the following clarification and special exception to the GPL, but +only where Oracle has expressly included in the particular source file's header +the words "Oracle designates this particular file as subject to the "Classpath" +exception as provided by Oracle in the LICENSE file that accompanied this code." + + Linking this library statically or dynamically with other modules is making + a combined work based on this library. Thus, the terms and conditions of + the GNU General Public License cover the whole combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent modules, + and to copy and distribute the resulting executable under terms of your + choice, provided that you also meet, for each linked independent module, + the terms and conditions of the license of that module. An independent + module is a module which is not derived from or based on this library. If + you modify this library, you may extend this exception to your version of + the library, but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. + +=========================================================================== + +MIT License: + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +=========================================================================== diff --git a/plugins/repository-gcs/licenses/checker-qual-NOTICE.txt b/plugins/repository-gcs/licenses/checker-qual-NOTICE.txt new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/plugins/repository-gcs/licenses/google-cloud-storage-1.113.1.jar.sha1 b/plugins/repository-gcs/licenses/google-cloud-storage-1.113.1.jar.sha1 deleted file mode 100644 index 22fc078b36aa1..0000000000000 --- a/plugins/repository-gcs/licenses/google-cloud-storage-1.113.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fd291ed57c1223bbb31363c4aa88c55faf0000c7 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-cloud-storage-2.38.0.jar.sha1 b/plugins/repository-gcs/licenses/google-cloud-storage-2.38.0.jar.sha1 new file mode 100644 index 0000000000000..6d21369f8ba91 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-cloud-storage-2.38.0.jar.sha1 @@ -0,0 +1 @@ +ea43563754309103c6cfe46c00233dbed7c7b126 \ No newline at end of file From ec7fc48e3eb03d7d6080d1c343fdca419584a1f2 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Tue, 14 May 2024 22:56:34 -0400 Subject: [PATCH 02/13] Add to CHANGELOG Signed-off-by: Craig Perkins --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65c5fa1223cc6..9782778d9f7ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `org.hdrhistogram:HdrHistogram` from 2.1.12 to 2.2.1 ([#13556](https://github.com/opensearch-project/OpenSearch/pull/13556)) - Bump `com.gradle.enterprise` from 3.17.2 to 3.17.3 ([#13641](https://github.com/opensearch-project/OpenSearch/pull/13641)) - Bump `org.apache.hadoop:hadoop-minicluster` from 3.3.6 to 3.4.0 ([#13642](https://github.com/opensearch-project/OpenSearch/pull/13642)) +- Bump `com.google.cloud:google-cloud-storage` from 1.113.1 to 2.38.0 ([#13677](https://github.com/opensearch-project/OpenSearch/pull/13677)) ### Changed - Add ability for Boolean and date field queries to run when only doc_values are enabled ([#11650](https://github.com/opensearch-project/OpenSearch/pull/11650)) From 3e5072736ebe30b7b509d2cbe76e72cbaef4974b Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 15 May 2024 11:50:31 -0400 Subject: [PATCH 03/13] WIP Signed-off-by: Craig Perkins --- plugins/repository-gcs/build.gradle | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 16875db01994d..28124199c0823 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -51,12 +51,20 @@ versions << [ 'google_auth': '1.7.0' ] +configurations { + all { + resolutionStrategy { + force 'com.google.cloud:google-cloud-storage:2.38.0' + } + } +} + dependencies { api 'com.google.api:api-common:1.8.1' api 'com.google.api:gax:2.35.0' api 'com.google.api:gax-httpjson:2.42.0' - api 'com.google.apis:google-api-services-storage:v1-rev20230617-2.0.0' + api 'com.google.apis:google-api-services-storage:v1-rev171-1.25.0' api 'com.google.api-client:google-api-client:2.2.0' @@ -66,8 +74,8 @@ dependencies { api "com.google.auth:google-auth-library-credentials:${versions.google_auth}" api "com.google.auth:google-auth-library-oauth2-http:${versions.google_auth}" - api 'com.google.cloud:google-cloud-core:2.30.0' - api 'com.google.cloud:google-cloud-core-http:2.23.0' + api 'com.google.cloud:google-cloud-core:2.38.0' + api 'com.google.cloud:google-cloud-core-http:2.38.0' api 'com.google.cloud:google-cloud-storage:2.38.0' implementation 'org.checkerframework:checker-qual:3.29.0' From fe2ac3f6f30836624a2a940c82081456a2d9b2d1 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 15 May 2024 22:28:16 -0400 Subject: [PATCH 04/13] Update google libraries Signed-off-by: Craig Perkins --- plugins/repository-gcs/build.gradle | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 28124199c0823..fcca3f234a056 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -48,28 +48,21 @@ opensearchplugin { } versions << [ - 'google_auth': '1.7.0' + 'google_auth': '1.23.0' ] -configurations { - all { - resolutionStrategy { - force 'com.google.cloud:google-cloud-storage:2.38.0' - } - } -} - dependencies { - api 'com.google.api:api-common:1.8.1' - api 'com.google.api:gax:2.35.0' - api 'com.google.api:gax-httpjson:2.42.0' + api 'com.google.api:api-common:2.31.0' + api 'com.google.api:gax:2.48.0' + api 'com.google.api:gax-httpjson:2.48.0' - api 'com.google.apis:google-api-services-storage:v1-rev171-1.25.0' + api 'com.google.apis:google-api-services-storage:v1-rev20240319-2.0.0' - api 'com.google.api-client:google-api-client:2.2.0' + api 'com.google.api-client:google-api-client:2.5.0' - api 'com.google.api.grpc:proto-google-common-protos:2.37.1' - api 'com.google.api.grpc:proto-google-iam-v1:1.33.0' + api 'com.google.api.grpc:proto-google-common-protos:2.39.0' + api 'com.google.api.grpc:proto-google-cloud-storage-v2:2.38.0-alpha' + api 'com.google.api.grpc:proto-google-iam-v1:1.34.0' api "com.google.auth:google-auth-library-credentials:${versions.google_auth}" api "com.google.auth:google-auth-library-oauth2-http:${versions.google_auth}" @@ -89,7 +82,7 @@ dependencies { api "com.google.http-client:google-http-client-gson:${versions.google_http_client}" api "com.google.http-client:google-http-client-jackson2:${versions.google_http_client}" - api 'com.google.oauth-client:google-oauth-client:1.34.1' + api 'com.google.oauth-client:google-oauth-client:1.36.0' api "commons-logging:commons-logging:${versions.commonslogging}" api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}" From 62ad2599ce17f29fa316eb5336a93d65ed543649 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 23 Sep 2024 16:29:51 -0400 Subject: [PATCH 05/13] Bump to 2.43.0 Signed-off-by: Craig Perkins --- CHANGELOG.md | 2 +- plugins/repository-gcs/build.gradle | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6c87946769a9..4a7ff6deaaf11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `com.microsoft.azure:msal4j` from 1.17.0 to 1.17.1 ([#15945](https://github.com/opensearch-project/OpenSearch/pull/15945)) - Bump `ch.qos.logback:logback-core` from 1.5.6 to 1.5.8 ([#15946](https://github.com/opensearch-project/OpenSearch/pull/15946)) - Update protobuf from 3.25.4 to 3.25.5 ([#16011](https://github.com/opensearch-project/OpenSearch/pull/16011)) -- Bump `com.google.cloud:google-cloud-storage` from 1.113.1 to 2.38.0 ([#13677](https://github.com/opensearch-project/OpenSearch/pull/13677)) +- Bump `com.google.cloud:google-cloud-storage` from 1.113.1 to 2.43.0 ([#13677](https://github.com/opensearch-project/OpenSearch/pull/13677)) ### Changed diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 8e08b70144790..ee028f2cab50b 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -61,15 +61,15 @@ dependencies { api 'com.google.api-client:google-api-client:2.5.0' api 'com.google.api.grpc:proto-google-common-protos:2.39.0' - api 'com.google.api.grpc:proto-google-cloud-storage-v2:2.38.0-alpha' + api 'com.google.api.grpc:proto-google-cloud-storage-v2:2.43.0-alpha' api 'com.google.api.grpc:proto-google-iam-v1:1.34.0' api "com.google.auth:google-auth-library-credentials:${versions.google_auth}" api "com.google.auth:google-auth-library-oauth2-http:${versions.google_auth}" - api 'com.google.cloud:google-cloud-core:2.38.0' - api 'com.google.cloud:google-cloud-core-http:2.38.0' - api 'com.google.cloud:google-cloud-storage:2.38.0' + api 'com.google.cloud:google-cloud-core:2.43.0' + api 'com.google.cloud:google-cloud-core-http:2.43.0' + api 'com.google.cloud:google-cloud-storage:2.43.0' implementation 'org.checkerframework:checker-qual:3.29.0' api 'com.google.code.gson:gson:2.10.1' From 9f6cf437b997b600a4fd73a228d2a50e605da586 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 23 Sep 2024 16:40:23 -0400 Subject: [PATCH 06/13] Fix precommit Signed-off-by: Craig Perkins --- plugins/repository-gcs/build.gradle | 195 ++++-------------- .../licenses/api-common-1.8.1.jar.sha1 | 1 - .../licenses/api-common-2.31.0.jar.sha1 | 1 + .../licenses/gax-2.35.0.jar.sha1 | 1 - .../licenses/gax-2.48.0.jar.sha1 | 1 + .../licenses/gax-httpjson-2.42.0.jar.sha1 | 1 - .../licenses/gax-httpjson-2.48.0.jar.sha1 | 1 + .../licenses/google-api-client-2.2.0.jar.sha1 | 1 - .../licenses/google-api-client-2.5.0.jar.sha1 | 1 + ...ices-storage-v1-rev20230617-2.0.0.jar.sha1 | 1 - ...ices-storage-v1-rev20240319-2.0.0.jar.sha1 | 1 + ...e-auth-library-credentials-1.23.0.jar.sha1 | 1 + ...le-auth-library-credentials-1.7.0.jar.sha1 | 1 - ...e-auth-library-oauth2-http-1.23.0.jar.sha1 | 1 + ...le-auth-library-oauth2-http-1.7.0.jar.sha1 | 1 - .../google-cloud-core-2.30.0.jar.sha1 | 1 - .../google-cloud-core-2.43.0.jar.sha1 | 1 + .../google-cloud-core-http-2.23.0.jar.sha1 | 1 - .../google-cloud-core-http-2.43.0.jar.sha1 | 1 + .../google-cloud-storage-2.38.0.jar.sha1 | 1 - .../google-cloud-storage-2.43.0.jar.sha1 | 1 + .../google-oauth-client-1.34.1.jar.sha1 | 1 - .../google-oauth-client-1.36.0.jar.sha1 | 1 + ...ogle-cloud-storage-v2-2.43.0-beta.jar.sha1 | 1 + ...proto-google-common-protos-2.37.1.jar.sha1 | 1 - ...proto-google-common-protos-2.39.0.jar.sha1 | 1 + .../proto-google-iam-v1-1.33.0.jar.sha1 | 1 - .../proto-google-iam-v1-1.34.0.jar.sha1 | 1 + 28 files changed, 59 insertions(+), 163 deletions(-) delete mode 100644 plugins/repository-gcs/licenses/api-common-1.8.1.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/api-common-2.31.0.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/gax-2.35.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/gax-2.48.0.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/gax-httpjson-2.42.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/gax-httpjson-2.48.0.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/google-api-client-2.2.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/google-api-client-2.5.0.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/google-api-services-storage-v1-rev20230617-2.0.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/google-api-services-storage-v1-rev20240319-2.0.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/google-auth-library-credentials-1.23.0.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/google-auth-library-credentials-1.7.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.23.0.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.7.0.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/google-cloud-core-2.30.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/google-cloud-core-2.43.0.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/google-cloud-core-http-2.23.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/google-cloud-core-http-2.43.0.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/google-cloud-storage-2.38.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/google-cloud-storage-2.43.0.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/google-oauth-client-1.34.1.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/google-oauth-client-1.36.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/proto-google-cloud-storage-v2-2.43.0-beta.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/proto-google-common-protos-2.37.1.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/proto-google-common-protos-2.39.0.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/proto-google-iam-v1-1.33.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/proto-google-iam-v1-1.34.0.jar.sha1 diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index ee028f2cab50b..6a9ebeefcc5d2 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -61,7 +61,7 @@ dependencies { api 'com.google.api-client:google-api-client:2.5.0' api 'com.google.api.grpc:proto-google-common-protos:2.39.0' - api 'com.google.api.grpc:proto-google-cloud-storage-v2:2.43.0-alpha' + api 'com.google.api.grpc:proto-google-cloud-storage-v2:2.43.0-beta' api 'com.google.api.grpc:proto-google-iam-v1:1.34.0' api "com.google.auth:google-auth-library-credentials:${versions.google_auth}" @@ -150,11 +150,54 @@ thirdPartyAudit { 'com.google.appengine.api.urlfetch.HTTPResponse', 'com.google.appengine.api.urlfetch.URLFetchService', 'com.google.appengine.api.urlfetch.URLFetchServiceFactory', - 'com.google.auth.oauth2.GdchCredentials', + 'com.google.cloud.opentelemetry.metric.GoogleCloudMetricExporter', + 'com.google.cloud.opentelemetry.metric.MetricConfiguration', + 'com.google.cloud.opentelemetry.metric.MetricConfiguration$Builder', 'com.google.protobuf.util.JsonFormat', 'com.google.protobuf.util.JsonFormat$Parser', 'com.google.protobuf.util.JsonFormat$Printer', 'com.google.protobuf.util.Timestamps', + 'com.google.storage.v2.StorageClient', + 'com.google.storage.v2.StorageClient$ListBucketsPagedResponse', + 'com.google.storage.v2.StorageClient$ListHmacKeysPagedResponse', + 'com.google.storage.v2.StorageClient$ListNotificationConfigsPagedResponse', + 'com.google.storage.v2.StorageSettings', + 'com.google.storage.v2.StorageSettings$Builder', + 'com.google.storage.v2.stub.GrpcStorageStub', + 'com.google.storage.v2.stub.StorageStubSettings', + + 'io.grpc.opentelemetry.GrpcOpenTelemetry', + 'io.grpc.opentelemetry.GrpcOpenTelemetry$Builder', + 'io.opentelemetry.api.OpenTelemetry', + 'io.opentelemetry.api.common.AttributeKey', + 'io.opentelemetry.api.common.Attributes', + 'io.opentelemetry.api.common.AttributesBuilder', + 'io.opentelemetry.api.internal.StringUtils', + 'io.opentelemetry.api.metrics.DoubleHistogram', + 'io.opentelemetry.api.metrics.DoubleHistogramBuilder', + 'io.opentelemetry.api.metrics.LongCounter', + 'io.opentelemetry.api.metrics.LongCounterBuilder', + 'io.opentelemetry.api.metrics.Meter', + 'io.opentelemetry.api.metrics.MeterBuilder', + 'io.opentelemetry.contrib.gcp.resource.GCPResourceProvider', + 'io.opentelemetry.sdk.OpenTelemetrySdk', + 'io.opentelemetry.sdk.OpenTelemetrySdkBuilder', + 'io.opentelemetry.sdk.common.CompletableResultCode', + 'io.opentelemetry.sdk.common.export.MemoryMode', + 'io.opentelemetry.sdk.metrics.Aggregation', + 'io.opentelemetry.sdk.metrics.InstrumentSelector', + 'io.opentelemetry.sdk.metrics.InstrumentSelectorBuilder', + 'io.opentelemetry.sdk.metrics.InstrumentType', + 'io.opentelemetry.sdk.metrics.SdkMeterProvider', + 'io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder', + 'io.opentelemetry.sdk.metrics.View', + 'io.opentelemetry.sdk.metrics.ViewBuilder', + 'io.opentelemetry.sdk.metrics.data.AggregationTemporality', + 'io.opentelemetry.sdk.metrics.export.DefaultAggregationSelector', + 'io.opentelemetry.sdk.metrics.export.MetricExporter', + 'io.opentelemetry.sdk.metrics.export.PeriodicMetricReader', + 'io.opentelemetry.sdk.metrics.export.PeriodicMetricReaderBuilder', + 'io.opentelemetry.sdk.resources.Resource', // commons-logging optional dependencies 'org.apache.avalon.framework.logger.Logger', 'org.apache.log.Hierarchy', @@ -209,9 +252,6 @@ thirdPartyAudit { 'javax.jms.Message', 'javax.servlet.ServletContextEvent', 'javax.servlet.ServletContextListener', - // Bump for gax 2.42.0 - 'com.google.api.gax.rpc.EndpointContext', - 'com.google.api.gax.rpc.RequestMutator', 'com.google.api.gax.grpc.GrpcCallContext', 'com.google.api.gax.grpc.GrpcCallSettings', 'com.google.api.gax.grpc.GrpcCallSettings$Builder', @@ -220,153 +260,8 @@ thirdPartyAudit { 'com.google.api.gax.grpc.GrpcStubCallableFactory', 'com.google.api.gax.grpc.InstantiatingGrpcChannelProvider', 'com.google.api.gax.grpc.InstantiatingGrpcChannelProvider$Builder', - 'com.google.api.services.storage.Storage$Objects$Restore', - 'com.google.api.services.storage.model.Bucket$HierarchicalNamespace', - 'com.google.api.services.storage.model.Bucket$ObjectRetention', - 'com.google.api.services.storage.model.Bucket$SoftDeletePolicy', - 'com.google.api.services.storage.model.StorageObject$Retention', 'com.google.cloud.grpc.GrpcTransportOptions', 'com.google.cloud.grpc.GrpcTransportOptions$Builder', - 'com.google.storage.v2.BidiWriteObjectRequest', - 'com.google.storage.v2.BidiWriteObjectRequest$Builder', - 'com.google.storage.v2.BidiWriteObjectResponse', - 'com.google.storage.v2.Bucket', - 'com.google.storage.v2.Bucket$Autoclass', - 'com.google.storage.v2.Bucket$Autoclass$Builder', - 'com.google.storage.v2.Bucket$Billing', - 'com.google.storage.v2.Bucket$Billing$Builder', - 'com.google.storage.v2.Bucket$Builder', - 'com.google.storage.v2.Bucket$Cors', - 'com.google.storage.v2.Bucket$Cors$Builder', - 'com.google.storage.v2.Bucket$CustomPlacementConfig', - 'com.google.storage.v2.Bucket$CustomPlacementConfig$Builder', - 'com.google.storage.v2.Bucket$Encryption', - 'com.google.storage.v2.Bucket$Encryption$Builder', - 'com.google.storage.v2.Bucket$HierarchicalNamespace', - 'com.google.storage.v2.Bucket$HierarchicalNamespace$Builder', - 'com.google.storage.v2.Bucket$IamConfig', - 'com.google.storage.v2.Bucket$IamConfig$Builder', - 'com.google.storage.v2.Bucket$IamConfig$UniformBucketLevelAccess', - 'com.google.storage.v2.Bucket$IamConfig$UniformBucketLevelAccess$Builder', - 'com.google.storage.v2.Bucket$Lifecycle', - 'com.google.storage.v2.Bucket$Lifecycle$Builder', - 'com.google.storage.v2.Bucket$Lifecycle$Rule', - 'com.google.storage.v2.Bucket$Lifecycle$Rule$Action', - 'com.google.storage.v2.Bucket$Lifecycle$Rule$Action$Builder', - 'com.google.storage.v2.Bucket$Lifecycle$Rule$Builder', - 'com.google.storage.v2.Bucket$Lifecycle$Rule$Condition', - 'com.google.storage.v2.Bucket$Lifecycle$Rule$Condition$Builder', - 'com.google.storage.v2.Bucket$Logging', - 'com.google.storage.v2.Bucket$Logging$Builder', - 'com.google.storage.v2.Bucket$RetentionPolicy', - 'com.google.storage.v2.Bucket$RetentionPolicy$Builder', - 'com.google.storage.v2.Bucket$SoftDeletePolicy', - 'com.google.storage.v2.Bucket$SoftDeletePolicy$Builder', - 'com.google.storage.v2.Bucket$Versioning', - 'com.google.storage.v2.Bucket$Versioning$Builder', - 'com.google.storage.v2.Bucket$Website', - 'com.google.storage.v2.Bucket$Website$Builder', - 'com.google.storage.v2.BucketAccessControl', - 'com.google.storage.v2.BucketAccessControl$Builder', - 'com.google.storage.v2.BucketName', - 'com.google.storage.v2.ChecksummedData', - 'com.google.storage.v2.ChecksummedData$Builder', - 'com.google.storage.v2.CommonObjectRequestParams', - 'com.google.storage.v2.CommonObjectRequestParams$Builder', - 'com.google.storage.v2.ComposeObjectRequest', - 'com.google.storage.v2.ComposeObjectRequest$Builder', - 'com.google.storage.v2.ComposeObjectRequest$SourceObject', - 'com.google.storage.v2.ComposeObjectRequest$SourceObject$Builder', - 'com.google.storage.v2.CreateBucketRequest', - 'com.google.storage.v2.CreateBucketRequest$Builder', - 'com.google.storage.v2.CreateHmacKeyRequest', - 'com.google.storage.v2.CreateHmacKeyRequest$Builder', - 'com.google.storage.v2.CreateHmacKeyResponse', - 'com.google.storage.v2.CreateNotificationConfigRequest', - 'com.google.storage.v2.CreateNotificationConfigRequest$Builder', - 'com.google.storage.v2.CryptoKeyName', - 'com.google.storage.v2.CustomerEncryption', - 'com.google.storage.v2.CustomerEncryption$Builder', - 'com.google.storage.v2.DeleteBucketRequest', - 'com.google.storage.v2.DeleteBucketRequest$Builder', - 'com.google.storage.v2.DeleteHmacKeyRequest', - 'com.google.storage.v2.DeleteHmacKeyRequest$Builder', - 'com.google.storage.v2.DeleteNotificationConfigRequest', - 'com.google.storage.v2.DeleteNotificationConfigRequest$Builder', - 'com.google.storage.v2.DeleteObjectRequest', - 'com.google.storage.v2.DeleteObjectRequest$Builder', - 'com.google.storage.v2.GetBucketRequest', - 'com.google.storage.v2.GetBucketRequest$Builder', - 'com.google.storage.v2.GetHmacKeyRequest', - 'com.google.storage.v2.GetHmacKeyRequest$Builder', - 'com.google.storage.v2.GetNotificationConfigRequest', - 'com.google.storage.v2.GetNotificationConfigRequest$Builder', - 'com.google.storage.v2.GetObjectRequest', - 'com.google.storage.v2.GetObjectRequest$Builder', - 'com.google.storage.v2.GetServiceAccountRequest', - 'com.google.storage.v2.GetServiceAccountRequest$Builder', - 'com.google.storage.v2.HmacKeyMetadata', - 'com.google.storage.v2.HmacKeyMetadata$Builder', - 'com.google.storage.v2.ListBucketsRequest', - 'com.google.storage.v2.ListBucketsRequest$Builder', - 'com.google.storage.v2.ListHmacKeysRequest', - 'com.google.storage.v2.ListHmacKeysRequest$Builder', - 'com.google.storage.v2.ListNotificationConfigsRequest', - 'com.google.storage.v2.ListNotificationConfigsRequest$Builder', - 'com.google.storage.v2.ListObjectsRequest', - 'com.google.storage.v2.ListObjectsRequest$Builder', - 'com.google.storage.v2.ListObjectsResponse', - 'com.google.storage.v2.LockBucketRetentionPolicyRequest', - 'com.google.storage.v2.LockBucketRetentionPolicyRequest$Builder', - 'com.google.storage.v2.NotificationConfig', - 'com.google.storage.v2.NotificationConfig$Builder', - 'com.google.storage.v2.NotificationConfigName', - 'com.google.storage.v2.Object', - 'com.google.storage.v2.Object$Builder', - 'com.google.storage.v2.ObjectAccessControl', - 'com.google.storage.v2.ObjectAccessControl$Builder', - 'com.google.storage.v2.ObjectChecksums', - 'com.google.storage.v2.ObjectChecksums$Builder', - 'com.google.storage.v2.Owner', - 'com.google.storage.v2.Owner$Builder', - 'com.google.storage.v2.ProjectName', - 'com.google.storage.v2.QueryWriteStatusRequest', - 'com.google.storage.v2.QueryWriteStatusRequest$Builder', - 'com.google.storage.v2.QueryWriteStatusResponse', - 'com.google.storage.v2.ReadObjectRequest', - 'com.google.storage.v2.ReadObjectRequest$Builder', - 'com.google.storage.v2.ReadObjectResponse', - 'com.google.storage.v2.RestoreObjectRequest', - 'com.google.storage.v2.RestoreObjectRequest$Builder', - 'com.google.storage.v2.RewriteObjectRequest', - 'com.google.storage.v2.RewriteObjectRequest$Builder', - 'com.google.storage.v2.RewriteResponse', - 'com.google.storage.v2.ServiceAccount', - 'com.google.storage.v2.ServiceAccount$Builder', - 'com.google.storage.v2.StartResumableWriteRequest', - 'com.google.storage.v2.StartResumableWriteRequest$Builder', - 'com.google.storage.v2.StartResumableWriteResponse', - 'com.google.storage.v2.StorageClient', - 'com.google.storage.v2.StorageClient$ListBucketsPagedResponse', - 'com.google.storage.v2.StorageClient$ListHmacKeysPagedResponse', - 'com.google.storage.v2.StorageClient$ListNotificationConfigsPagedResponse', - 'com.google.storage.v2.StorageSettings', - 'com.google.storage.v2.StorageSettings$Builder', - 'com.google.storage.v2.UpdateBucketRequest', - 'com.google.storage.v2.UpdateBucketRequest$Builder', - 'com.google.storage.v2.UpdateHmacKeyRequest', - 'com.google.storage.v2.UpdateHmacKeyRequest$Builder', - 'com.google.storage.v2.UpdateObjectRequest', - 'com.google.storage.v2.UpdateObjectRequest$Builder', - 'com.google.storage.v2.WriteObjectRequest', - 'com.google.storage.v2.WriteObjectRequest$Builder', - 'com.google.storage.v2.WriteObjectResponse', - 'com.google.storage.v2.WriteObjectResponse$Builder', - 'com.google.storage.v2.WriteObjectSpec', - 'com.google.storage.v2.WriteObjectSpec$Builder', - 'com.google.storage.v2.stub.GrpcStorageStub', - 'com.google.storage.v2.stub.StorageStub', - 'com.google.storage.v2.stub.StorageStubSettings', 'io.grpc.protobuf.ProtoUtils' ) } diff --git a/plugins/repository-gcs/licenses/api-common-1.8.1.jar.sha1 b/plugins/repository-gcs/licenses/api-common-1.8.1.jar.sha1 deleted file mode 100644 index 7a1c114c6c0fc..0000000000000 --- a/plugins/repository-gcs/licenses/api-common-1.8.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e89befb19b08ad84b262b2f226ab79aefcaa9d7f \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/api-common-2.31.0.jar.sha1 b/plugins/repository-gcs/licenses/api-common-2.31.0.jar.sha1 new file mode 100644 index 0000000000000..f3166427cc8fd --- /dev/null +++ b/plugins/repository-gcs/licenses/api-common-2.31.0.jar.sha1 @@ -0,0 +1 @@ +a559a225c748f2b1f488d0bacb8f28c5d6791295 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/gax-2.35.0.jar.sha1 b/plugins/repository-gcs/licenses/gax-2.35.0.jar.sha1 deleted file mode 100644 index 778922c637dc1..0000000000000 --- a/plugins/repository-gcs/licenses/gax-2.35.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -98d52034cfa6d1b881e16f418894afcfacd89b7a \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/gax-2.48.0.jar.sha1 b/plugins/repository-gcs/licenses/gax-2.48.0.jar.sha1 new file mode 100644 index 0000000000000..e9d03d01ebbf1 --- /dev/null +++ b/plugins/repository-gcs/licenses/gax-2.48.0.jar.sha1 @@ -0,0 +1 @@ +d5a77025803514b79a2b778653e7feb6e7b33ce3 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/gax-httpjson-2.42.0.jar.sha1 b/plugins/repository-gcs/licenses/gax-httpjson-2.42.0.jar.sha1 deleted file mode 100644 index 672506572ed4d..0000000000000 --- a/plugins/repository-gcs/licenses/gax-httpjson-2.42.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4db06bc31c2fb34b0490362e8666c20fdc1fb3f2 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/gax-httpjson-2.48.0.jar.sha1 b/plugins/repository-gcs/licenses/gax-httpjson-2.48.0.jar.sha1 new file mode 100644 index 0000000000000..c8d6f9a663385 --- /dev/null +++ b/plugins/repository-gcs/licenses/gax-httpjson-2.48.0.jar.sha1 @@ -0,0 +1 @@ +157856d9d115e44f2695f69e19b387dbe239cce0 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-api-client-2.2.0.jar.sha1 b/plugins/repository-gcs/licenses/google-api-client-2.2.0.jar.sha1 deleted file mode 100644 index f9604d6837ca9..0000000000000 --- a/plugins/repository-gcs/licenses/google-api-client-2.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -10e53fd4d987e37190432e896bdaa62e8ea2c628 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-api-client-2.5.0.jar.sha1 b/plugins/repository-gcs/licenses/google-api-client-2.5.0.jar.sha1 new file mode 100644 index 0000000000000..4086a87ffdcd1 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-api-client-2.5.0.jar.sha1 @@ -0,0 +1 @@ +ddae09a98fe1f0932d5d78f03e8a2efaf919c773 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-api-services-storage-v1-rev20230617-2.0.0.jar.sha1 b/plugins/repository-gcs/licenses/google-api-services-storage-v1-rev20230617-2.0.0.jar.sha1 deleted file mode 100644 index 1a1452f773b96..0000000000000 --- a/plugins/repository-gcs/licenses/google-api-services-storage-v1-rev20230617-2.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fc3f225b405303fe7cb760d578348b6b07e7ea8b \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-api-services-storage-v1-rev20240319-2.0.0.jar.sha1 b/plugins/repository-gcs/licenses/google-api-services-storage-v1-rev20240319-2.0.0.jar.sha1 new file mode 100644 index 0000000000000..a48b0a9cea985 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-api-services-storage-v1-rev20240319-2.0.0.jar.sha1 @@ -0,0 +1 @@ +1c2c884d3af0571552e7c8178d3cac20175bf634 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-auth-library-credentials-1.23.0.jar.sha1 b/plugins/repository-gcs/licenses/google-auth-library-credentials-1.23.0.jar.sha1 new file mode 100644 index 0000000000000..0941cbb27398a --- /dev/null +++ b/plugins/repository-gcs/licenses/google-auth-library-credentials-1.23.0.jar.sha1 @@ -0,0 +1 @@ +a50ee3611922a0eea9d421c6ddb1db031972a7dc \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-auth-library-credentials-1.7.0.jar.sha1 b/plugins/repository-gcs/licenses/google-auth-library-credentials-1.7.0.jar.sha1 deleted file mode 100644 index f2e9a4f7283bf..0000000000000 --- a/plugins/repository-gcs/licenses/google-auth-library-credentials-1.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b29af5a9ea94e9e7f86bded11e39f5afda5b17e8 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.23.0.jar.sha1 b/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.23.0.jar.sha1 new file mode 100644 index 0000000000000..a8d8aa9112e66 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.23.0.jar.sha1 @@ -0,0 +1 @@ +f9ebd75a55b8e2cfa62e1f66d04a62b46a2f3b70 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.7.0.jar.sha1 b/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.7.0.jar.sha1 deleted file mode 100644 index 738645d6b8c7b..0000000000000 --- a/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -985d183303dbd4b7ceb348056e41e59677f6f74f \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-cloud-core-2.30.0.jar.sha1 b/plugins/repository-gcs/licenses/google-cloud-core-2.30.0.jar.sha1 deleted file mode 100644 index 10f8f90df108f..0000000000000 --- a/plugins/repository-gcs/licenses/google-cloud-core-2.30.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b48ea27cbdccd5f225d8a35ea28e2cd01c25918b \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-cloud-core-2.43.0.jar.sha1 b/plugins/repository-gcs/licenses/google-cloud-core-2.43.0.jar.sha1 new file mode 100644 index 0000000000000..412848120fb18 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-cloud-core-2.43.0.jar.sha1 @@ -0,0 +1 @@ +98eccf5e183e3e1365a16df61027e1582f2e58ba \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-cloud-core-http-2.23.0.jar.sha1 b/plugins/repository-gcs/licenses/google-cloud-core-http-2.23.0.jar.sha1 deleted file mode 100644 index 9db3cbcbec35b..0000000000000 --- a/plugins/repository-gcs/licenses/google-cloud-core-http-2.23.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9913d0806fcfbfbc4a775f29865126ed8465464b \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-cloud-core-http-2.43.0.jar.sha1 b/plugins/repository-gcs/licenses/google-cloud-core-http-2.43.0.jar.sha1 new file mode 100644 index 0000000000000..88e051e994f37 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-cloud-core-http-2.43.0.jar.sha1 @@ -0,0 +1 @@ +07cc45a32cb875e7cd1969815277e20685fd2ad7 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-cloud-storage-2.38.0.jar.sha1 b/plugins/repository-gcs/licenses/google-cloud-storage-2.38.0.jar.sha1 deleted file mode 100644 index 6d21369f8ba91..0000000000000 --- a/plugins/repository-gcs/licenses/google-cloud-storage-2.38.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ea43563754309103c6cfe46c00233dbed7c7b126 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-cloud-storage-2.43.0.jar.sha1 b/plugins/repository-gcs/licenses/google-cloud-storage-2.43.0.jar.sha1 new file mode 100644 index 0000000000000..cea0a272040c3 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-cloud-storage-2.43.0.jar.sha1 @@ -0,0 +1 @@ +02d6692634aa4d63fa21497ada21ab38d5523f80 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-oauth-client-1.34.1.jar.sha1 b/plugins/repository-gcs/licenses/google-oauth-client-1.34.1.jar.sha1 deleted file mode 100644 index a8434bd380761..0000000000000 --- a/plugins/repository-gcs/licenses/google-oauth-client-1.34.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4a4f88c5e13143f882268c98239fb85c3b2c6cb2 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-oauth-client-1.36.0.jar.sha1 b/plugins/repository-gcs/licenses/google-oauth-client-1.36.0.jar.sha1 new file mode 100644 index 0000000000000..25aa7d76f153a --- /dev/null +++ b/plugins/repository-gcs/licenses/google-oauth-client-1.36.0.jar.sha1 @@ -0,0 +1 @@ +dc3f07bc8f49dd52fe8fcc15958f3cfeb003e20f \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/proto-google-cloud-storage-v2-2.43.0-beta.jar.sha1 b/plugins/repository-gcs/licenses/proto-google-cloud-storage-v2-2.43.0-beta.jar.sha1 new file mode 100644 index 0000000000000..7e3b6e9b57ec4 --- /dev/null +++ b/plugins/repository-gcs/licenses/proto-google-cloud-storage-v2-2.43.0-beta.jar.sha1 @@ -0,0 +1 @@ +a4970b3fea8654f2a73affd93618045444d495b7 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/proto-google-common-protos-2.37.1.jar.sha1 b/plugins/repository-gcs/licenses/proto-google-common-protos-2.37.1.jar.sha1 deleted file mode 100644 index 92f991778ccc3..0000000000000 --- a/plugins/repository-gcs/licenses/proto-google-common-protos-2.37.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3b8759ef0468cced72f8f0d4fc3cc57aeb8139f8 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/proto-google-common-protos-2.39.0.jar.sha1 b/plugins/repository-gcs/licenses/proto-google-common-protos-2.39.0.jar.sha1 new file mode 100644 index 0000000000000..d0cfe8e598040 --- /dev/null +++ b/plugins/repository-gcs/licenses/proto-google-common-protos-2.39.0.jar.sha1 @@ -0,0 +1 @@ +1d35833629c1533c9ce5e4028e183153239b8226 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/proto-google-iam-v1-1.33.0.jar.sha1 b/plugins/repository-gcs/licenses/proto-google-iam-v1-1.33.0.jar.sha1 deleted file mode 100644 index ba04056c54697..0000000000000 --- a/plugins/repository-gcs/licenses/proto-google-iam-v1-1.33.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4766da92d1f36c8b612c1c142d5f3ace3774f098 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/proto-google-iam-v1-1.34.0.jar.sha1 b/plugins/repository-gcs/licenses/proto-google-iam-v1-1.34.0.jar.sha1 new file mode 100644 index 0000000000000..86283a2d25583 --- /dev/null +++ b/plugins/repository-gcs/licenses/proto-google-iam-v1-1.34.0.jar.sha1 @@ -0,0 +1 @@ +a76b65f0ac9032bed4492d0d8fb0ff418546b538 \ No newline at end of file From a2203ec94e4ac10c5503a2e1277d4339ad7f03ad Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 23 Sep 2024 16:44:06 -0400 Subject: [PATCH 07/13] Update google_auth Signed-off-by: Craig Perkins --- plugins/repository-gcs/build.gradle | 2 +- .../licenses/google-auth-library-credentials-1.23.0.jar.sha1 | 1 - .../licenses/google-auth-library-credentials-1.27.0.jar.sha1 | 1 + .../licenses/google-auth-library-oauth2-http-1.23.0.jar.sha1 | 1 - .../licenses/google-auth-library-oauth2-http-1.27.0.jar.sha1 | 1 + 5 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 plugins/repository-gcs/licenses/google-auth-library-credentials-1.23.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/google-auth-library-credentials-1.27.0.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.23.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.27.0.jar.sha1 diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 6a9ebeefcc5d2..7c3fecbe6d532 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -48,7 +48,7 @@ opensearchplugin { } versions << [ - 'google_auth': '1.23.0' + 'google_auth': '1.27.0' ] dependencies { diff --git a/plugins/repository-gcs/licenses/google-auth-library-credentials-1.23.0.jar.sha1 b/plugins/repository-gcs/licenses/google-auth-library-credentials-1.23.0.jar.sha1 deleted file mode 100644 index 0941cbb27398a..0000000000000 --- a/plugins/repository-gcs/licenses/google-auth-library-credentials-1.23.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a50ee3611922a0eea9d421c6ddb1db031972a7dc \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-auth-library-credentials-1.27.0.jar.sha1 b/plugins/repository-gcs/licenses/google-auth-library-credentials-1.27.0.jar.sha1 new file mode 100644 index 0000000000000..d1b818135e677 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-auth-library-credentials-1.27.0.jar.sha1 @@ -0,0 +1 @@ +919145860d1c9d7a7493362f6d18f3a0fb088442 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.23.0.jar.sha1 b/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.23.0.jar.sha1 deleted file mode 100644 index a8d8aa9112e66..0000000000000 --- a/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.23.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f9ebd75a55b8e2cfa62e1f66d04a62b46a2f3b70 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.27.0.jar.sha1 b/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.27.0.jar.sha1 new file mode 100644 index 0000000000000..7bcd8ca044032 --- /dev/null +++ b/plugins/repository-gcs/licenses/google-auth-library-oauth2-http-1.27.0.jar.sha1 @@ -0,0 +1 @@ +2ae205e98f5bd68a4f47e5fbc1d523d932d5a391 \ No newline at end of file From 49547274f5f88995f6166f15bc7990c46bba325f Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 23 Sep 2024 17:13:48 -0400 Subject: [PATCH 08/13] WIP on fixing docker-compose issues Signed-off-by: Craig Perkins --- .../org/opensearch/gradle/docker/DockerSupportService.java | 5 +---- .../opensearch/gradle/testfixtures/TestFixturesPlugin.java | 2 +- test/fixtures/gcs-fixture/docker-compose.yml | 5 ++++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/main/java/org/opensearch/gradle/docker/DockerSupportService.java b/buildSrc/src/main/java/org/opensearch/gradle/docker/DockerSupportService.java index fc78792bb3551..669a95cf029a0 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/docker/DockerSupportService.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/docker/DockerSupportService.java @@ -125,10 +125,7 @@ public DockerAvailability getDockerAvailability() { lastResult = runCommand(dockerPath, "images"); // If docker all checks out, see if docker-compose is available and working - Optional composePath = getDockerComposePath(); - if (lastResult.isSuccess() && composePath.isPresent()) { - isComposeAvailable = runCommand(composePath.get(), "version").isSuccess(); - } + isComposeAvailable = runCommand(dockerPath, "compose", "version").isSuccess(); } } } diff --git a/buildSrc/src/main/java/org/opensearch/gradle/testfixtures/TestFixturesPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/testfixtures/TestFixturesPlugin.java index e8772522b19a4..777bdb30aeff1 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/testfixtures/TestFixturesPlugin.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/testfixtures/TestFixturesPlugin.java @@ -171,7 +171,7 @@ public void execute(Task task) { .findFirst(); composeExtension.getExecutable().set(dockerCompose.isPresent() ? dockerCompose.get() : "/usr/bin/docker"); - composeExtension.getUseDockerComposeV2().set(false); + composeExtension.getUseDockerComposeV2().set(true); tasks.named("composeUp").configure(t -> { // Avoid running docker-compose tasks in parallel in CI due to some issues on certain Linux distributions diff --git a/test/fixtures/gcs-fixture/docker-compose.yml b/test/fixtures/gcs-fixture/docker-compose.yml index 30a362e7caa8d..2be4f91a05a25 100644 --- a/test/fixtures/gcs-fixture/docker-compose.yml +++ b/test/fixtures/gcs-fixture/docker-compose.yml @@ -1,6 +1,6 @@ -version: '3' services: gcs-fixture: + image: gcs_fixture_image build: context: . args: @@ -13,6 +13,7 @@ services: ports: - "80" gcs-fixture-third-party: + image: gcs_fixture_image build: context: . args: @@ -25,6 +26,7 @@ services: ports: - "80" gcs-fixture-other: + image: gcs_fixture_image build: context: . args: @@ -37,6 +39,7 @@ services: ports: - "80" gcs-fixture-repositories-metering: + image: gcs_fixture_image build: context: . args: From 7f1daceb99ebb39369431f875be8755991f3a5ad Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 23 Sep 2024 18:18:54 -0400 Subject: [PATCH 09/13] Update references for docker-compose to docker compose Signed-off-by: Craig Perkins --- .../gradle/docker/DockerSupportService.java | 25 +------------------ .../testfixtures/TestFixturesPlugin.java | 2 +- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/buildSrc/src/main/java/org/opensearch/gradle/docker/DockerSupportService.java b/buildSrc/src/main/java/org/opensearch/gradle/docker/DockerSupportService.java index fc78792bb3551..fe4988bddca82 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/docker/DockerSupportService.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/docker/DockerSupportService.java @@ -75,15 +75,6 @@ public abstract class DockerSupportService implements BuildService composePath = getDockerComposePath(); - if (lastResult.isSuccess() && composePath.isPresent()) { - isComposeAvailable = runCommand(composePath.get(), "version").isSuccess(); - } + isComposeAvailable = runCommand(dockerPath, "compose", "version").isSuccess(); } } } @@ -287,17 +275,6 @@ private Optional getDockerPath() { return Arrays.asList(DOCKER_BINARIES).stream().filter(path -> new File(path).exists()).findFirst(); } - /** - * Searches the entries in {@link #DOCKER_COMPOSE_BINARIES} for the Docker Compose CLI. This method does - * not check whether the installation appears usable, see {@link #getDockerAvailability()} instead. - * - * @return the path to a CLI, if available. - */ - private Optional getDockerComposePath() { - // Check if the Docker binary exists - return Arrays.asList(DOCKER_COMPOSE_BINARIES).stream().filter(path -> new File(path).exists()).findFirst(); - } - private void throwDockerRequiredException(final String message) { throwDockerRequiredException(message, null); } diff --git a/buildSrc/src/main/java/org/opensearch/gradle/testfixtures/TestFixturesPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/testfixtures/TestFixturesPlugin.java index e8772522b19a4..777bdb30aeff1 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/testfixtures/TestFixturesPlugin.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/testfixtures/TestFixturesPlugin.java @@ -171,7 +171,7 @@ public void execute(Task task) { .findFirst(); composeExtension.getExecutable().set(dockerCompose.isPresent() ? dockerCompose.get() : "/usr/bin/docker"); - composeExtension.getUseDockerComposeV2().set(false); + composeExtension.getUseDockerComposeV2().set(true); tasks.named("composeUp").configure(t -> { // Avoid running docker-compose tasks in parallel in CI due to some issues on certain Linux distributions From e871dbb4ed01cb10fa2608065bef70f66c76fee0 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 23 Sep 2024 19:04:10 -0400 Subject: [PATCH 10/13] Support both Signed-off-by: Craig Perkins --- .../gradle/docker/DockerSupportService.java | 36 ++++++++++++++++++- .../testfixtures/TestFixturesPlugin.java | 6 +++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/java/org/opensearch/gradle/docker/DockerSupportService.java b/buildSrc/src/main/java/org/opensearch/gradle/docker/DockerSupportService.java index fe4988bddca82..77d7997d6d48d 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/docker/DockerSupportService.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/docker/DockerSupportService.java @@ -75,6 +75,15 @@ public abstract class DockerSupportService implements BuildService dockerBinary = getDockerPath(); @@ -116,7 +126,12 @@ public DockerAvailability getDockerAvailability() { lastResult = runCommand(dockerPath, "images"); // If docker all checks out, see if docker-compose is available and working - isComposeAvailable = runCommand(dockerPath, "compose", "version").isSuccess(); + Optional composePath = getDockerComposePath(); + if (lastResult.isSuccess() && composePath.isPresent()) { + isComposeAvailable = runCommand(composePath.get(), "version").isSuccess(); + } + + isComposeV2Available = runCommand(dockerPath, "compose", "version").isSuccess(); } } } @@ -126,6 +141,7 @@ public DockerAvailability getDockerAvailability() { this.dockerAvailability = new DockerAvailability( isAvailable, isComposeAvailable, + isComposeV2Available, isVersionHighEnough, dockerPath, version, @@ -275,6 +291,17 @@ private Optional getDockerPath() { return Arrays.asList(DOCKER_BINARIES).stream().filter(path -> new File(path).exists()).findFirst(); } + /** + * Searches the entries in {@link #DOCKER_COMPOSE_BINARIES} for the Docker Compose CLI. This method does + * not check whether the installation appears usable, see {@link #getDockerAvailability()} instead. + * + * @return the path to a CLI, if available. + */ + private Optional getDockerComposePath() { + // Check if the Docker binary exists + return Arrays.asList(DOCKER_COMPOSE_BINARIES).stream().filter(path -> new File(path).exists()).findFirst(); + } + private void throwDockerRequiredException(final String message) { throwDockerRequiredException(message, null); } @@ -333,6 +360,11 @@ public static class DockerAvailability { */ public final boolean isComposeAvailable; + /** + * True if docker compose is available. + */ + public final boolean isComposeV2Available; + /** * True if the installed Docker version is >= 17.05 */ @@ -356,6 +388,7 @@ public static class DockerAvailability { DockerAvailability( boolean isAvailable, boolean isComposeAvailable, + boolean isComposeV2Available, boolean isVersionHighEnough, String path, Version version, @@ -363,6 +396,7 @@ public static class DockerAvailability { ) { this.isAvailable = isAvailable; this.isComposeAvailable = isComposeAvailable; + this.isComposeV2Available = isComposeV2Available; this.isVersionHighEnough = isVersionHighEnough; this.path = path; this.version = version; diff --git a/buildSrc/src/main/java/org/opensearch/gradle/testfixtures/TestFixturesPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/testfixtures/TestFixturesPlugin.java index 777bdb30aeff1..25d034e745ff1 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/testfixtures/TestFixturesPlugin.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/testfixtures/TestFixturesPlugin.java @@ -171,7 +171,11 @@ public void execute(Task task) { .findFirst(); composeExtension.getExecutable().set(dockerCompose.isPresent() ? dockerCompose.get() : "/usr/bin/docker"); - composeExtension.getUseDockerComposeV2().set(true); + if (dockerSupport.get().getDockerAvailability().isComposeAvailable) { + composeExtension.getUseDockerComposeV2().set(false); + } else if (dockerSupport.get().getDockerAvailability().isComposeV2Available) { + composeExtension.getUseDockerComposeV2().set(true); + } tasks.named("composeUp").configure(t -> { // Avoid running docker-compose tasks in parallel in CI due to some issues on certain Linux distributions From c82fabac66970b513eac46e3ebcf57f59baa965e Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 23 Sep 2024 19:08:01 -0400 Subject: [PATCH 11/13] Check if V2 is available Signed-off-by: Craig Perkins --- .../gradle/testfixtures/TestFixturesPlugin.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/java/org/opensearch/gradle/testfixtures/TestFixturesPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/testfixtures/TestFixturesPlugin.java index 25d034e745ff1..f65e231cd2e50 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/testfixtures/TestFixturesPlugin.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/testfixtures/TestFixturesPlugin.java @@ -171,10 +171,10 @@ public void execute(Task task) { .findFirst(); composeExtension.getExecutable().set(dockerCompose.isPresent() ? dockerCompose.get() : "/usr/bin/docker"); - if (dockerSupport.get().getDockerAvailability().isComposeAvailable) { - composeExtension.getUseDockerComposeV2().set(false); - } else if (dockerSupport.get().getDockerAvailability().isComposeV2Available) { + if (dockerSupport.get().getDockerAvailability().isComposeV2Available) { composeExtension.getUseDockerComposeV2().set(true); + } else if (dockerSupport.get().getDockerAvailability().isComposeAvailable) { + composeExtension.getUseDockerComposeV2().set(false); } tasks.named("composeUp").configure(t -> { @@ -232,7 +232,8 @@ private void maybeSkipTask(Provider dockerSupport, TaskPro private void maybeSkipTask(Provider dockerSupport, Task task) { task.onlyIf(spec -> { - boolean isComposeAvailable = dockerSupport.get().getDockerAvailability().isComposeAvailable; + boolean isComposeAvailable = dockerSupport.get().getDockerAvailability().isComposeV2Available + || dockerSupport.get().getDockerAvailability().isComposeAvailable; if (isComposeAvailable == false) { LOGGER.info("Task {} requires docker-compose but it is unavailable. Task will be skipped.", task.getPath()); } From 5ab9fe37f90e35ed2cd973799ba6d6cacb27b11d Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 23 Sep 2024 19:57:14 -0400 Subject: [PATCH 12/13] Add to CHANGELOG Signed-off-by: Craig Perkins --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32fdfab619b3e..a9e9f78ac9be1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Update protobuf from 3.25.4 to 3.25.5 ([#16011](https://github.com/opensearch-project/OpenSearch/pull/16011)) ### Changed +- Update references for docker-compose to docker compose ([#16049](https://github.com/opensearch-project/OpenSearch/pull/16049)) ### Deprecated From 4b6ecf86abecf6e3f12626b2325a9ce28e5d8970 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 23 Sep 2024 20:23:53 -0400 Subject: [PATCH 13/13] Update CHANGELOG text Signed-off-by: Craig Perkins --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9e9f78ac9be1..e627fe008dfb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,7 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Update protobuf from 3.25.4 to 3.25.5 ([#16011](https://github.com/opensearch-project/OpenSearch/pull/16011)) ### Changed -- Update references for docker-compose to docker compose ([#16049](https://github.com/opensearch-project/OpenSearch/pull/16049)) +- Add support for docker compose v2 in TestFixturesPlugin ([#16049](https://github.com/opensearch-project/OpenSearch/pull/16049)) ### Deprecated