From 62d0ea0ec96181c0eb5805055cd94413b7ffd9bd Mon Sep 17 00:00:00 2001
From: yvanzo <yvanzo@metabrainz.org>
Date: Wed, 12 Jun 2024 19:15:23 +0100
Subject: [PATCH 1/5] Dockerize Solr full binary package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Nowadays, those two Solr Docker images don’t just a differ by their base
Docker image, they don’t provide the same Solr binary package. The full
version includes first-party Solr modules such as `prometheus-exporter`.

Reference: https://solr.apache.org/guide/solr/9_6/deployment-guide/solr-in-docker.html#available-images
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 60fa01d..4a72a3f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 ARG MAVEN_TAG=3.9.6-eclipse-temurin-17
 ARG SOLR_NAME=solr
-ARG SOLR_TAG=9.5.0-slim
+ARG SOLR_TAG=9.5.0
 
 FROM maven:${MAVEN_TAG} AS builder
 

From 74eca42a935d1e950aeac8843e3a04c198c92737 Mon Sep 17 00:00:00 2001
From: yvanzo <yvanzo@metabrainz.org>
Date: Wed, 12 Jun 2024 19:20:52 +0100
Subject: [PATCH 2/5] Upgrade to Solr 9.6.1

Upgrade both Docker base image and Maven dependencies.

A noticeable upgrade in library dependencies is Lucene 9.10.0.

References:

- https://solr.apache.org/guide/solr/latest/upgrade-notes/major-changes-in-solr-9.html#solr-9-6
- https://solr.apache.org/docs/9_6_0/changes/Changes.html
- https://solr.apache.org/docs/9_6_1/changes/Changes.html
---
 Dockerfile      |  2 +-
 mb-solr/pom.xml | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4a72a3f..75a4c04 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 ARG MAVEN_TAG=3.9.6-eclipse-temurin-17
 ARG SOLR_NAME=solr
-ARG SOLR_TAG=9.5.0
+ARG SOLR_TAG=9.6.1
 
 FROM maven:${MAVEN_TAG} AS builder
 
diff --git a/mb-solr/pom.xml b/mb-solr/pom.xml
index 06165c4..245946f 100644
--- a/mb-solr/pom.xml
+++ b/mb-solr/pom.xml
@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.13.1</version>
+			<version>4.13.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>org.apache.solr</groupId>
 			<artifactId>solr-core</artifactId>
-			<version>9.5.0</version>
+			<version>9.6.1</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -48,12 +48,12 @@
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
 			<artifactId>lucene-analysis-icu</artifactId>
-			<version>9.9.2</version>
+			<version>9.10.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.solr</groupId>
 			<artifactId>solr-analysis-extras</artifactId>
-			<version>9.5.0</version>
+			<version>9.6.1</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -80,19 +80,19 @@
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
 			<artifactId>lucene-test-framework</artifactId>
-			<version>9.9.2</version>
+			<version>9.10.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.solr</groupId>
 			<artifactId>solr-test-framework</artifactId>
-			<version>9.5.0</version>
+			<version>9.6.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
 			<artifactId>lucene-core</artifactId>
-			<version>9.9.2</version>
+			<version>9.10.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -122,13 +122,13 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.24</version>
+			<version>2.0.12</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.7.24</version>
+			<version>2.0.12</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

From 871538c2e5d35b5693146b9d2db6511fe8236ac5 Mon Sep 17 00:00:00 2001
From: yvanzo <yvanzo@metabrainz.org>
Date: Wed, 12 Jun 2024 19:27:45 +0100
Subject: [PATCH 3/5] Update various Maven dependencies

---
 mb-solr/pom.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/mb-solr/pom.xml b/mb-solr/pom.xml
index 245946f..bebb860 100644
--- a/mb-solr/pom.xml
+++ b/mb-solr/pom.xml
@@ -43,7 +43,7 @@
 		<dependency>
 			<groupId>com.ibm.icu</groupId>
 			<artifactId>icu4j</artifactId>
-			<version>74.2</version>
+			<version>75.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
@@ -59,12 +59,12 @@
 		<dependency>
 			<groupId>jakarta.xml.bind</groupId>
 			<artifactId>jakarta.xml.bind-api</artifactId>
-			<version>4.0.1</version>
+			<version>4.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
-			<version>4.0.4</version>
+			<version>4.0.5</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
@@ -75,7 +75,7 @@
 		<dependency>
 			<groupId>org.eclipse.persistence</groupId>
 			<artifactId>eclipselink</artifactId>
-			<version>4.0.2</version>
+			<version>4.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
@@ -98,19 +98,19 @@
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
-			<version>1.2</version>
+			<version>1.3.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.xmlunit</groupId>
 			<artifactId>xmlunit-core</artifactId>
-			<version>2.5.1</version>
+			<version>2.10.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.javacrumbs.json-unit</groupId>
 			<artifactId>json-unit</artifactId>
-			<version>1.28.2</version>
+			<version>1.31.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -156,7 +156,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>3.6.0</version>
+				<version>3.7.1</version>
 				<configuration>
 					<descriptorRefs>
 						<descriptorRef>jar-with-dependencies</descriptorRef>
@@ -185,7 +185,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.12.1</version>
+				<version>3.13.0</version>
 				<configuration>
 					<release>17</release>
 				</configuration>

From a945727b839a459b0519a2b60620b50002efdb70 Mon Sep 17 00:00:00 2001
From: yvanzo <yvanzo@metabrainz.org>
Date: Wed, 19 Jun 2024 11:38:00 +0100
Subject: [PATCH 4/5] Update dependencies of MMD schema Java binding

---
 mmd-schema | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mmd-schema b/mmd-schema
index 92e836e..61108f9 160000
--- a/mmd-schema
+++ b/mmd-schema
@@ -1 +1 @@
-Subproject commit 92e836e552b5346e32fc5f531be5a5024d8e5c59
+Subproject commit 61108f9cc220d4561154244715a886b7ceabb0a1

From 6779bb8a91ddb9a87bce686a40718bb0329a5903 Mon Sep 17 00:00:00 2001
From: yvanzo <yvanzo@metabrainz.org>
Date: Wed, 19 Jun 2024 11:39:46 +0100
Subject: [PATCH 5/5] Update Solr configuration from SolrCloud 9 cluster

---
 mbsssss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mbsssss b/mbsssss
index f4efa44..e2e630a 160000
--- a/mbsssss
+++ b/mbsssss
@@ -1 +1 @@
-Subproject commit f4efa447e81fb9442e94f16d4ed045061415c447
+Subproject commit e2e630a8eac72457ad085d735043e787c9b076e0