Merge remote-tracking branch 'origin/main' into SRU2026

Author: zubri

.claude/hooks/block-generated.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+# PreToolUse hook: block writes to generated source folders.
+set -eu
+
+path=$(jq -r '.tool_input.file_path // empty')
+[ -z "$path" ] && exit 0
+
+case "$path" in
+  */src/generated/*|*/src/generated)
+    cat >&2 <<MSG
+Refusing to modify $path.
+This file is under src/generated and is copied from external codegen projects.
+Edit the upstream codegen source instead, or regenerate locally.
+MSG
+    exit 2
+    ;;
+esac
+
+exit 0

.claude/hooks/no-author-tag.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+# PreToolUse hook: reject @author javadoc tags in Java edits.
+set -eu
+
+input=$(cat)
+tool=$(printf '%s' "$input" | jq -r '.tool_name // empty')
+path=$(printf '%s' "$input" | jq -r '.tool_input.file_path // empty')
+
+case "$path" in
+  *.java) ;;
+  *) exit 0 ;;
+esac
+
+case "$tool" in
+  Edit)         content=$(printf '%s' "$input" | jq -r '.tool_input.new_string // empty') ;;
+  Write)        content=$(printf '%s' "$input" | jq -r '.tool_input.content // empty') ;;
+  NotebookEdit) content=$(printf '%s' "$input" | jq -r '.tool_input.new_source // empty') ;;
+  *) exit 0 ;;
+esac
+
+if printf '%s' "$content" | grep -Eq '(^|[^A-Za-z0-9_])@author([^A-Za-z0-9_]|$)'; then
+  cat >&2 <<MSG
+Refusing edit: $path introduces an @author javadoc tag.
+Project convention (CLAUDE.md): do not use @author. Use @since for new public APIs.
+MSG
+  exit 2
+fi
+
+exit 0

.claude/settings.json

@@ -1,4 +1,15 @@
 {
+  "hooks": {
+    "PreToolUse": [
+      {
+        "matcher": "Edit|Write|NotebookEdit",
+        "hooks": [
+          { "type": "command", "command": "sh $CLAUDE_PROJECT_DIR/.claude/hooks/block-generated.sh" },
+          { "type": "command", "command": "sh $CLAUDE_PROJECT_DIR/.claude/hooks/no-author-tag.sh" }
+        ]
+      }
+    ]
+  },
   "permissions": {
     "allow": [
       "Bash(./gradlew:*)",

.github/workflows/gradle.yml

@@ -4,9 +4,9 @@ name: Java CI with Gradle
 
 on:
   push:
-    branches: [ "main", "SRU2024_v10" ]
+    branches: [ "main", "SRU2025-java8-maintenance", "SRU2026" ]
 #  pull_request:
-#    branches: [ "main", "SRU2024_v10" ]
+#    branches: [ "main" ]
 
 jobs:
 
@@ -19,17 +19,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      # Set the JDK 11 for the latest code branch (Prowide Core v10)
+      # Set up JDK 11 for current development branches (main, next SRU)
       - name: Set up JDK 11
-        if: github.ref == 'refs/heads/SRU2024_v10' || github.head_ref == 'SRU2024_v10'
+        if: github.ref != 'refs/heads/SRU2025-java8-maintenance' && github.head_ref != 'SRU2025-java8-maintenance'
         uses: actions/setup-java@v4
         with:
           java-version: '11'
           distribution: 'temurin'
 
-      # Set the JDK 8 for the legacy code branch
+      # Set up JDK 8 only for the legacy Java 8 maintenance branch
       - name: Set up JDK 8
-        if: github.ref != 'refs/heads/SRU2024_v10' && github.head_ref != 'SRU2024_v10'
+        if: github.ref == 'refs/heads/SRU2025-java8-maintenance' || github.head_ref == 'SRU2025-java8-maintenance'
         uses: actions/setup-java@v4
         with:
           java-version: '8'
@@ -47,9 +47,9 @@ jobs:
         run: ./gradlew test --info
 
   # This job generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies.
-  # We only do it for the SRU2024_v10 branch to avoid spamming the Dependabot alerts for the legacy Java 8 code.
+  # We only run it on the default branch (main) to avoid duplicate alerts from maintenance branches.
   dependency-submission:
-    if: github.ref == 'refs/heads/SRU2024_v10' || github.head_ref == 'SRU2024_v10'
+    if: github.ref == 'refs/heads/main' || github.head_ref == 'main'
     runs-on: ubuntu-latest
     permissions:
       contents: write

CHANGELOG.md

@@ -1,13 +1,18 @@
 # Prowide ISO 20022 - CHANGELOG
 
+### 10.4.1 - SNAPSHOT
+  * Feat: `xsd:any` wildcard content (e.g. `SplmtryData/Envlp`, signature envelopes) is no longer dropped on parse; it is captured as an `org.w3c.dom.Element` with namespaces preserved (GH-39, GH-43)
+  * Fix: `toJson()` now serializes `@XmlAnyElement` wildcard content as raw XML instead of an empty `{}`, and `fromJson()` restores it back to a DOM Element (round-trippable)
+  * Updated gson from 2.13.2 to 2.14.0
+
 ### 10.4.0 - May 2026
   * SWIFT Standard release update 2026 (live 14 November 2026)
   * Yearly revision of deprecation phase (see https://dev.prowidesoftware.com/SRU2024/getting-started/deprecation/)
+  * Updated gson from 2.13.2 to 2.14.0
 
 ### 10.3.8 - May 2026
   * (PW-3202) Fix: removed spurious `Error propagating pending prefix mapping` warnings when parsing regular ISO 20022 Documents wrapped in an SNL-like envelope
   * (PW-3185) `MxSwiftMessage.toJson()` now uses 1-based months (January=1) for Calendar fields and emits a `schemaVersion` marker. `fromJson()` reads both new and legacy (0-based) payloads transparently.
-  * Updated gson from 2.13.2 to 2.14.0
 
 ### 10.3.7 - April 2026
   * (PW-3207) Fix: update semt.044.001.01 model from draft4 to draft5

CLAUDE.md

@@ -149,7 +149,6 @@ src/generated/java  → JAXB-generated code from XSD schemas (DO NOT MODIFY)
 - Uses **Axion Release Plugin** for Git-based versioning
 - Version format: `SRU{YEAR}-{semantic-version}` (e.g., `SRU2024-10.2.9`)
 - **SRU** (Standards Release Update) tracks SWIFT's annual schema releases
-- Always update `CHANGELOG.md` with functional, concise entries
 
 ### Build Performance
 - **Very large codebase** - full build can be slow

build.gradle

@@ -37,7 +37,7 @@ scmVersion {
 	}
 }
 //project.version = "${SRU}-${scmVersion.version}"
-project.version = "${SRU}-10.4.0"
+project.version = "${SRU}-10.4.1"
 
 allprojects {
 
@@ -162,13 +162,15 @@ project(':iso20022-core') {
 
 		testImplementation "jakarta.persistence:jakarta.persistence-api:${jakartaPersistenceVersion}"
 		testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
-		testImplementation 'com.google.guava:guava:33.5.0-jre'
+		testImplementation 'com.google.guava:guava:33.6.0-jre'
 		testImplementation 'org.assertj:assertj-core:3.27.7'
-		testImplementation 'org.xmlunit:xmlunit-core:2.11.0'
-		testImplementation 'org.xmlunit:xmlunit-matchers:2.11.0'
-		testImplementation 'org.xmlunit:xmlunit-assertj:2.11.0'
+		testImplementation 'org.xmlunit:xmlunit-core:2.12.0'
+		testImplementation 'org.xmlunit:xmlunit-matchers:2.12.0'
+		testImplementation 'org.xmlunit:xmlunit-assertj:2.12.0'
 		testImplementation project(':model-acmt-mx')
 		testImplementation project(':model-acmt-types')
+		testImplementation project(':model-admi-mx')
+		testImplementation project(':model-admi-types')
 		testImplementation project(':model-camt-mx')
 		testImplementation project(':model-camt-types')
 		testImplementation project(':model-catm-mx')

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME