sogive-runs

Author: DW-Stross

builder/com/winterwell/es/BuildESJavaClient.java

@@ -26,14 +26,24 @@ public List<BuildTask> getDependencies() {
 		List<BuildTask> deps = new ArrayList(super.getDependencies());
 
 		MavenDependencyTask mdt = new MavenDependencyTask();
+		// This broke the logger (and hence everything 'cos Log4J is like that)
+//<<<<<<< HEAD
+//		mdt.addDependency("com.google.guava", "guava", "28.1-jre");
+//		mdt.setIncSrc(true);
+//		mdt.addDependency("org.elasticsearch", "elasticsearch", "5.6.16");
+//		// needed by ES -- how is this not added by ES itself??
+//		// https://www.elastic.co/guide/en/elasticsearch/client/java-api/current/_log4j_2_logger.html
+//		mdt.addDependency("org.apache.logging.log4j", "log4j-core", "2.11.1");
+//		
+//		deps.add(0, mdt);		
+//=======
 		mdt.addDependency("com.google.guava", "guava", "28.1-jre");
-		mdt.setIncSrc(true);
-		mdt.addDependency("org.elasticsearch", "elasticsearch", "5.6.16");
+//		mdt.setIncSrc(true);
+		mdt.addDependency("org.elasticsearch", "elasticsearch", "5.3.3"); // TODO upgrade ES
 		// needed by ES -- how is this not added by ES itself??
 		// https://www.elastic.co/guide/en/elasticsearch/client/java-api/current/_log4j_2_logger.html
-		mdt.addDependency("org.apache.logging.log4j", "log4j-core", "2.11.1");
-		
-		deps.add(0, mdt);		
+		mdt.addDependency("org.apache.logging.log4j", "log4j-core", "2.11.1");		
+		deps.add(0, mdt);
 		// WW projects
 		deps.add(new BuildUtils());
 		deps.add(new BuildWeb());

src/com/winterwell/es/client/DummyClient.java

@@ -20,9 +20,6 @@
 import org.elasticsearch.action.explain.ExplainRequest;
 import org.elasticsearch.action.explain.ExplainRequestBuilder;
 import org.elasticsearch.action.explain.ExplainResponse;
-import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequest;
-import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequestBuilder;
-import org.elasticsearch.action.fieldcaps.FieldCapabilitiesResponse;
 //import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequest;
 //import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequestBuilder;
 //import org.elasticsearch.action.fieldcaps.FieldCapabilitiesResponse;
@@ -498,22 +495,22 @@ public Client filterWithHeader(Map<String, String> headers) {
 		return null;
 	}
 
-	@Override
-	public ActionFuture<FieldCapabilitiesResponse> fieldCaps(FieldCapabilitiesRequest arg0) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public void fieldCaps(FieldCapabilitiesRequest arg0, ActionListener<FieldCapabilitiesResponse> arg1) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public FieldCapabilitiesRequestBuilder prepareFieldCaps() {
-		// TODO Auto-generated method stub
-		return null;
-	}
+//	@Override
+//	public ActionFuture<FieldCapabilitiesResponse> fieldCaps(FieldCapabilitiesRequest arg0) {
+//		// TODO Auto-generated method stub
+//		return null;
+//	}
+//
+//	@Override
+//	public void fieldCaps(FieldCapabilitiesRequest arg0, ActionListener<FieldCapabilitiesResponse> arg1) {
+//		// TODO Auto-generated method stub
+//		
+//	}
+//
+//	@Override
+//	public FieldCapabilitiesRequestBuilder prepareFieldCaps() {
+//		// TODO Auto-generated method stub
+//		return null;
+//	}
 
 }