From 48c12cab46116ade7f3ec8a2c3dc4dc85a5ee7a8 Mon Sep 17 00:00:00 2001
From: Stefan Seifert <stefanseifert@users.noreply.github.com>
Date: Wed, 20 Dec 2023 11:21:59 +0100
Subject: [PATCH] Switch to AEM 6.5.17 as minimum version

---
 changes.xml                                            |  3 +++
 pom.xml                                                | 10 +++++-----
 .../handler/media/impl/AbstractMediaFileServlet.java   |  2 +-
 src/site/markdown/index.md                             |  1 +
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/changes.xml b/changes.xml
index e278c75a..db4e8544 100644
--- a/changes.xml
+++ b/changes.xml
@@ -27,6 +27,9 @@
       <action type="remove" dev="sseifert">
         Remove deprecated functionality.
       </action>
+      <action type="update" dev="sseifert">
+        Switch to AEM 6.5.17 as minimum version.
+      </action>
     </release>
 
     <release version="1.16.0" date="2023-12-18">
diff --git a/pom.xml b/pom.xml
index 7bcf3e33..f03da51a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.parent_toplevel</artifactId>
-    <version>2.2.9-SNAPSHOT</version>
+    <version>2.3.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -150,7 +150,7 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.testing.caconfig-mock-plugin</artifactId>
-      <version>1.5.2</version>
+      <version>1.5.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -212,20 +212,20 @@
     <dependency>
       <groupId>com.twelvemonkeys.imageio</groupId>
       <artifactId>imageio-tiff</artifactId>
-      <version>3.4.1</version>
+      <version>3.10.1</version>
       <scope>test</scope>
     </dependency>
     <!-- Java ImageIO Support for SVG -->
     <dependency>
       <groupId>com.twelvemonkeys.imageio</groupId>
       <artifactId>imageio-batik</artifactId>
-      <version>3.4.1</version>
+      <version>3.10.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.xmlgraphics</groupId>
       <artifactId>batik-transcoder</artifactId>
-      <version>1.9.1</version>
+      <version>1.17</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/src/main/java/io/wcm/handler/media/impl/AbstractMediaFileServlet.java b/src/main/java/io/wcm/handler/media/impl/AbstractMediaFileServlet.java
index eec6b6fc..8d38efa2 100644
--- a/src/main/java/io/wcm/handler/media/impl/AbstractMediaFileServlet.java
+++ b/src/main/java/io/wcm/handler/media/impl/AbstractMediaFileServlet.java
@@ -101,7 +101,7 @@ protected Resource getBinaryDataResource(SlingHttpServletRequest request) {
    * @return true if the resource is not modified and should not be delivered anew
    */
   protected boolean isNotModified(Resource resource, SlingHttpServletRequest request,
-      SlingHttpServletResponse response) throws IOException {
+      SlingHttpServletResponse response) {
     // check resource's modification date against the If-Modified-Since header and send 304 if resource wasn't modified
     // never send expires header on author or publish instance (performance optimization - if medialib items changes
     // users have to refresh browsers cache)
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index 383f52ab..29a9800b 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -43,6 +43,7 @@ Read the [general concepts][general-concepts] to get an overview of the function
 
 |Media Handler version |AEM version supported
 |----------------------|----------------------
+|2.0.x or higher       |AEM 6.5.17+, AEMaaCS
 |1.14.4 or higher      |AEM 6.5.7+, AEMaaCS
 |1.14.0 - 1.14.2       |AEM 6.5+, AEMaaCS
 |1.10.x - 1.13.x       |AEM 6.4.5+, AEMaaCS