Repository: ambari Updated Branches: refs/heads/cloudbreak-poc [created] efe3cf32e
Upgrade to Solr 6 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/efe3cf32 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/efe3cf32 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/efe3cf32 Branch: refs/heads/cloudbreak-poc Commit: efe3cf32e1991f67c12ae80e9ab6841b8bec4c99 Parents: a38dd28 Author: Oliver Szabo <[email protected]> Authored: Thu Oct 19 13:37:22 2017 +0200 Committer: Oliver Szabo <[email protected]> Committed: Thu Oct 19 13:37:22 2017 +0200 ---------------------------------------------------------------------- .../infra/security/InfraRuleBasedAuthorizationPluginTest.java | 5 +++++ ambari-logsearch/ambari-logsearch-portal/pom.xml | 4 ++-- .../org/apache/ambari/logsearch/dao/SolrSchemaFieldDao.java | 2 +- .../logsearch/solr/commands/SetClusterPropertyZkCommand.java | 5 +++-- ambari-logsearch/pom.xml | 6 +++--- 5 files changed, 14 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/efe3cf32/ambari-logsearch/ambari-infra-solr-plugin/src/test/java/org/apache/ambari/infra/security/InfraRuleBasedAuthorizationPluginTest.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-infra-solr-plugin/src/test/java/org/apache/ambari/infra/security/InfraRuleBasedAuthorizationPluginTest.java b/ambari-logsearch/ambari-infra-solr-plugin/src/test/java/org/apache/ambari/infra/security/InfraRuleBasedAuthorizationPluginTest.java index ee84969..f1f842d 100644 --- a/ambari-logsearch/ambari-infra-solr-plugin/src/test/java/org/apache/ambari/infra/security/InfraRuleBasedAuthorizationPluginTest.java +++ b/ambari-logsearch/ambari-infra-solr-plugin/src/test/java/org/apache/ambari/infra/security/InfraRuleBasedAuthorizationPluginTest.java @@ -242,6 +242,11 @@ public class InfraRuleBasedAuthorizationPluginTest { public String getResource() { return (String) values.get("resource"); } + + @Override + public Object getHandler() { + return null; + } } } http://git-wip-us.apache.org/repos/asf/ambari/blob/efe3cf32/ambari-logsearch/ambari-logsearch-portal/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/pom.xml b/ambari-logsearch/ambari-logsearch-portal/pom.xml index a439266..c49a1a9 100755 --- a/ambari-logsearch/ambari-logsearch-portal/pom.xml +++ b/ambari-logsearch/ambari-logsearch-portal/pom.xml @@ -208,8 +208,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.0</version> <configuration> - <source>1.7</source> - <target>1.7</target> + <source>1.8</source> + <target>1.8</target> </configuration> </plugin> <!-- copying resources UI --> http://git-wip-us.apache.org/repos/asf/ambari/blob/efe3cf32/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrSchemaFieldDao.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrSchemaFieldDao.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrSchemaFieldDao.java index 01378c1..d9d4ac8 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrSchemaFieldDao.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrSchemaFieldDao.java @@ -141,7 +141,7 @@ public class SolrSchemaFieldDao { try (CloseableHttpClient httpClient = HttpClientUtil.createClient(null)) { HttpGet request = new HttpGet(replica.getCoreUrl() + LUKE_REQUEST_URL_SUFFIX); HttpResponse response = httpClient.execute(request); - NamedList<Object> lukeData = (NamedList<Object>) new JavaBinCodec(null, null).unmarshal(response.getEntity().getContent()); + NamedList<Object> lukeData = (NamedList<Object>) new JavaBinCodec().unmarshal(response.getEntity().getContent()); LukeResponse lukeResponse = new LukeResponse(); lukeResponse.setResponse(lukeData); lukeResponses.add(lukeResponse); http://git-wip-us.apache.org/repos/asf/ambari/blob/efe3cf32/ambari-logsearch/ambari-logsearch-solr-client/src/main/java/org/apache/ambari/logsearch/solr/commands/SetClusterPropertyZkCommand.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-solr-client/src/main/java/org/apache/ambari/logsearch/solr/commands/SetClusterPropertyZkCommand.java b/ambari-logsearch/ambari-logsearch-solr-client/src/main/java/org/apache/ambari/logsearch/solr/commands/SetClusterPropertyZkCommand.java index 575d807..bd4a003 100644 --- a/ambari-logsearch/ambari-logsearch-solr-client/src/main/java/org/apache/ambari/logsearch/solr/commands/SetClusterPropertyZkCommand.java +++ b/ambari-logsearch/ambari-logsearch-solr-client/src/main/java/org/apache/ambari/logsearch/solr/commands/SetClusterPropertyZkCommand.java @@ -19,6 +19,7 @@ package org.apache.ambari.logsearch.solr.commands; import org.apache.ambari.logsearch.solr.AmbariSolrCloudClient; +import org.apache.solr.common.cloud.ClusterProperties; import org.apache.solr.common.cloud.SolrZkClient; import org.apache.solr.common.cloud.SolrZooKeeper; import org.apache.solr.common.cloud.ZkStateReader; @@ -33,8 +34,8 @@ public class SetClusterPropertyZkCommand extends AbstractZookeeperRetryCommand<S protected String executeZkCommand(AmbariSolrCloudClient client, SolrZkClient zkClient, SolrZooKeeper solrZooKeeper) throws Exception { String propertyName = client.getPropName(); String propertyValue = client.getPropValue(); - ZkStateReader reader = new ZkStateReader(zkClient); - reader.setClusterProperty(propertyName, propertyValue); + ClusterProperties clusterProperties = new ClusterProperties(zkClient); + clusterProperties.setClusterProperty(propertyName, propertyValue); return propertyValue; } } http://git-wip-us.apache.org/repos/asf/ambari/blob/efe3cf32/ambari-logsearch/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-logsearch/pom.xml b/ambari-logsearch/pom.xml index 8a85f82..d1a7307 100644 --- a/ambari-logsearch/pom.xml +++ b/ambari-logsearch/pom.xml @@ -43,7 +43,7 @@ <deb.python.ver>python (>= 2.6)</deb.python.ver> <deb.architecture>amd64</deb.architecture> <deb.dependency.list>${deb.python.ver}</deb.dependency.list> - <solr.version>5.5.2</solr.version> + <solr.version>6.6.0</solr.version> <hadoop.version>2.7.2</hadoop.version> <common.io.version>2.5</common.io.version> </properties> @@ -81,8 +81,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.2</version> <configuration> - <source>1.7</source> - <target>1.7</target> + <source>1.8</source> + <target>1.8</target> </configuration> </plugin> <plugin>
