Update for pom-scijava 39.0.0 compatibility

Update to the pom to avoid duplicate attache sources goal.
aherbert · Nov 20, 2024 · 1860223 · 1860223
1 parent 5ac6634
commit 1860223
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -244,18 +244,6 @@ GDSC SMLM ImageJ Plugins - Single molecule localisation microscopy (SMLM)
       </plugins>
     </pluginManagement>
     <plugins>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>jar-no-fork</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
@@ -297,6 +285,7 @@ GDSC SMLM ImageJ Plugins - Single molecule localisation microscopy (SMLM)
               <roots>
                 <!-- Path(s) to configuration in the JSON config file -->
                 <root>2.1</root>
+                <root>2.2</root>
               </roots>
             </configurationFile>
           </analysisConfigurationFiles>

diff --git a/src/conf/revapi/api-changes.json b/src/conf/revapi/api-changes.json
@@ -38,5 +38,42 @@
         "justification": "This class is a spurious commit and contains no functionality."
       } ]
     }
+  } ],
+  "2.2" : [ {
+    "extension" : "revapi.differences",
+    "id" : "intentional-api-changes",
+    "configuration" : {
+      "differences" : [ {
+        "code": "java.class.externalClassExposedInAPI",
+        "new": "interface org.apache.commons.lang3.function.FailableBiConsumer<T, U, E extends java.lang.Throwable>",
+        "justification" : "This new method from a dependency that is not used by the GDSC code."
+      }, {
+        "code": "java.class.externalClassExposedInAPI",
+        "new": "interface org.apache.commons.lang3.function.FailableBiFunction<T, U, R, E extends java.lang.Throwable>",
+        "justification" : "This new method from a dependency that is not used by the GDSC code."
+      }, {
+        "code": "java.class.externalClassExposedInAPI",
+        "new": "interface org.apache.commons.lang3.function.FailableFunction<T, R, E extends java.lang.Throwable>",
+        "justification" : "This new method from a dependency that is not used by the GDSC code."
+      },         {
+        "code": "java.annotation.removed",
+        "old": "interface com.google.common.hash.PrimitiveSink",
+        "new": "interface com.google.common.hash.PrimitiveSink",
+        "annotation": "@com.google.errorprone.annotations.CanIgnoreReturnValue",
+        "justification" : "This annotation is not used by the GDSC code."
+      },
+      {
+        "code": "java.method.numberOfParametersChanged",
+        "old": "method java.awt.image.IndexColorModel ij.process.ImageProcessor::getThresholdColorModel()",
+        "new": "method java.awt.image.IndexColorModel ij.process.ImageProcessor::getThresholdColorModel(byte[], byte[], byte[])",
+        "justification": "Latest ImageJ changes are allowed; code should be updated to be compatible."
+      },
+      {
+        "code": "java.method.nowStatic",
+        "old": "method java.awt.image.IndexColorModel ij.process.ImageProcessor::getThresholdColorModel()",
+        "new": "method java.awt.image.IndexColorModel ij.process.ImageProcessor::getThresholdColorModel(byte[], byte[], byte[])",
+        "justification": "Latest ImageJ changes are allowed; code should be updated to be compatible."
+      } ]
+    }
   } ]
 }