Merge pull request #459 from netarchivesuite/440_upgrade_solr_to_9_4_1

Upgrade solr dependencies to 9.4.1
netarchivesuite · Aug 2, 2024 · ba4d691 · ba4d691
2 parents 528496f + 0ecd2ef
commit ba4d691
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 35 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,8 @@
 # SolrWayback changelog
 
+UNRELEASED
+-----
+Upgraded solr dependencies from v9.1.0 to v9.4.1
 
 
 5.1.2

diff --git a/pom.xml b/pom.xml
@@ -113,20 +113,20 @@
       <dependency>
         <groupId>org.apache.solr</groupId>
         <artifactId>solr-solrj</artifactId>
-        <version>9.1.0</version>
+        <version>9.4.1</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.solr</groupId>
         <artifactId>solr-test-framework</artifactId>
-        <version>9.1.0</version>
+        <version>9.4.1</version>
         <scope>test</scope>      
       </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.solr/solr-core -->
       <dependency>
           <groupId>org.apache.solr</groupId>
           <artifactId>solr-core</artifactId>
-          <version>9.1.0</version>
+          <version>9.4.1</version>
           <scope>test</scope>
         <exclusions>
          <exclusion>
@@ -140,7 +140,7 @@
       <dependency>
           <groupId>org.apache.lucene</groupId>
           <artifactId>lucene-core</artifactId>
-          <version>9.2.0</version>
+          <version>9.8.0</version>
           <scope>test</scope>
       </dependency>
 

diff --git a/src/test/java/dk/kb/netarchivesuite/solrwayback/SolrStatsTest.java b/src/test/java/dk/kb/netarchivesuite/solrwayback/SolrStatsTest.java
@@ -13,32 +13,29 @@
 import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.core.CoreContainer;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.solr.core.NodeConfig;
+import org.junit.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 public class SolrStatsTest {
     private static final Logger log = LoggerFactory.getLogger(SolrStatsTest.class);
 
-    private static String solr_home= "target/test-classes/solr_9";
+    private static String SOLR_HOME = "target/test-classes/solr_9";
     private static NetarchiveSolrClient server = null;
     private static CoreContainer coreContainer= null;
     private static EmbeddedSolrServer embeddedServer = null;
 
     @Before
     public void setUp() throws Exception {
         // Embedded Solr 9.1+ must have absolute home both as env and explicit param
-        System.setProperty("solr.install.dir", Path.of(solr_home).toAbsolutePath().toString());
-        coreContainer = CoreContainer.createAndLoad(Path.of(solr_home).toAbsolutePath());
+        Path solrHome = Path.of(SOLR_HOME).toAbsolutePath();
+        System.setProperty("solr.install.dir", solrHome.toString());
+        NodeConfig nodeConfig = new NodeConfig.NodeConfigBuilder("netarchivebuilder", solrHome).build();
+        coreContainer = new CoreContainer(nodeConfig);
         coreContainer.load();
         embeddedServer = new EmbeddedSolrServer(coreContainer,"netarchivebuilder");
         NetarchiveSolrTestClient.initializeOverLoadUnitTest(embeddedServer);

diff --git a/src/test/java/dk/kb/netarchivesuite/solrwayback/solr/EmbeddedSolrTest.java b/src/test/java/dk/kb/netarchivesuite/solrwayback/solr/EmbeddedSolrTest.java
@@ -4,16 +4,11 @@
 
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.HashSet;
 
-import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
-import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.core.*;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,23 +18,25 @@
 public class EmbeddedSolrTest {
 
     private static final Logger log = LoggerFactory.getLogger(EmbeddedSolrTest.class);        
-    private static String solr_home= "target/test-classes/solr_9";
+    private static String SOLR_HOME = "target/test-classes/solr_9";
     private static NetarchiveSolrClient server = null;
     private static  CoreContainer coreContainer= null;
     private static EmbeddedSolrServer embeddedServer = null;
 
     @Before
     public void setUp() throws Exception {
-       // Embedded Solr 9.1+ must have absolute home both as env and explicit param
-       System.setProperty("solr.install.dir", Path.of(solr_home).toAbsolutePath().toString());
-       coreContainer = CoreContainer.createAndLoad(Path.of(solr_home).toAbsolutePath());
-       coreContainer.load();
-       embeddedServer = new EmbeddedSolrServer(coreContainer,"netarchivebuilder");
-       NetarchiveSolrTestClient.initializeOverLoadUnitTest(embeddedServer);
-       server = NetarchiveSolrClient.getInstance();
-
+        // Embedded Solr 9.1+ must have absolute home both as env and explicit param
+        Path solrHome = Path.of(SOLR_HOME).toAbsolutePath();
+        System.setProperty("solr.install.dir", solrHome.toString());
+        NodeConfig nodeConfig = new NodeConfig.NodeConfigBuilder("netarchivebuilder", solrHome).build();
+        coreContainer = new CoreContainer(nodeConfig);
+        coreContainer.load();
+        embeddedServer = new EmbeddedSolrServer(coreContainer,"netarchivebuilder");
+        NetarchiveSolrTestClient.initializeOverLoadUnitTest(embeddedServer);
+        server = NetarchiveSolrClient.getInstance();
+
         // Remove any items from previous executions:
-       embeddedServer.deleteByQuery("*:*"); //This is not on the NetarchiveSolrClient API!
+        embeddedServer.deleteByQuery("*:*"); //This is not on the NetarchiveSolrClient API!
     }
 
     /**

diff --git a/src/test/java/dk/kb/netarchivesuite/solrwayback/solr/SolrStreamDirectTest.java b/src/test/java/dk/kb/netarchivesuite/solrwayback/solr/SolrStreamDirectTest.java
@@ -27,6 +27,7 @@
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.core.CoreContainer;
+import org.apache.solr.core.NodeConfig;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -62,8 +63,10 @@ public static void setUp() throws Exception {
         PropertiesLoader.initProperties(UnitTestUtils.getFile("properties/solrwayback_unittest.properties").getPath());
 
         // Embedded Solr 9.1+ must have absolute home both as env and explicit param
-        System.setProperty("solr.install.dir", Path.of(SOLR_HOME).toAbsolutePath().toString());
-        coreContainer = CoreContainer.createAndLoad(Path.of(SOLR_HOME).toAbsolutePath());
+        Path solrHome = Path.of(SOLR_HOME).toAbsolutePath();
+        System.setProperty("solr.install.dir", solrHome.toString());
+        NodeConfig nodeConfig = new NodeConfig.NodeConfigBuilder("netarchivebuilder", solrHome).build();
+        coreContainer = new CoreContainer(nodeConfig);
         coreContainer.load();
         embeddedServer = new EmbeddedSolrServer(coreContainer,"netarchivebuilder");
         NetarchiveSolrTestClient.initializeOverLoadUnitTest(embeddedServer);

diff --git a/src/test/java/dk/kb/netarchivesuite/solrwayback/solr/UrlResolveTest.java b/src/test/java/dk/kb/netarchivesuite/solrwayback/solr/UrlResolveTest.java
@@ -64,8 +64,10 @@ public static void setUp() throws Exception {
         PropertiesLoader.initProperties(UnitTestUtils.getFile("properties/solrwayback_unittest.properties").getPath());
 
         // Embedded Solr 9.1+ must have absolute home both as env and explicit param
-        System.setProperty("solr.install.dir", Path.of(SOLR_HOME).toAbsolutePath().toString());
-        coreContainer = CoreContainer.createAndLoad(Path.of(SOLR_HOME).toAbsolutePath());
+        Path solrHome = Path.of(SOLR_HOME).toAbsolutePath();
+        System.setProperty("solr.install.dir", solrHome.toString());
+        NodeConfig nodeConfig = new NodeConfig.NodeConfigBuilder("netarchivebuilder", solrHome).build();
+        coreContainer = new CoreContainer(nodeConfig);
         coreContainer.load();
         solr = new ConvenientEmbeddedSolrServer(coreContainer, "netarchivebuilder");
         NetarchiveSolrTestClient.initializeOverLoadUnitTest(solr);