Bump version to 7.6-SNAPSHOT

Suggested by IntelliJ.

.github/workflows/maven.yml

@@ -5,20 +5,22 @@ name: Build
 
 on:
   push:
-    branches: [ dspace6 ]
+    branches: [ dspace7 ]
   pull_request:
-    branches: [ dspace6 ]
+    branches: [ dspace7 ]
 
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
       with:
-        java-version: 1.8
+        java-version: 17
+        distribution: 'temurin'
+        cache: 'maven'
     - name: Build with Maven
       run: mvn -B package --file pom.xml

.idea/misc.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
         <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
+    <option name="workspaceImportForciblyTurnedOn" value="true" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="17" project-jdk-type="JavaSDK" />
 </project>

CHANGELOG.md

@@ -4,12 +4,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## [7.6] - 2024-01-02
+### Updated
+- `iso_3166-1.json` from iso-codes 4.13.0-SNAPSHOT, which [adds common names for Iran, Laos, and Syria](https://salsa.debian.org/iso-codes-team/iso-codes/-/merge_requests/32)
+- DSpace 7.6 compatibility
+
+## [6.2] - 2023-02-20
+### Updated
+- `iso_3166-1.json` from iso-codes 4.12.0, which updates the name for TR to "Türkiye"
+
+## [6.1] - 2022-10-31
 ### Updated
 - Update dependencies in `pom.xml`
+- `iso_3166-1.json` from iso-codes 4.11.0
 
 ### Changed
 - Java compiler and target from JDK 7 to JDK 8
 
 ### Added
 - New `FixLowQualityThumbnails` script to detect and remove more low-quality thumbnails
+
+### Fixed
+- `FixJpgJpgThumbnails` and `FixLowQualityThumbnails` scripts not commiting changes when operating on a site, community, or collection

README.md

@@ -5,7 +5,7 @@ DSpace curation tasks and other Java-based helpers used on the [CGSpace](https:/
 - **FixJpgJpgThumbnails**: fix low-quality ".jpg.jpg" thumbnails by replacing them with their originals
 - **FixLowQualityThumbnails**: remove low-quality thumbnails when PDF bitstreams are present
 
-Tested on DSpace 6.3. Read more about the [DSpace curation system](https://wiki.lyrasis.org/display/DSDOC5x/Curation+System).
+Tested on DSpace 7.6. Read more about the [DSpace curation system](https://wiki.lyrasis.org/display/DSDOC7x/Curation+System).
 
 ## Build and Install
 
@@ -16,7 +16,7 @@ To use these curation tasks in a DSpace project add the following dependency to
 <dependency>
   <groupId>io.github.ilri.cgspace</groupId>
   <artifactId>cgspace-java-helpers</artifactId>
-  <version>6.1-SNAPSHOT</version>
+  <version>7.6-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -32,7 +32,7 @@ $ mvn package
 Copy the resulting jar to the DSpace `lib` directory:
 
 ```console
-$ cp target/cgspace-java-helpers-6.1-SNAPSHOT.jar ~/dspace/lib/
+$ cp target/cgspace-java-helpers-7.6-SNAPSHOT.jar ~/dspace/lib/
 ```
 
 ## Configuration
@@ -44,6 +44,8 @@ Please refer to the appropriate README.md file:
 ## TODO
 
 - Add a curation task to normalize DOIs to "https://doi.org" format
+- Migrate from maven-deploy-plugin to nexus-staging-maven-plugin, see: https://central.sonatype.org/publish/publish-maven/#nexus-staging-maven-plugin-for-deployment-and-release
+- Stop using oss-parent, see: https://central.sonatype.org/publish/publish-maven/#create-a-ticket-with-sonatype
 
 ## Notes
 This project was initially created according to the [Maven Getting Started Guide](https://maven.apache.org/guides/getting-started/):
@@ -52,6 +54,14 @@ This project was initially created according to the [Maven Getting Started Guide
 $ mvn -B archetype:generate -DgroupId=io.github.ilri.cgspace -DartifactId=cgspace-java-helpers -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4
 ```
 
+To deploy a new `-SNAPSHOT` release to Maven Central (make sure OSSHRH credentials are in `~/.m2/settings.xml`):
+
+```console
+$ mvn clean deploy
+```
+
+See: <a href="https://central.sonatype.org/publish/publish-maven/#performing-a-snapshot-deployment">Performing a Snapshot Deployment</a>
+
 ## License
 This work is licensed under the [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html).
 

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>io.github.ilri.cgspace</groupId>
   <artifactId>cgspace-java-helpers</artifactId>
-  <version>6.1-SNAPSHOT</version>
+  <version>7.6-SNAPSHOT</version>
 
   <name>cgspace-java-helpers</name>
   <url>https://github.com/ilri/cgspace-java-helpers</url>
@@ -36,12 +36,12 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.9.1</version>
+      <version>2.10.1</version>
     </dependency>
     <dependency>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-api</artifactId>
-      <version>6.3</version>
+      <version>7.6.1</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -69,20 +69,20 @@
         <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
         <plugin>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.3.2</version>
         </plugin>
         <!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>3.3.0</version>
+          <version>3.3.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.10.1</version>
+          <version>3.12.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.0.0-M7</version>
+          <version>3.2.3</version>
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
@@ -90,11 +90,11 @@
         </plugin>
         <plugin>
           <artifactId>maven-install-plugin</artifactId>
-          <version>3.0.1</version>
+          <version>3.1.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>3.3.0</version>
+          <version>3.1.1</version>
         </plugin>
         <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
         <plugin>
@@ -103,9 +103,22 @@
         </plugin>
         <plugin>
           <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>3.4.1</version>
+          <version>3.5.0</version>
         </plugin>
       </plugins>
     </pluginManagement>
   </build>
+
+  <repositories>
+    <!-- Check Maven Central first (before other repos below) -->
+    <repository>
+        <id>maven-central</id>
+        <url>https://repo.maven.apache.org/maven2</url>
+    </repository>
+    <!-- For Handle Server -->
+    <repository>
+        <id>handle.net</id>
+        <url>https://handle.net/maven</url>
+    </repository>
+  </repositories>
 </project>

src/main/java/io/github/ilri/cgspace/ctasks/CountriesVocabulary.java

@@ -10,14 +10,14 @@ import javax.annotation.Nullable;
 
 public class CountriesVocabulary {
 
-    class Country {
-        private String name; // required
-        private String common_name; // optional
-        private String official_name; // optional
-        private String cgspace_name; // optional
-        private String numeric; // required Hmmmm need to cast this...
-        private String alpha_2; // required
-        private String alpha_3; // required
+    static class Country {
+        private final String name; // required
+        private final String common_name; // optional
+        private final String official_name; // optional
+        private final String cgspace_name; // optional
+        private final String numeric; // required Hmmmm need to cast this...
+        private final String alpha_2; // required
+        private final String alpha_3; // required
 
         public Country(
                 String name,

src/main/java/io/github/ilri/cgspace/ctasks/CountryCodeTagger.java

@@ -8,7 +8,8 @@ package io.github.ilri.cgspace.ctasks;
 
 import com.google.gson.Gson;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
@@ -23,6 +24,7 @@ import java.io.InputStreamReader;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 public class CountryCodeTagger extends AbstractCurationTask {
     public class CountryCodeTaggerConfig {
@@ -33,10 +35,10 @@ public class CountryCodeTagger extends AbstractCurationTask {
         private final String iso3166Alpha2Field = taskProperty("iso3166-alpha2.field");
         private final boolean forceupdate = taskBooleanProperty("forceupdate", false);
 
-        private Logger log = Logger.getLogger(CountryCodeTagger.class);
+        private final Logger log = LogManager.getLogger();
     }
 
-    public class CountryCodeTaggerResult {
+    public static class CountryCodeTaggerResult {
         private int status = Curator.CURATE_UNSET;
         private String result = null;
 
@@ -90,7 +92,7 @@ public class CountryCodeTagger extends AbstractCurationTask {
                 itemService.getMetadataByMetadataString(item, config.iso3166Field);
 
         // skip items that don't have country metadata
-        if (itemCountries.size() == 0) {
+        if (itemCountries.isEmpty()) {
             alpha2Result.setResult(itemHandle + ": no countries, skipping.");
             alpha2Result.setStatus(Curator.CURATE_SKIP);
         } else {
@@ -101,7 +103,7 @@ public class CountryCodeTagger extends AbstractCurationTask {
             BufferedReader reader =
                     new BufferedReader(
                             new InputStreamReader(
-                                    this.getClass().getResourceAsStream(config.isocodesJsonPath)));
+                                    Objects.requireNonNull(this.getClass().getResourceAsStream(config.isocodesJsonPath))));
             ISO3166CountriesVocabulary isocodesCountriesJson =
                     gson.fromJson(reader, ISO3166CountriesVocabulary.class);
             reader.close();
@@ -109,8 +111,8 @@ public class CountryCodeTagger extends AbstractCurationTask {
             reader =
                     new BufferedReader(
                             new InputStreamReader(
-                                    this.getClass()
-                                            .getResourceAsStream(config.cgspaceCountriesJsonPath)));
+                                    Objects.requireNonNull(this.getClass()
+                                            .getResourceAsStream(config.cgspaceCountriesJsonPath))));
             CGSpaceCountriesVocabulary cgspaceCountriesJson =
                     gson.fromJson(reader, CGSpaceCountriesVocabulary.class);
             reader.close();
@@ -133,7 +135,7 @@ public class CountryCodeTagger extends AbstractCurationTask {
             List<MetadataValue> itemAlpha2CountryCodes =
                     itemService.getMetadataByMetadataString(item, config.iso3166Alpha2Field);
 
-            if (itemAlpha2CountryCodes.size() == 0) {
+            if (itemAlpha2CountryCodes.isEmpty()) {
                 List<String> newAlpha2Codes = new ArrayList<String>();
                 for (MetadataValue itemCountry : itemCountries) {
                     // check ISO 3166-1 countries
@@ -157,7 +159,7 @@ public class CountryCodeTagger extends AbstractCurationTask {
                     }
                 }
 
-                if (newAlpha2Codes.size() > 0) {
+                if (!newAlpha2Codes.isEmpty()) {
                     try {
                         itemService.addMetadata(
                                 Curator.curationContext(),

src/main/java/io/github/ilri/cgspace/ctasks/README.md

@@ -3,7 +3,7 @@ DSpace curation tasks used on the [CGSpace](https://cgspace.cgiar.org) instituti
 
 - **CountryCodeTagger**: add ISO 3166-1 Alpha2 country codes to items based on their existing country metadata
 
-Tested on DSpace 6.3. Read more about the [DSpace curation system](https://wiki.lyrasis.org/display/DSDOC5x/Curation+System).
+Tested on DSpace 7.6. Read more about the [DSpace curation system](https://wiki.lyrasis.org/display/DSDOC5x/Curation+System).
 
 ## Build and Install
 
@@ -14,7 +14,7 @@ To use these curation tasks in a DSpace project add the following dependency to
 <dependency>
   <groupId>io.github.ilri.cgspace</groupId>
   <artifactId>cgspace-java-helpers</artifactId>
-  <version>6.1-SNAPSHOT</version>
+  <version>7.6-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -30,7 +30,7 @@ $ mvn package
 Copy the resulting jar to the DSpace `lib` directory:
 
 ```
-$ cp target/cgspace-java-helpers-6.1-SNAPSHOT.jar ~/dspace/lib/
+$ cp target/cgspace-java-helpers-7.6-SNAPSHOT.jar ~/dspace/lib/
 ```
 
 ## Configuration

src/main/java/io/github/ilri/cgspace/scripts/FixJpgJpgThumbnails.java

@@ -59,10 +59,9 @@ public class FixJpgJpgThumbnails {
                 DSpaceObject parent = handleService.resolveToObject(context, parentHandle);
                 if (parent != null) {
                     switch (parent.getType()) {
-                        case Constants.COLLECTION:
-                            process(
-                                    context,
-                                    itemService.findByCollection(context, (Collection) parent));
+                        case Constants.SITE:
+                            process(context, itemService.findAll(context));
+                            context.commit();
                             break;
                         case Constants.COMMUNITY:
                             List<Collection> collections = ((Community) parent).getCollections();
@@ -71,9 +70,13 @@ public class FixJpgJpgThumbnails {
                                         context,
                                         itemService.findAllByCollection(context, collection));
                             }
+                            context.commit();
                             break;
-                        case Constants.SITE:
-                            process(context, itemService.findAll(context));
+                        case Constants.COLLECTION:
+                            process(
+                                    context,
+                                    itemService.findByCollection(context, (Collection) parent));
+                            context.commit();
                             break;
                         case Constants.ITEM:
                             processItem(context, (Item) parent);
@@ -135,7 +138,7 @@ public class FixJpgJpgThumbnails {
                         for (Bitstream originalBitstream : originalBundleBitstreams) {
                             String originalName = originalBitstream.getName();
 
-                            long originalBitstreamBytes = originalBitstream.getSize();
+                            long originalBitstreamBytes = originalBitstream.getSizeBytes();
 
                             /*
                             - check if the original file name is the same as the thumbnail name minus the extra ".jpg"

src/main/java/io/github/ilri/cgspace/scripts/FixLowQualityThumbnails.java

@@ -76,10 +76,9 @@ public class FixLowQualityThumbnails {
                 DSpaceObject parent = handleService.resolveToObject(context, parentHandle);
                 if (parent != null) {
                     switch (parent.getType()) {
-                        case Constants.COLLECTION:
-                            process(
-                                    context,
-                                    itemService.findByCollection(context, (Collection) parent));
+                        case Constants.SITE:
+                            process(context, itemService.findAll(context));
+                            context.commit();
                             break;
                         case Constants.COMMUNITY:
                             List<Collection> collections = ((Community) parent).getCollections();
@@ -88,9 +87,13 @@ public class FixLowQualityThumbnails {
                                         context,
                                         itemService.findAllByCollection(context, collection));
                             }
+                            context.commit();
                             break;
-                        case Constants.SITE:
-                            process(context, itemService.findAll(context));
+                        case Constants.COLLECTION:
+                            process(
+                                    context,
+                                    itemService.findByCollection(context, (Collection) parent));
+                            context.commit();
                             break;
                         case Constants.ITEM:
                             processItem(context, (Item) parent);
@@ -119,6 +122,8 @@ public class FixLowQualityThumbnails {
 
     private static void processItem(Context context, Item item)
             throws SQLException, AuthorizeException, IOException {
+        System.out.println("FixLowQualityThumbnails: processing item: " + item.getHandle());
+
         // Set some state for the item before we iterate over the THUMBNAIL bundle
         boolean itemHasImThumbnail = false;
 
@@ -159,7 +164,7 @@ public class FixLowQualityThumbnails {
                     // ption will *always* be "Generated Thumbnail".
                     if ("Generated Thumbnail".equals(thumbnailDescription)) {
                         System.out.print("\u001b[33m");
-                        System.out.println("Deleting (" + item.getHandle() + "):");
+                        System.out.println("> Action: remove old thumbnail from THUMBNAIL bundle");
                         System.out.println("> Name: »" + thumbnailName + "«");
                         System.out.println("> Description: »" + thumbnailDescription + "«");
                         System.out.print("\u001b[0m");
@@ -173,7 +178,7 @@ public class FixLowQualityThumbnails {
                     } else if (thumbnailDescription.toLowerCase().contains("thumbnail")
                             && !"IM Thumbnail".equals(thumbnailDescription)) {
                         System.out.print("\u001b[33m");
-                        System.out.println("Deleting (" + item.getHandle() + "):");
+                        System.out.println("> Action: remove manually uploaded thumbnail from THUMBNAIL bundle");
                         System.out.println("> Name: »" + thumbnailName + "«");
                         System.out.println("> Description: »" + thumbnailDescription + "«");
                         System.out.print("\u001b[0m");
@@ -185,7 +190,7 @@ public class FixLowQualityThumbnails {
                         // a thumbnail for a journal or a limited access item.
                     } else {
                         System.out.print("\u001b[34m");
-                        System.out.println("Skipping (" + item.getHandle() + "):");
+                        System.out.println("> Action: skip other thumbnail in THUMBNAIL bundle");
                         System.out.println("> Name: »" + thumbnailName + "«");
                         System.out.println("> Description: »" + thumbnailDescription + "«");
                         System.out.print("\u001b[0m");
@@ -250,7 +255,7 @@ public class FixLowQualityThumbnails {
                             && (originalName.toLowerCase().contains("thumbnail")
                                     || originalDescription.toLowerCase().contains("thumbnail"))) {
                         System.out.print("\u001b[33m");
-                        System.out.println("Removing (" + item.getHandle() + "):");
+                        System.out.println("> Action: remove thumbnail from ORIGINAL bundle");
                         System.out.println("> Name: »" + originalName + "«");
                         System.out.println("> Description: »" + originalDescription + "«");
                         System.out.print("\u001b[0m");
@@ -260,7 +265,7 @@ public class FixLowQualityThumbnails {
 
                     } else {
                         System.out.print("\u001b[34m");
-                        System.out.println("Skipping (" + item.getHandle() + "):");
+                        System.out.println("> Action: skip other bitstream in ORIGINAL bundle");
                         System.out.println("> Name: »" + originalName + "«");
                         System.out.println("> Description: »" + originalDescription + "«");
                         System.out.print("\u001b[0m");

src/main/java/io/github/ilri/cgspace/scripts/README.md

@@ -4,7 +4,7 @@ Java-based helpers used on the [CGSpace](https://cgspace.cgiar.org) institutiona
 - **FixJpgJpgThumbnails**: fix low-quality ".jpg.jpg" thumbnails by replacing them with their originals
 - **FixLowQualityThumbnails**: remove low-quality thumbnails when PDF bitstreams are present
 
-Tested on DSpace 6.3. Read more about the [DSpace curation system](https://wiki.lyrasis.org/display/DSDOC6x/Curation+System).
+Tested on DSpace 7.6. Read more about the [DSpace curation system](https://wiki.lyrasis.org/display/DSDOC6x/Curation+System).
 
 ## Build and Install
 
@@ -15,7 +15,7 @@ To use these curation tasks in a DSpace project add the following dependency to
 <dependency>
   <groupId>io.github.ilri.cgspace</groupId>
   <artifactId>cgspace-java-helpers</artifactId>
-  <version>6.1-SNAPSHOT</version>
+  <version>7.6-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -31,7 +31,7 @@ $ mvn package
 Copy the resulting jar to the DSpace `lib` directory:
 
 ```console
-$ cp target/cgspace-java-helpers-6.1-SNAPSHOT.jar ~/dspace/lib/
+$ cp target/cgspace-java-helpers-7.6-SNAPSHOT.jar ~/dspace/lib/
 ```
 
 ## Invocation

src/main/resources/io/github/ilri/cgspace/ctasks/cgspace-countries.json

@@ -16,29 +16,15 @@
       "name": "Congo, The Democratic Republic of the",
       "numeric": "180"
     },
-    {
-      "alpha_2": "IR",
-      "alpha_3": "IRN",
-      "name": "Iran, Islamic Republic of",
-      "cgspace_name": "Iran",
-      "numeric": "364",
-      "official_name": "Islamic Republic of Iran"
-    },
     {
       "alpha_2": "KP",
       "alpha_3": "PRK",
+      "common_name": "North Korea",
       "name": "Korea, Democratic People's Republic of",
       "cgspace_name": "Korea, DPR",
       "numeric": "408",
       "official_name": "Democratic People's Republic of Korea"
     },
-    {
-      "alpha_2": "LA",
-      "alpha_3": "LAO",
-      "name": "Lao People's Democratic Republic",
-      "cgspace_name": "Laos",
-      "numeric": "418"
-    },
     {
       "alpha_2": "FM",
       "alpha_3": "FSM",
@@ -53,13 +39,6 @@
       "name": "Russian Federation",
       "cgspace_name": "Russia",
       "numeric": "643"
-    },
-    {
-      "alpha_2": "SY",
-      "alpha_3": "SYR",
-      "name": "Syrian Arab Republic",
-      "cgspace_name": "Syria",
-      "numeric": "760"
     }
   ]
 }