honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Watcher and Shield should depend on same guava version. 

This causes hellaciousness at least with eclipse, possibly qa tests
too. the sanitiser just wants 11+, so make it the same version
as shield's (dragged in by jimfs).

Also remove unnecessary usage of guava in a test

Original commit: elastic/x-pack-elasticsearch@ea9ac88fdc
This commit is contained in:
Robert Muir 2015-11-23 19:52:01 -05:00
parent 3f856e7939
commit 415dff083f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
watcher/build.gradle
View File

@ -22,7 +22,7 @@ dependencies {
provided project(path: ':x-plugins:shield', configuration: 'runtime') provided project(path: ':x-plugins:shield', configuration: 'runtime')
compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:r239' compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:r239'
compile 'com.google.guava:guava:19.0-rc2' compile 'com.google.guava:guava:16.0.1'
compile 'com.google.code.findbugs:jsr305:3.0.1' compile 'com.google.code.findbugs:jsr305:3.0.1'
compile 'com.sun.mail:javax.mail:1.5.3' compile 'com.sun.mail:javax.mail:1.5.3'
compile 'javax.activation:activation:1.1.1' compile 'javax.activation:activation:1.1.1'

5
watcher/src/test/java/org/elasticsearch/watcher/transform/search/SearchTransformTests.java
View File

@ -5,8 +5,6 @@
*/ */
package org.elasticsearch.watcher.transform.search; package org.elasticsearch.watcher.transform.search;
import com.google.common.base.Charsets;
import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptRequest; import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptRequest;
import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchResponse;
@ -53,6 +51,7 @@ import org.joda.time.chrono.ISOChronology;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
@ -199,7 +198,7 @@ public class SearchTransformTests extends ESIntegTestCase {
assertThat(map.get("query"), instanceOf(String.class)); assertThat(map.get("query"), instanceOf(String.class));
String queryAsBase64 = (String) map.get("query"); String queryAsBase64 = (String) map.get("query");
String decodedQuery = new String(Base64.decode(queryAsBase64), Charsets.UTF_8); String decodedQuery = new String(Base64.decode(queryAsBase64), StandardCharsets.UTF_8);
assertThat(decodedQuery, containsString("_unknown_query_")); assertThat(decodedQuery, containsString("_unknown_query_"));
} }