Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-17650. Bump solr to unblock build failure with Maven 3.8.1 (#2939) 

Reviewed-by: Siyao Meng <siyao@apache.org>

Contributed by Viraj Jasani
This commit is contained in:
Steve Loughran 2022-04-20 16:36:51 +01:00 committed by GitHub
parent af3558d61a
commit caecec45f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-project/pom.xml
View File

@ -208,7 +208,7 @@
<assertj.version>3.12.2</assertj.version> <assertj.version>3.12.2</assertj.version>
<jline.version>3.9.0</jline.version> <jline.version>3.9.0</jline.version>
<powermock.version>1.5.6</powermock.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> <openssl-wildfly.version>1.0.7.Final</openssl-wildfly.version>
<woodstox.version>5.3.0</woodstox.version> <woodstox.version>5.3.0</woodstox.version>
<json-smart.version>2.4.7</json-smart.version> <json-smart.version>2.4.7</json-smart.version>

20
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
View File

@ -110,6 +110,18 @@
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
</exclusion> </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> </exclusions>
</dependency> </dependency>
@ -134,6 +146,10 @@
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId> <artifactId>jetty-http</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
</exclusion>
</exclusions> </exclusions>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -159,6 +175,10 @@
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId> <artifactId>jetty-http</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
</exclusion>
</exclusions> </exclusions>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

4
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
View File

@ -82,12 +82,10 @@ public final class EmbeddedSolrServerFactory {
solrHomeDir.mkdirs(); solrHomeDir.mkdirs();
} }
final SolrResourceLoader loader = new SolrResourceLoader(
solrHomeDir.toPath());
final Path configSetPath = Paths.get(configSetHome).toAbsolutePath(); final Path configSetPath = Paths.get(configSetHome).toAbsolutePath();
final NodeConfig config = new NodeConfig.NodeConfigBuilder( final NodeConfig config = new NodeConfig.NodeConfigBuilder(
"embeddedSolrServerNode", loader) "embeddedSolrServerNode", solrHomeDir.toPath())
.setConfigSetBaseDirectory(configSetPath.toString()).build(); .setConfigSetBaseDirectory(configSetPath.toString()).build();
final EmbeddedSolrServer embeddedSolrServer = new EmbeddedSolrServer(config, final EmbeddedSolrServer embeddedSolrServer = new EmbeddedSolrServer(config,

2
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
View File

@ -47,7 +47,7 @@ public class TestAppCatalogSolrClient {
String targetLocation = EmbeddedSolrServerFactory.class String targetLocation = EmbeddedSolrServerFactory.class
.getProtectionDomain().getCodeSource().getLocation().getFile() + "/.."; .getProtectionDomain().getCodeSource().getLocation().getFile() + "/..";
String solrHome = targetLocation + "/solr"; String solrHome = targetLocation.split("/test-classes")[0] + "/solr";
solrClient = EmbeddedSolrServerFactory.create(solrHome, CONFIGSET_DIR, solrClient = EmbeddedSolrServerFactory.create(solrHome, CONFIGSET_DIR,
"exampleCollection"); "exampleCollection");
spy = PowerMockito.spy(new AppCatalogSolrClient()); spy = PowerMockito.spy(new AppCatalogSolrClient());