From 58c84c3077a38362fbf5ed82fa8f50175b416c20 Mon Sep 17 00:00:00 2001
From: Ulrik Guenther <hello@ulrik.is>
Date: Wed, 21 Feb 2024 10:07:49 +0100
Subject: [PATCH 1/7] Bump Jackson and dependents to 2.16.1

---
 pom.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index c222381..738315c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1765,11 +1765,7 @@
 		<org.apache.jackrabbit.jackrabbit-webdav.version>${jackrabbit-webdav.version}</org.apache.jackrabbit.jackrabbit-webdav.version>
 
 		<!-- Jackson - https://github.com/FasterXML/jackson -->
-		<!--
-		NB: Upgrading to 2.15.0 triggers an NPE in enforcer-maven-plugin +
-		extra-enforcer-rules. For now, we stick with 2.14.2 to avoid this problem.
-		-->
-		<jackson.version>2.14.2</jackson.version>
+		<jackson.version>2.16.1</jackson.version>
 		<jackson-annotations.version>${jackson.version}</jackson-annotations.version>
 		<jackson-core.version>${jackson.version}</jackson-core.version>
 		<jackson-databind.version>${jackson.version}</jackson-databind.version>

From 59f590d8f6e3a9d5380f48f1231aefc95da098a7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 27 Feb 2024 14:07:53 -0600
Subject: [PATCH 2/7] Update version update rules for Groovy v4

---
 rules.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/rules.xml b/rules.xml
index 1dae14e..3451542 100644
--- a/rules.xml
+++ b/rules.xml
@@ -138,13 +138,9 @@
         <ignoreVersion type="regex">.*-(alpha|beta|rc)-?[0-9]+</ignoreVersion>
       </ignoreVersions>
     </rule>
-    <rule groupId="org.codehaus.groovy" artifactId="*" comparisonMethod="maven">
+    <rule groupId="org.apache.groovy" artifactId="*" comparisonMethod="maven">
       <ignoreVersions>
-        <!--
-        Groovy past 3.0.4 changes behavior in a way that breaks scripting-groovy.
-        Until we have time to investigate and adjust, do not upgrade past that.
-        -->
-        <ignoreVersion type="regex">^(?!3\.0\.4\.).*</ignoreVersion>
+        <ignoreVersion type="regex">.*-(alpha|beta|rc)-?[0-9]+</ignoreVersion>
       </ignoreVersions>
     </rule>
     <rule groupId="org.eclipse.collections" artifactId="eclipse-collections" comparisonMethod="maven">

From 0a9980721fa27d2e12603baed6ddc4b6c5e92f05 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 27 Feb 2024 14:08:21 -0600
Subject: [PATCH 3/7] Add comment marker for missing macosx-arm64 builds

---
 pom.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 738315c..e419a7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1804,15 +1804,15 @@
 		<org.bytedeco.javacpp.version>${javacpp.version}</org.bytedeco.javacpp.version>
 		<org.bytedeco.javacv.version>${javacv.version}</org.bytedeco.javacv.version>
 
-		<artoolkitplus.version>2.3.1-${org.bytedeco.javacpp.version}</artoolkitplus.version>
+		<!-- NO macosx-arm64 --><artoolkitplus.version>2.3.1-${org.bytedeco.javacpp.version}</artoolkitplus.version>
 		<ffmpeg.version>5.1.2-${org.bytedeco.javacpp.version}</ffmpeg.version>
-		<flandmark.version>1.07-${org.bytedeco.javacpp.version}</flandmark.version>
-		<hdf5.version>1.12.2-${org.bytedeco.javacpp.version}</hdf5.version>
+		<!-- NO macosx-arm64 --><flandmark.version>1.07-${org.bytedeco.javacpp.version}</flandmark.version>
+		<!-- NO macosx-arm64 --><hdf5.version>1.12.2-${org.bytedeco.javacpp.version}</hdf5.version>
 		<leptonica.version>1.82.0-${org.bytedeco.javacpp.version}</leptonica.version>
-		<libdc1394.version>2.2.6-${org.bytedeco.javacpp.version}</libdc1394.version>
-		<libfreenect.version>0.5.7-${org.bytedeco.javacpp.version}</libfreenect.version>
-		<libfreenect2.version>0.2.0-${org.bytedeco.javacpp.version}</libfreenect2.version>
-		<librealsense.version>1.12.4-${org.bytedeco.javacpp.version}</librealsense.version>
+		<!-- NO macosx-arm64 --><libdc1394.version>2.2.6-${org.bytedeco.javacpp.version}</libdc1394.version>
+		<!-- NO macosx-arm64 --><libfreenect.version>0.5.7-${org.bytedeco.javacpp.version}</libfreenect.version>
+		<!-- NO macosx-arm64 --><libfreenect2.version>0.2.0-${org.bytedeco.javacpp.version}</libfreenect2.version>
+		<!-- NO macosx-arm64 --><librealsense.version>1.12.4-${org.bytedeco.javacpp.version}</librealsense.version>
 		<openblas.version>0.3.21-${org.bytedeco.javacpp.version}</openblas.version>
 		<opencv.version>4.6.0-${org.bytedeco.javacpp.version}</opencv.version>
 		<tesseract.version>5.2.0-${org.bytedeco.javacpp.version}</tesseract.version>

From d645be6ad32e065bbdb2bee1a7122014d26dfbc0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 27 Feb 2024 14:09:21 -0600
Subject: [PATCH 4/7] Update maven-core: 3.9.1 -> 3.9.6

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e419a7b..c8d2392 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1400,7 +1400,7 @@
 		<!-- Apache Maven - https://maven.apache.org/ -->
 		<maven-artifact-transfer.version>0.13.1</maven-artifact-transfer.version>
 		<maven-common-artifact-filters.version>3.3.2</maven-common-artifact-filters.version>
-		<maven-core.version>3.9.1</maven-core.version>
+		<maven-core.version>3.9.6</maven-core.version>
 		<maven-plugin-tools-api.version>3.8.2</maven-plugin-tools-api.version>
 		<plexus-component-annotations.version>2.1.1</plexus-component-annotations.version>
 		<plexus-utils.version>3.5.1</plexus-utils.version>

From d01dbeb0e5a639ecdc7e8d86ec9156a1b4aef87e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 27 Feb 2024 14:52:32 -0600
Subject: [PATCH 5/7] Update scijava-grab: 0.1.1 -> 0.1.2

This replaces the org.codehaus.groovy:groovy dependency
with org.apache.groovy:groovy, to avoid artifact clashes.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c8d2392..ae7de23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -337,7 +337,7 @@
 		<org.scijava.scijava-config.version>${scijava-config.version}</org.scijava.scijava-config.version>
 
 		<!-- SciJava Grab - https://github.com/scijava/scijava-grab -->
-		<scijava-grab.version>0.1.1</scijava-grab.version>
+		<scijava-grab.version>0.1.2</scijava-grab.version>
 		<org.scijava.scijava-grab.version>${scijava-grab.version}</org.scijava.scijava-grab.version>
 
 		<!-- SciJava I/O: HTTP - https://github.com/scijava/scijava-io-http -->

From 2aa0f03f1f42f935542f9d0a39bc2832d606e4e5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 27 Feb 2024 15:00:27 -0600
Subject: [PATCH 6/7] Avoid bringing in com.google.android.tools:dx

It is an unshaded uberjar bundling junit. Naughty.
---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index ae7de23..c88260b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4704,6 +4704,13 @@
 				<groupId>com.nativelibs4java</groupId>
 				<artifactId>bridj</artifactId>
 				<version>${com.nativelibs4java.bridj.version}</version>
+				<exclusions>
+					<exclusion>
+						<!-- Conflicts with junit:junit. We don't need Android here. -->
+						<groupId>com.google.android.tools</groupId>
+						<artifactId>dx</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 
 			<!-- CDI - https://cdi-spec.org/ -->

From 4a28948f439f9f5fee2fe061310808e074a13f81 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 27 Feb 2024 15:05:43 -0600
Subject: [PATCH 7/7] Update parent to pom-scijava-base 19.0.0

This upgrades the maven-enforcer-plugin component stack to play
more nicely when updating components, particularly Jackson.

In particular, this update fixes the following error in the mega-melt:

    Failed to execute goal
    org.apache.maven.plugins:maven-enforcer-plugin:3.3.0:enforce
    (enforce-rules) on project mega-melt: Execution enforce-rules of
    goal org.apache.maven.plugins:maven-enforcer-plugin:3.3.0:enforce
    failed. NullPointerException
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c88260b..0ed3b23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava-base</artifactId>
-		<version>18.2.0</version>
+		<version>19.0.0</version>
 		<relativePath />
 	</parent>