Fix merge conflicts

Author: tischi

.github/build.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
-curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh
+curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-build.sh
 sh ci-build.sh

.github/setup.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
-curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-setup-github-actions.sh
+curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-setup-github-actions.sh
 sh ci-setup-github-actions.sh

.github/workflows/build-pr.yml

@@ -6,41 +6,31 @@ on:
       - master
     tags:
       - "*-[0-9]+.*"
+  pull_request:
+    branches:
+      - master
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
-
-      - name: Cache m2 folder
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-m2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-build-${{ env.cache-name }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
+      - name: Set up Java
+        uses: actions/setup-java@v3
         with:
           java-version: '8'
           distribution: 'zulu'
+          cache: 'maven'
       - name: Set up CI environment
         run: .github/setup.sh
-      - name: Install blosc
-        run: sudo apt install libblosc-dev
       - name: Execute the build
         run: .github/build.sh
         env:
           GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
           MAVEN_USER: ${{ secrets.MAVEN_USER }}
           MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
+          OSSRH_USER: ${{ secrets.OSSRH_USER }}
           OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
           SIGNING_ASC: ${{ secrets.SIGNING_ASC }}

.github/workflows/build-main.yml renamed to .github/workflows/build.yml

@@ -1,4 +1,4 @@
-Copyright (c) 2018 - 2023, EMBL
+Copyright (c) 2018 - 2025, EMBL
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

LICENSE.txt

@@ -1,3 +1,4 @@
+[![Build Status](https://github.com/bigdataprocessor/bigdataprocessor2/actions/workflows/build.yml/badge.svg)](https://github.com/bigdataprocessor/bigdataprocessor2/actions/workflows/build.yml)
 [![DOI](https://zenodo.org/badge/161612516.svg)](https://zenodo.org/badge/latestdoi/161612516)
 
 <img src="./docs/images/BDP2-icon.png" width="300">

README.md

@@ -13,6 +13,7 @@
 	<groupId>de.embl.cba</groupId>
 	<artifactId>bigDataProcessor2</artifactId>
 	<version>1.8.0-SNAPSHOT</version>
+
 	<url>https://github.com/bigdataprocessor/bigdataprocessor2</url>
 	<name>BigDataProcessor2</name>
 	<description>Fiji plugin for inspection and processing of big image data</description>
@@ -64,9 +65,9 @@
 		</mailingList>
 	</mailingLists>
 	<scm>
-		<connection>scm:git:git@github.com:bigdataprocessor/bigdataprocessor2</connection>
+		<connection>scm:git:https://github.com/bigdataprocessor/bigdataprocessor2</connection>
 		<developerConnection>scm:git:[email protected]:bigdataprocessor/bigdataprocessor2</developerConnection>
-		<tag>bigDataProcessor2-1.7.0</tag>
+		<tag>HEAD</tag>
 		<url>https://github.com/bigdataprocessor/bigdataprocessor2</url>
 	</scm>
 	<issueManagement>
@@ -178,13 +179,11 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.4.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>5.4.2</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

pom.xml

@@ -2,7 +2,7 @@
  * #%L
  * Fiji plugin for inspection and processing of big image data
  * %%
- * Copyright (C) 2018 - 2023 EMBL
+ * Copyright (C) 2018 - 2025 EMBL
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

src/main/java/de/embl/cba/bdp2/BigDataProcessor2.java

@@ -2,7 +2,7 @@
  * #%L
  * Fiji plugin for inspection and processing of big image data
  * %%
- * Copyright (C) 2018 - 2023 EMBL
+ * Copyright (C) 2018 - 2025 EMBL
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

src/main/java/de/embl/cba/bdp2/BigDataProcessor2Command.java

@@ -2,7 +2,7 @@
  * #%L
  * Fiji plugin for inspection and processing of big image data
  * %%
- * Copyright (C) 2018 - 2023 EMBL
+ * Copyright (C) 2018 - 2025 EMBL
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met: