You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2022/04/20 15:37:10 UTC
[hadoop] branch branch-3.3 updated: HADOOP-17650. Bump solr to unblock build failure with Maven 3.8.1 (#2939)
This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new caecec45f5f HADOOP-17650. Bump solr to unblock build failure with Maven 3.8.1 (#2939)
caecec45f5f is described below
commit caecec45f5f5284fd331681f67bb6a3870c1713a
Author: Steve Loughran <st...@cloudera.com>
AuthorDate: Wed Apr 20 16:36:51 2022 +0100
HADOOP-17650. Bump solr to unblock build failure with Maven 3.8.1 (#2939)
Reviewed-by: Siyao Meng <si...@apache.org>
Contributed by Viraj Jasani
---
hadoop-project/pom.xml | 2 +-
.../hadoop-yarn-applications-catalog-webapp/pom.xml | 20 ++++++++++++++++++++
.../application/EmbeddedSolrServerFactory.java | 4 +---
.../application/TestAppCatalogSolrClient.java | 2 +-
4 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index ec4ee32935a..2d4e405b456 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -208,7 +208,7 @@
<assertj.version>3.12.2</assertj.version>
<jline.version>3.9.0</jline.version>
<powermock.version>1.5.6</powermock.version>
- <solr.version>7.7.0</solr.version>
+ <solr.version>8.8.2</solr.version>
<openssl-wildfly.version>1.0.7.Final</openssl-wildfly.version>
<woodstox.version>5.3.0</woodstox.version>
<json-smart.version>2.4.7</json-smart.version>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
index 2c7a46729f4..6a75dd614f6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
@@ -110,6 +110,18 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -134,6 +146,10 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ </exclusion>
</exclusions>
<scope>test</scope>
</dependency>
@@ -159,6 +175,10 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ </exclusion>
</exclusions>
<scope>test</scope>
</dependency>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/EmbeddedSolrServerFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/EmbeddedSolrServerFactory.java
index 2a4b3385325..eb782666959 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/EmbeddedSolrServerFactory.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/EmbeddedSolrServerFactory.java
@@ -82,12 +82,10 @@ public final class EmbeddedSolrServerFactory {
solrHomeDir.mkdirs();
}
- final SolrResourceLoader loader = new SolrResourceLoader(
- solrHomeDir.toPath());
final Path configSetPath = Paths.get(configSetHome).toAbsolutePath();
final NodeConfig config = new NodeConfig.NodeConfigBuilder(
- "embeddedSolrServerNode", loader)
+ "embeddedSolrServerNode", solrHomeDir.toPath())
.setConfigSetBaseDirectory(configSetPath.toString()).build();
final EmbeddedSolrServer embeddedSolrServer = new EmbeddedSolrServer(config,
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/TestAppCatalogSolrClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/TestAppCatalogSolrClient.java
index d902de5c8cd..37a382021ea 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/TestAppCatalogSolrClient.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/TestAppCatalogSolrClient.java
@@ -47,7 +47,7 @@ public class TestAppCatalogSolrClient {
String targetLocation = EmbeddedSolrServerFactory.class
.getProtectionDomain().getCodeSource().getLocation().getFile() + "/..";
- String solrHome = targetLocation + "/solr";
+ String solrHome = targetLocation.split("/test-classes")[0] + "/solr";
solrClient = EmbeddedSolrServerFactory.create(solrHome, CONFIGSET_DIR,
"exampleCollection");
spy = PowerMockito.spy(new AppCatalogSolrClient());
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org