diff --git a/core/pom.xml b/core/pom.xml index 2424c8e2e4d..023d9296fa6 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -104,10 +104,6 @@ - - com.google.guava - guava - com.carrotsearch hppc diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java index 2ecd4fbbe0d..8c856beaf65 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java @@ -19,8 +19,6 @@ package org.elasticsearch.action.admin.cluster.snapshots.status; -import com.google.common.collect.ImmutableMap; - import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.FailedNodeException; diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java index 0f9bd677a7b..70f49750f19 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java @@ -21,7 +21,6 @@ package org.elasticsearch.action.admin.cluster.snapshots.status; import com.carrotsearch.hppc.cursors.ObjectCursor; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; -import com.google.common.collect.ImmutableMap; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; @@ -208,7 +207,7 @@ public class TransportSnapshotsStatusAction extends TransportMasterNodeAction shardStatusBuilder = new ArrayList<>(); if (snapshot.state().completed()) { Map shardStatues = snapshotsService.snapshotShards(snapshotId); - for (ImmutableMap.Entry shardStatus : shardStatues.entrySet()) { + for (Map.Entry shardStatus : shardStatues.entrySet()) { shardStatusBuilder.add(new SnapshotIndexShardStatus(shardStatus.getKey(), shardStatus.getValue())); } final SnapshotsInProgress.State state; diff --git a/core/src/main/java/org/elasticsearch/client/node/NodeClient.java b/core/src/main/java/org/elasticsearch/client/node/NodeClient.java index 11108397321..74938875648 100644 --- a/core/src/main/java/org/elasticsearch/client/node/NodeClient.java +++ b/core/src/main/java/org/elasticsearch/client/node/NodeClient.java @@ -19,7 +19,6 @@ package org.elasticsearch.client.node; -import com.google.common.collect.ImmutableMap; import org.elasticsearch.action.*; import org.elasticsearch.action.support.TransportAction; import org.elasticsearch.client.support.AbstractClient; diff --git a/core/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java b/core/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java index 89a0e9193b8..cc65106946a 100644 --- a/core/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java +++ b/core/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster; -import com.google.common.collect.ImmutableMap; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.settings.Settings; diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/BaseFuture.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/BaseFuture.java index cd5789f5d79..6d2216d9daa 100644 --- a/core/src/main/java/org/elasticsearch/common/util/concurrent/BaseFuture.java +++ b/core/src/main/java/org/elasticsearch/common/util/concurrent/BaseFuture.java @@ -26,43 +26,6 @@ import java.util.Objects; import java.util.concurrent.*; import java.util.concurrent.locks.AbstractQueuedSynchronizer; -/** - * An abstract implementation of the {@link com.google.common.util.concurrent.ListenableFuture} interface. This - * class is preferable to {@link java.util.concurrent.FutureTask} for two - * reasons: It implements {@code ListenableFuture}, and it does not implement - * {@code Runnable}. (If you want a {@code Runnable} implementation of {@code - * ListenableFuture}, create a {@link com.google.common.util.concurrent.ListenableFutureTask}, or submit your - * tasks to a {@link com.google.common.util.concurrent.ListeningExecutorService}.) - *

- * This class implements all methods in {@code ListenableFuture}. - * Subclasses should provide a way to set the result of the computation through - * the protected methods {@link #set(Object)} and - * {@link #setException(Throwable)}. Subclasses may also override {@link - * #interruptTask()}, which will be invoked automatically if a call to {@link - * #cancel(boolean) cancel(true)} succeeds in canceling the future. - *

- * {@code AbstractFuture} uses an {@link AbstractQueuedSynchronizer} to deal - * with concurrency issues and guarantee thread safety. - *

- * The state changing methods all return a boolean indicating success or - * failure in changing the future's state. Valid states are running, - * completed, failed, or cancelled. - *

- * This class uses an {@link com.google.common.util.concurrent.ExecutionList} to guarantee that all registered - * listeners will be executed, either when the future finishes or, for listeners - * that are added after the future completes, immediately. - * {@code Runnable}-{@code Executor} pairs are stored in the execution list but - * are not necessarily executed in the order in which they were added. (If a - * listener is added after the Future is complete, it will be executed - * immediately, even if earlier listeners have not been executed. Additionally, - * executors need not guarantee FIFO execution, or different listeners may run - * in different executors.) - * - * @author Sven Mawson - * @since 1.0 - */ -// Same as AbstractFuture from Guava, but without the listeners and with -// additional assertions public abstract class BaseFuture implements Future { /** diff --git a/core/src/main/java/org/elasticsearch/transport/TransportService.java b/core/src/main/java/org/elasticsearch/transport/TransportService.java index 1d248538b75..964cfacc8c1 100644 --- a/core/src/main/java/org/elasticsearch/transport/TransportService.java +++ b/core/src/main/java/org/elasticsearch/transport/TransportService.java @@ -19,7 +19,6 @@ package org.elasticsearch.transport; -import com.google.common.collect.ImmutableMap; import org.elasticsearch.action.admin.cluster.node.liveness.TransportLivenessAction; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.Strings; diff --git a/dev-tools/src/main/resources/forbidden/all-signatures.txt b/dev-tools/src/main/resources/forbidden/all-signatures.txt index fcd216f1e27..f9fba0ab3f7 100644 --- a/dev-tools/src/main/resources/forbidden/all-signatures.txt +++ b/dev-tools/src/main/resources/forbidden/all-signatures.txt @@ -87,57 +87,6 @@ java.net.InetAddress#getCanonicalHostName() java.net.InetSocketAddress#getHostName() @ Use getHostString() instead, which avoids a DNS lookup -@defaultMessage avoid adding additional dependencies on Guava -com.google.common.collect.Lists -com.google.common.collect.ImmutableList -com.google.common.base.Objects -com.google.common.base.Predicate -com.google.common.base.Predicates -com.google.common.base.Strings -com.google.common.base.Throwables -com.google.common.collect.Maps -com.google.common.collect.ForwardingSet -com.google.common.collect.Sets -com.google.common.base.Preconditions -com.google.common.collect.ImmutableSortedSet -com.google.common.collect.Queues -com.google.common.util.concurrent.ListenableFuture -com.google.common.util.concurrent.SettableFuture -com.google.common.util.concurrent.Futures -com.google.common.util.concurrent.MoreExecutors -com.google.common.collect.ImmutableSortedMap -com.google.common.base.Charsets -com.google.common.base.Function -com.google.common.collect.Collections2 -com.google.common.cache.LoadingCache -com.google.common.cache.CacheLoader -com.google.common.collect.Iterables -com.google.common.util.concurrent.UncheckedExecutionException -com.google.common.util.concurrent.AtomicLongMap -com.google.common.primitives.Longs -com.google.common.io.ByteStreams -com.google.common.collect.UnmodifiableIterator -com.google.common.collect.ObjectArrays -com.google.common.collect.Multimap -com.google.common.collect.MultimapBuilder -com.google.common.math.LongMath -com.google.common.base.Joiner -com.google.common.collect.ArrayListMultimap -com.google.common.collect.HashMultimap -com.google.common.collect.FluentIterable -com.google.common.io.Files -com.google.common.primitives.Ints -com.google.common.collect.ImmutableSet -com.google.common.collect.ImmutableSet$Builder -com.google.common.io.Resources -com.google.common.hash.HashCode -com.google.common.hash.HashFunction -com.google.common.hash.Hashing -com.google.common.collect.Iterators -com.google.common.net.InetAddresses -com.google.common.collect.ImmutableMap -com.google.common.collect.ImmutableMap$Builder - @defaultMessage Do not violate java's access system java.lang.reflect.AccessibleObject#setAccessible(boolean) java.lang.reflect.AccessibleObject#setAccessible(java.lang.reflect.AccessibleObject[], boolean) diff --git a/dev-tools/src/main/resources/forbidden/third-party-signatures.txt b/dev-tools/src/main/resources/forbidden/third-party-signatures.txt index 9979f8c221a..ac1ce33ac92 100644 --- a/dev-tools/src/main/resources/forbidden/third-party-signatures.txt +++ b/dev-tools/src/main/resources/forbidden/third-party-signatures.txt @@ -14,9 +14,6 @@ # either express or implied. See the License for the specific # language governing permissions and limitations under the License. -@defaultMessage Use Long.compare instead we are on Java7 -com.google.common.primitives.Longs#compare(long,long) - @defaultMessage unsafe encoders/decoders have problems in the lzf compress library. Use variants of encode/decode functions which take Encoder/Decoder. com.ning.compress.lzf.impl.UnsafeChunkEncoders#createEncoder(int) com.ning.compress.lzf.impl.UnsafeChunkEncoders#createNonAllocatingEncoder(int) @@ -67,5 +64,3 @@ org.joda.time.DateTime#(int, int, int, int, int, int) org.joda.time.DateTime#(int, int, int, int, int, int, int) org.joda.time.DateTime#now() org.joda.time.DateTimeZone#getDefault() - -com.google.common.collect.Iterators#emptyIterator() @ Use Collections.emptyIterator instead \ No newline at end of file diff --git a/distribution/licenses/guava-18.0.jar.sha1 b/distribution/licenses/guava-18.0.jar.sha1 deleted file mode 100644 index 4e97237b0b2..00000000000 --- a/distribution/licenses/guava-18.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cce0823396aa693798f8882e64213b1772032b09 diff --git a/distribution/licenses/guava-LICENSE.txt b/distribution/licenses/guava-LICENSE.txt deleted file mode 100644 index d6456956733..00000000000 --- a/distribution/licenses/guava-LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/distribution/licenses/guava-NOTICE.txt b/distribution/licenses/guava-NOTICE.txt deleted file mode 100644 index 8d1c8b69c3f..00000000000 --- a/distribution/licenses/guava-NOTICE.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/plugins/pom.xml b/plugins/pom.xml index d080a55e82f..1502b8be925 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -119,11 +119,6 @@ compiler provided - - com.google.guava - guava - provided - com.carrotsearch hppc diff --git a/pom.xml b/pom.xml index cb04331c7d8..41b0f6e6a24 100644 --- a/pom.xml +++ b/pom.xml @@ -332,12 +332,6 @@ ${lucene.maven.version} - - com.google.guava - guava - 18.0 - - com.carrotsearch hppc diff --git a/qa/smoke-test-multinode/pom.xml b/qa/smoke-test-multinode/pom.xml index a4788ddd1f6..75bd37f6041 100644 --- a/qa/smoke-test-multinode/pom.xml +++ b/qa/smoke-test-multinode/pom.xml @@ -105,11 +105,6 @@ compiler provided - - com.google.guava - guava - provided - com.carrotsearch hppc diff --git a/qa/smoke-test-plugins/pom.xml b/qa/smoke-test-plugins/pom.xml index f9d4b79080a..3e5563139ed 100644 --- a/qa/smoke-test-plugins/pom.xml +++ b/qa/smoke-test-plugins/pom.xml @@ -110,11 +110,6 @@ compiler provided - - com.google.guava - guava - provided - com.carrotsearch hppc