diff --git a/Jenkinsfile b/Jenkinsfile index 0ae6ae0..533e760 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,4 @@ #!groovy @Library('rspace-shared') _ // builds rspace-client-java project -genericJavaLibBuild("emails":"operations@researchspace.com", - "branch":"${BRANCH_NAME}", "jdk":"OPEN-JDK-11") +genericJavaLibBuild("emails":"dev@researchspace.com", "branch":"${BRANCH_NAME}") diff --git a/changelog.md b/changelog.md index e6b428e..8067f32 100644 --- a/changelog.md +++ b/changelog.md @@ -4,6 +4,10 @@ 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). +## [1.96.0] - 2026-02-19 +- switch to using parent pom from rspace-parent project +- switch to latest rspace-client-java-model, so the calls work with latest RSpace API + ## [1.95.0] - 2023-12-18 - Compile with java 17 diff --git a/jitpack.yml b/jitpack.yml index e21c176..f21d6d1 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -4,5 +4,5 @@ before_install: - sdk install java 17.0.2-open - sdk use java 17.0.2-open - java -version - - sdk install maven + - sdk install maven 3.9.11 - mvn -v diff --git a/pom.xml b/pom.xml index e08e70a..05cc8d4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ 4.0.0 rspace-client-java - 1.95.1 + 1.96.0 com.github.rspace-os - rspace-os-parent - 0.1.1 + rspace-parent + 2.1.4 @@ -30,11 +30,21 @@ + + + + org.apache.httpcomponents + httpclient + ${apache.httpcomponents.version} + + + + com.github.rspace-os rspace-client-java-model - 1.95.0 + 1.99.0 @@ -57,10 +67,6 @@ httpcore 4.4.16 - - commons-io - commons-io - com.fasterxml.jackson.core jackson-core @@ -73,10 +79,6 @@ com.fasterxml.jackson.core jackson-databind - - org.slf4j - slf4j-api - org.slf4j slf4j-log4j12 diff --git a/src/main/java/com/researchspace/api/client/ApiConnectorImpl.java b/src/main/java/com/researchspace/api/client/ApiConnectorImpl.java index c6e9158..a583464 100644 --- a/src/main/java/com/researchspace/api/client/ApiConnectorImpl.java +++ b/src/main/java/com/researchspace/api/client/ApiConnectorImpl.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.researchspace.api.clientmodel.*; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.http.HttpEntity; import org.apache.http.client.fluent.Content; import org.apache.http.client.fluent.Request;