From d4d74533695cafa28d15c7e3fdad47918437ade9 Mon Sep 17 00:00:00 2001 From: Fraser <141634676+rs-fraser@users.noreply.github.com> Date: Fri, 20 Feb 2026 07:23:20 +0000 Subject: [PATCH 1/4] migrate to jakarta, Spring 6 --- pom.xml | 4 ++-- .../com/researchspace/figshare/impl/FigshareTemplate.java | 4 +++- .../java/com/researchspace/figshare/model/FigshareError.java | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 490c251..a956b7a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ 4.0.0 figshare-client-java - 0.7.0 + 1.0.0 com.github.rspace-os rspace-parent - 2.1.3 + 3.0.0 diff --git a/src/main/java/com/researchspace/figshare/impl/FigshareTemplate.java b/src/main/java/com/researchspace/figshare/impl/FigshareTemplate.java index 50b1e46..3ca11d9 100644 --- a/src/main/java/com/researchspace/figshare/impl/FigshareTemplate.java +++ b/src/main/java/com/researchspace/figshare/impl/FigshareTemplate.java @@ -22,6 +22,8 @@ import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.converter.ByteArrayHttpMessageConverter; @@ -284,7 +286,7 @@ public void deletePrivateArticleLink(Long articleId, String uniqueLinkKey) { String url = utils.createPath("/account/articles/{id}/private_links/{private_link_id}"); ResponseEntity resp = getRestTemplate().exchange(url, HttpMethod.DELETE, createEmptyEntity(), String.class, articleId, uniqueLinkKey); - log.debug(resp.getStatusCode().name()); + log.debug(resp.getStatusCode().toString()); } // personal token used for testing and is added to the Authorisation Header. diff --git a/src/main/java/com/researchspace/figshare/model/FigshareError.java b/src/main/java/com/researchspace/figshare/model/FigshareError.java index 3b60765..3952576 100644 --- a/src/main/java/com/researchspace/figshare/model/FigshareError.java +++ b/src/main/java/com/researchspace/figshare/model/FigshareError.java @@ -3,10 +3,11 @@ import org.springframework.http.HttpStatus; import lombok.Data; +import org.springframework.http.HttpStatusCode; @Data public class FigshareError { String message, code; - HttpStatus status; + HttpStatusCode status; } From 3a76f65586d784f983e0a58103c6c8712b38155c Mon Sep 17 00:00:00 2001 From: Fraser <141634676+rs-fraser@users.noreply.github.com> Date: Wed, 29 Apr 2026 16:37:52 +0100 Subject: [PATCH 2/4] RSDEV-444: switch rspace-parent to feature-branch SNAPSHOT, changelog --- CHANGELOG.md | 4 ++++ pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41946c0..ed3a99e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ This document record significant changes to the project +## 1.0.0 2026-04-29 +- Spring 6 / Hibernate 6 / Jakarta migration (RSDEV-444) +- Upgrade to rspace-parent 3.0.0 + ## 0.7.1 2026-04-27 - fix `IOException: stream is closed` on POST requests by adding `Content-Type: application/json` header diff --git a/pom.xml b/pom.xml index a956b7a..f386173 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.github.rspace-os rspace-parent - 3.0.0 + rsdev-444-upgrade-to-spring-6-SNAPSHOT From 89a933312f95f2837e6754a858ad23609723f043 Mon Sep 17 00:00:00 2001 From: Fraser <141634676+rs-fraser@users.noreply.github.com> Date: Wed, 15 Jul 2026 13:33:26 +0100 Subject: [PATCH 3/4] RSDEV-444: remove unused HttpStatus imports Addresses Copilot PR review feedback on the RSDEV-444 migration PRs. Co-Authored-By: Claude Opus 4.8 (1M context) --- .../java/com/researchspace/figshare/impl/FigshareTemplate.java | 2 -- .../java/com/researchspace/figshare/model/FigshareError.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/main/java/com/researchspace/figshare/impl/FigshareTemplate.java b/src/main/java/com/researchspace/figshare/impl/FigshareTemplate.java index c07184f..b252368 100644 --- a/src/main/java/com/researchspace/figshare/impl/FigshareTemplate.java +++ b/src/main/java/com/researchspace/figshare/impl/FigshareTemplate.java @@ -22,8 +22,6 @@ import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; -import org.springframework.http.HttpStatus; -import org.springframework.http.HttpStatusCode; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.client.BufferingClientHttpRequestFactory; diff --git a/src/main/java/com/researchspace/figshare/model/FigshareError.java b/src/main/java/com/researchspace/figshare/model/FigshareError.java index 3952576..7b023c9 100644 --- a/src/main/java/com/researchspace/figshare/model/FigshareError.java +++ b/src/main/java/com/researchspace/figshare/model/FigshareError.java @@ -1,7 +1,5 @@ package com.researchspace.figshare.model; -import org.springframework.http.HttpStatus; - import lombok.Data; import org.springframework.http.HttpStatusCode; From 3abdbbafab86f9fad1a647ae6e1431a39381f3e1 Mon Sep 17 00:00:00 2001 From: Fraser <141634676+rs-fraser@users.noreply.github.com> Date: Wed, 15 Jul 2026 15:22:21 +0100 Subject: [PATCH 4/4] RSDEV-444: pin rspace-parent to released 3.0.0 Co-Authored-By: Claude Fable 5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f386173..a956b7a 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.github.rspace-os rspace-parent - rsdev-444-upgrade-to-spring-6-SNAPSHOT + 3.0.0