From c659360e5c0a959ad3a893a3a4e13bf7f5cf039d Mon Sep 17 00:00:00 2001 From: HeisenbergTT Date: Wed, 29 Oct 2014 11:14:39 +0800 Subject: [PATCH 1/5] Update to es 1.3.4 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index afb4932..00b15d7 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.github.tlrx elasticsearch-test - 1.2.2-SNAPSHOT + 1.3.4 jar elasticsearch-test elasticsearch-test, a framework that makes ElasticSearch unit testing a breeze @@ -18,7 +18,7 @@ UTF-8 - 1.2.2 + 1.3.4 github From 18d40c77d7531e3cd8786297e07258ae0be8e150 Mon Sep 17 00:00:00 2001 From: HeisenbergTT Date: Wed, 29 Oct 2014 11:28:19 +0800 Subject: [PATCH 2/5] Update to es 1.3.4 --- LICENSE | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..6fe2312 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright 2013 Mesosphere + +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. From 1493fe9c9c2cc564034bf8a501a7205594bf7734 Mon Sep 17 00:00:00 2001 From: Ryan Braley Date: Tue, 3 Feb 2015 14:15:48 +0800 Subject: [PATCH 3/5] Bump ES version to 1.4.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 00b15d7..a9afb46 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.github.tlrx elasticsearch-test - 1.3.4 + 1.4.2 jar elasticsearch-test elasticsearch-test, a framework that makes ElasticSearch unit testing a breeze @@ -18,7 +18,7 @@ UTF-8 - 1.3.4 + 1.4.2 github From 3df7f8b72137aa4740094490b1a3c2c49d6ef506 Mon Sep 17 00:00:00 2001 From: Ryan Braley Date: Tue, 3 Feb 2015 14:19:35 +0800 Subject: [PATCH 4/5] fix README to 1.4.2 --- README.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.textile b/README.textile index b3eed40..0b0dc91 100644 --- a/README.textile +++ b/README.textile @@ -11,7 +11,7 @@ Here you will find: h3. Versions |_. elasticsearch-test |_. ElasticSearch| -| master (1.2.2-SNAPSHOT) | 1.2.2 | +| master (1.4.2) | 1.4.2 | | 1.2.1 | 1.2.1 | | 1.1.0 | 1.1.0 | | 0.90.6 | 0.90.6 | From 693866d160343ee2a9f1d6f54d73c7d159c9a545 Mon Sep 17 00:00:00 2001 From: Ryan Braley Date: Wed, 21 Oct 2015 09:58:06 +0800 Subject: [PATCH 5/5] finished t5366 (1) update elasticsearch-test to 1.7.2 [0.5] --- README.textile | 3 ++- pom.xml | 4 ++-- .../github/tlrx/elasticsearch/test/request/CreateIndex.java | 2 +- .../ElasticsearchBulkRequestAnnotationHandler.java | 2 +- .../tlrx/elasticsearch/samples/indices/OptimizeTest.java | 1 - 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.textile b/README.textile index 0b0dc91..77ac66c 100644 --- a/README.textile +++ b/README.textile @@ -11,7 +11,8 @@ Here you will find: h3. Versions |_. elasticsearch-test |_. ElasticSearch| -| master (1.4.2) | 1.4.2 | +| master(1.7.2) | 1.72 | +| 1.4.2 | 1.4.2 | | 1.2.1 | 1.2.1 | | 1.1.0 | 1.1.0 | | 0.90.6 | 0.90.6 | diff --git a/pom.xml b/pom.xml index a9afb46..f61a3c4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.github.tlrx elasticsearch-test - 1.4.2 + 1.7.2 jar elasticsearch-test elasticsearch-test, a framework that makes ElasticSearch unit testing a breeze @@ -18,7 +18,7 @@ UTF-8 - 1.4.2 + 1.7.2 github diff --git a/src/main/java/com/github/tlrx/elasticsearch/test/request/CreateIndex.java b/src/main/java/com/github/tlrx/elasticsearch/test/request/CreateIndex.java index 1e591b6..bd33c44 100644 --- a/src/main/java/com/github/tlrx/elasticsearch/test/request/CreateIndex.java +++ b/src/main/java/com/github/tlrx/elasticsearch/test/request/CreateIndex.java @@ -104,7 +104,7 @@ public Void execute(final Client client) throws ElasticsearchException { bulkRequestBuilder = client.prepareBulk(); for (JSONProvider jsonProvider : bulks) { byte[] content = jsonProvider.toJson().getBytes("UTF-8"); - bulkRequestBuilder.add(content, 0, content.length, true); + bulkRequestBuilder.add(content, 0, content.length); } } diff --git a/src/main/java/com/github/tlrx/elasticsearch/test/support/junit/handlers/annotations/ElasticsearchBulkRequestAnnotationHandler.java b/src/main/java/com/github/tlrx/elasticsearch/test/support/junit/handlers/annotations/ElasticsearchBulkRequestAnnotationHandler.java index b8a6364..82690ad 100644 --- a/src/main/java/com/github/tlrx/elasticsearch/test/support/junit/handlers/annotations/ElasticsearchBulkRequestAnnotationHandler.java +++ b/src/main/java/com/github/tlrx/elasticsearch/test/support/junit/handlers/annotations/ElasticsearchBulkRequestAnnotationHandler.java @@ -59,7 +59,7 @@ public void handleBefore(Annotation annotation, Object instance, Map