From 6881accd5d617a5ee215f00d9b68580f7ffd969c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 May 2026 01:22:46 +0000 Subject: [PATCH 1/2] chore(deps): bump org.ehcache:ehcache from 3.10.8 to 3.12.0 in /dhis-2 Bumps [org.ehcache:ehcache](https://github.com/ehcache/ehcache3) from 3.10.8 to 3.12.0. - [Release notes](https://github.com/ehcache/ehcache3/releases) - [Commits](https://github.com/ehcache/ehcache3/compare/v3.10.8...v3.12.0) --- updated-dependencies: - dependency-name: org.ehcache:ehcache dependency-version: 3.12.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- dhis-2/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dhis-2/pom.xml b/dhis-2/pom.xml index 7216baf6cde3..eb93811b0f61 100644 --- a/dhis-2/pom.xml +++ b/dhis-2/pom.xml @@ -122,7 +122,7 @@ 12.4.0 5.6.15.Final - 3.10.8 + 3.12.0 4.0.7 3.9.5 From 0e6447d8e2ace873668053a6d1bb38f731401169 Mon Sep 17 00:00:00 2001 From: Enrico Date: Tue, 12 May 2026 11:51:36 +0200 Subject: [PATCH 2/2] Make TextPatternSegment implement Serializable --- .../java/org/hisp/dhis/textpattern/TextPatternSegment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/textpattern/TextPatternSegment.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/textpattern/TextPatternSegment.java index eb8e610e10c8..9d0c2c874fc2 100644 --- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/textpattern/TextPatternSegment.java +++ b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/textpattern/TextPatternSegment.java @@ -32,13 +32,14 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import java.io.Serializable; import java.util.Objects; import org.hisp.dhis.common.DxfNamespaces; /** * @author Stian Sandvold */ -public class TextPatternSegment { +public class TextPatternSegment implements Serializable { private TextPatternMethod method; private String parameter;