POM: update parent to pom-scijava 36.0.0

ctrueden · ctrueden · commit e4fc483f4445 · 2023-09-19T14:02:46.000-05:00
And make the necessary code changes to account for backward
incompatibilities in the ImgLib2 library as of version 6.
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/ShuffledView.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/ShuffledView.java
@@ -179,12 +179,7 @@ public T get() {
 		}
 
 		@Override
-		public Sampler<T> copy() {
-			throw new UnsupportedOperationException();
-		}
-
-		@Override
-		public RandomAccess<T> copyRandomAccess() {
+		public ShuffledRandomAccess copy() {
 			throw new UnsupportedOperationException();
 		}
 	}
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SlicesII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SlicesII.java
@@ -201,11 +201,6 @@ public RandomAccessibleInterval<T> get() {
 			return dropSingltonDimensions ? Views.dropSingletonDimensions(res) : res;
 		}
 
-		@Override
-		public Sampler<RandomAccessibleInterval<T>> copy() {
-			return copyCursor();
-		}
-
 		@Override
 		public RandomAccessibleInterval<T> next() {
 			fwd();
@@ -218,9 +213,8 @@ public void remove() {
 		}
 
 		@Override
-		public Cursor<RandomAccessibleInterval<T>> copyCursor() {
+		public SlicesIICursor copy() {
 			return new SlicesIICursor(this);
 		}
 	}
-
 }
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>34.1.0</version>
+		<version>36.0.0</version>
 		<relativePath />
 	</parent>
 

Original file line number	Diff line number	Diff line change
`@@ -179,12 +179,7 @@ public T get() {`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`@Override`
`182`		`- public Sampler<T> copy() {`
`183`		`- throw new UnsupportedOperationException();`
`184`		`- }`
`185`		`-`
`186`		`- @Override`
`187`		`- public RandomAccess<T> copyRandomAccess() {`
	`182`	`+ public ShuffledRandomAccess copy() {`
`188`	`183`	`throw new UnsupportedOperationException();`
`189`	`184`	`}`
`190`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -201,11 +201,6 @@ public RandomAccessibleInterval<T> get() {`
`201`	`201`	`return dropSingltonDimensions ? Views.dropSingletonDimensions(res) : res;`
`202`	`202`	`}`
`203`	`203`
`204`		`- @Override`
`205`		`- public Sampler<RandomAccessibleInterval<T>> copy() {`
`206`		`- return copyCursor();`
`207`		`- }`
`208`		`-`
`209`	`204`	`@Override`
`210`	`205`	`public RandomAccessibleInterval<T> next() {`
`211`	`206`	`fwd();`
`@@ -218,9 +213,8 @@ public void remove() {`
`218`	`213`	`}`
`219`	`214`
`220`	`215`	`@Override`
`221`		`- public Cursor<RandomAccessibleInterval<T>> copyCursor() {`
	`216`	`+ public SlicesIICursor copy() {`
`222`	`217`	`return new SlicesIICursor(this);`
`223`	`218`	`}`
`224`	`219`	`}`
`225`		`-`
`226`	`220`	`}`