From 0b1ecd92aa1c591bcd148b814653c70e106f2d14 Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno@elovirta.com>
Date: Sun, 10 Nov 2024 17:21:38 +0200
Subject: [PATCH] Update minumum DITA-OT to 4.1

---
 .github/workflows/dist.yml               | 10 +++++-----
 .github/workflows/test.yml               | 12 ++++++------
 .sdkmanrc                                |  4 ++--
 build.gradle                             |  6 +++---
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 src/test/resources/src/authored.json     | 10 ----------
 6 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
index a38f3f9..590caa4 100644
--- a/.github/workflows/dist.yml
+++ b/.github/workflows/dist.yml
@@ -11,12 +11,12 @@ jobs:
   dist:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 8
+          java-version: 17
           cache: gradle
       - name: Build with Gradle
         run: ./gradlew dist
@@ -40,7 +40,7 @@ jobs:
           echo "VERSION=$(echo $GITHUB_REF | cut -d / -f 3)" >> $GITHUB_ENV
           echo "PLUGIN_NAME=com.elovirta.pdf" >> $GITHUB_ENV
       - name: Check out registry
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: dita-ot/registry
           path: registry
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fae280f..35211e7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,9 +8,9 @@ jobs:
   node:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js 18.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
       - run: npm install
@@ -21,12 +21,12 @@ jobs:
   java:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 8
+          java-version: 17
           cache: gradle
       - name: Build with Gradle
         run: ./gradlew dist
diff --git a/.sdkmanrc b/.sdkmanrc
index 593bdf1..6d2a4aa 100644
--- a/.sdkmanrc
+++ b/.sdkmanrc
@@ -1,4 +1,4 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=8.0.282.hs-adpt
-gradle=6.8.3
+java=17.0.7-tem
+gradle=8.7
diff --git a/build.gradle b/build.gradle
index ff6bfea..85e38a9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,8 +10,8 @@ repositories {
     mavenCentral()
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 17
+targetCompatibility = 17
 
 dependencies {
     implementation group: 'org.apache.ant', name: 'ant', version:'1.10.12'
@@ -26,7 +26,7 @@ dependencies {
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.2.2'
     implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.13.0'
     implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32'
-    implementation group: "org.dita-ot", name: "dost", version: "[3.4,4.0)"
+    implementation group: "org.dita-ot", name: "dost", version: "[4.1,)"
     implementation group: 'net.sf.saxon', name: 'Saxon-HE', version: '10.6'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d913..48c0a02 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/test/resources/src/authored.json b/src/test/resources/src/authored.json
index 45f1957..39f08e7 100644
--- a/src/test/resources/src/authored.json
+++ b/src/test/resources/src/authored.json
@@ -1,12 +1,6 @@
 {
   "$schema": "../../../main/resources/schema.json",
 
-  "brand": {
-    "color": {
-      "primary": "pink"
-    }
-  },
-
   "page": {
     "size": "A4",
     "top": "20mm",
@@ -40,10 +34,6 @@
       "background-color": "pink",
       "border-after": "solid 1pt gray"
     },
-    "example": {
-      "title": { "background-color": "pink" }
-    },
-    "note": {},
     "table": {
       "header": { "color": "green" }
     }