diff --git a/Changelog.md b/Changelog.md index 9c82661..53eba55 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,9 @@ 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.2.0] - 2026-02-11 +- switch parent pom from rspace-os-parent to rspace-parent (updates/changes a lot of dependencies) + ## [1.1.0] - 2024-01-16 - change maven artifactId and groupId (to follow naming convention for RSpace OS projects) - use parent pom from rspace-os-parent project (which updates many dependencies) diff --git a/jitpack.yml b/jitpack.yml index 809db6e..39d8bac 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 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 69fc3ea..3cf0fad 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,13 @@ 4.0.0 protocols-java-client - 1.1.0 + 1.2.0 Protocol.IO model classes + com.github.rspace-os - rspace-os-parent - 0.1.2 + rspace-parent + 2.1.3 @@ -33,14 +34,6 @@ - - commons-io - commons-io - - - commons-lang - commons-lang - com.fasterxml.jackson.core jackson-core @@ -67,8 +60,4 @@ - - 1.18.22 - - diff --git a/src/main/java/com/researchspace/protocolsio/PIOCentrifugeComponentType.java b/src/main/java/com/researchspace/protocolsio/PIOCentrifugeComponentType.java index 5d1a25f..74999c7 100644 --- a/src/main/java/com/researchspace/protocolsio/PIOCentrifugeComponentType.java +++ b/src/main/java/com/researchspace/protocolsio/PIOCentrifugeComponentType.java @@ -4,7 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang.time.DurationFormatUtils; +import org.apache.commons.lang3.time.DurationFormatUtils; @Data @AllArgsConstructor diff --git a/src/main/java/com/researchspace/protocolsio/PIODurationComponentType.java b/src/main/java/com/researchspace/protocolsio/PIODurationComponentType.java index 82214f2..1628d27 100644 --- a/src/main/java/com/researchspace/protocolsio/PIODurationComponentType.java +++ b/src/main/java/com/researchspace/protocolsio/PIODurationComponentType.java @@ -1,6 +1,6 @@ package com.researchspace.protocolsio; -import org.apache.commons.lang.time.DurationFormatUtils; +import org.apache.commons.lang3.time.DurationFormatUtils; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/com/researchspace/protocolsio/PIOShakerComponentType.java b/src/main/java/com/researchspace/protocolsio/PIOShakerComponentType.java index 66a0148..340ef74 100644 --- a/src/main/java/com/researchspace/protocolsio/PIOShakerComponentType.java +++ b/src/main/java/com/researchspace/protocolsio/PIOShakerComponentType.java @@ -4,7 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang.time.DurationFormatUtils; +import org.apache.commons.lang3.time.DurationFormatUtils; @Data @AllArgsConstructor