Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -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}")
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jitpack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
26 changes: 14 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>rspace-client-java</artifactId>
<version>1.95.1</version>
<version>1.96.0</version>
<parent>
<groupId>com.github.rspace-os</groupId>
<artifactId>rspace-os-parent</artifactId>
<version>0.1.1</version>
<artifactId>rspace-parent</artifactId>
<version>2.1.4</version>
</parent>

<repositories>
Expand All @@ -30,11 +30,21 @@
</plugins>
</build>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${apache.httpcomponents.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>com.github.rspace-os</groupId>
<artifactId>rspace-client-java-model</artifactId>
<version>1.95.0</version>
<version>1.99.0</version>
</dependency>

<dependency>
Expand All @@ -57,10 +67,6 @@
<artifactId>httpcore</artifactId>
<version>4.4.16</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
Expand All @@ -73,10 +79,6 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down