Merge branch 'develop' into TIFF-EXIF-orientation-classcast

docker/Linux-GraalVM20/Dockerfile

@@ -8,26 +8,26 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 # Install various dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
-		ffmpeg \
-		maven \
-		wget \
-		libopenjp2-tools \
-                liblcms2-dev \
-                libpng-dev \
-                libzstd-dev \
-                libtiff-dev \
-                libjpeg-dev \
-                zlib1g-dev \
-                libwebp-dev \
-                libimage-exiftool-perl \
-                libgrokj2k1 \
-                grokj2k-tools \ 
-                adduser \
-    && rm -rf /var/lib/apt/lists/*
+  ffmpeg \
+  maven \
+  wget \
+  libopenjp2-tools \
+  liblcms2-dev \
+  libpng-dev \
+  libzstd-dev \
+  libtiff-dev \
+  libjpeg-dev \
+  zlib1g-dev \
+  libwebp-dev \
+  libimage-exiftool-perl \
+  libgrokj2k1 \
+  grokj2k-tools \
+  adduser \
+  && rm -rf /var/lib/apt/lists/*
 
 # Install TurboJpegProcessor dependencies
 RUN mkdir -p /opt/libjpeg-turbo/lib
-COPY docker/Linux-JDK11/image_files/libjpeg-turbo/lib64 /opt/libjpeg-turbo/lib
+COPY docker/image_files/libjpeg-turbo/lib64 /opt/libjpeg-turbo/lib
 
 # Install KakaduNativeProcessor dependencies
 COPY dist/deps/Linux-x86-64/lib/* /usr/lib/
@@ -40,8 +40,8 @@ COPY dist/deps/Linux-x86-64/lib/* /usr/lib/
 
 # Install GraalVM
 RUN wget -q https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.3.0/graalvm-ce-java11-linux-amd64-20.3.0.tar.gz \
-    && tar xfz graalvm-ce-java11-linux-amd64-20.3.0.tar.gz \
-    && mv graalvm-ce-java11-20.3.0 /opt
+  && tar xfz graalvm-ce-java11-linux-amd64-20.3.0.tar.gz \
+  && mv graalvm-ce-java11-20.3.0 /opt
 
 # A non-root user is needed for some FilesystemSourceTest tests to work.
 ARG user=cantaloupe
@@ -56,7 +56,7 @@ COPY ./pom.xml pom.xml
 RUN mvn --quiet dependency:resolve
 
 # Copy the code
-COPY --chown=cantaloupe docker/Linux-JDK11/image_files/test.properties test.properties
+COPY --chown=cantaloupe docker/image_files/test.properties test.properties
 COPY --chown=cantaloupe ./src src
 
 ENTRYPOINT mvn --batch-mode test -Pfreedeps

docker/Linux-JDK11/Dockerfile

@@ -1,31 +1,31 @@
-FROM ubuntu:lunar
+FROM ubuntu:noble
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 # Install various dependencies
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-        openjdk-11-jdk-headless \
-		ffmpeg \
-		maven \
-		wget \
-  		libopenjp2-tools \
-                liblcms2-dev \
-                libpng-dev \
-                libzstd-dev \
-                libtiff-dev \
-                libjpeg-dev \
-                zlib1g-dev \
-                libwebp-dev \
-                libimage-exiftool-perl \
-                libgrokj2k1 \
-                grokj2k-tools \ 
-                adduser \
-    && rm -rf /var/lib/apt/lists/*
+  openjdk-11-jdk-headless \
+  ffmpeg \
+  maven \
+  wget \
+  libopenjp2-tools \
+  liblcms2-dev \
+  libpng-dev \
+  libzstd-dev \
+  libtiff-dev \
+  libjpeg-dev \
+  zlib1g-dev \
+  libwebp-dev \
+  libimage-exiftool-perl \
+  libgrokj2k1 \
+  grokj2k-tools \
+  adduser \
+  && rm -rf /var/lib/apt/lists/*
 
 # Install TurboJpegProcessor dependencies
 RUN mkdir -p /opt/libjpeg-turbo/lib
-COPY docker/Linux-JDK11/image_files/libjpeg-turbo/lib64 /opt/libjpeg-turbo/lib
+COPY docker/image_files/libjpeg-turbo/lib64 /opt/libjpeg-turbo/lib
 
 # Install KakaduNativeProcessor dependencies
 COPY dist/deps/Linux-x86-64/lib/* /usr/lib/
@@ -40,7 +40,7 @@ COPY dist/deps/Linux-x86-64/lib/* /usr/lib/
 ARG user=cantaloupe
 ARG home=/home/$user
 RUN adduser --home $home $user
-RUN chown -R $user $home 
+RUN chown -R $user $home
 USER $user
 WORKDIR $home
 
@@ -49,7 +49,7 @@ COPY ./pom.xml pom.xml
 RUN mvn --quiet dependency:resolve
 
 # Copy the code
-COPY --chown=cantaloupe docker/Linux-JDK11/image_files/test.properties test.properties
+COPY --chown=cantaloupe docker/image_files/test.properties test.properties
 COPY --chown=cantaloupe ./src src
 
 ENTRYPOINT mvn --batch-mode test -Pfreedeps

docker/Linux-JDK17/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:lunar
+FROM ubuntu:noble
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -30,7 +30,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 # Install TurboJpegProcessor dependencies
 RUN mkdir -p /opt/libjpeg-turbo/lib
-COPY docker/Linux-JDK11/image_files/libjpeg-turbo/lib64 /opt/libjpeg-turbo/lib
+COPY docker/image_files/libjpeg-turbo/lib64 /opt/libjpeg-turbo/lib
 
 # Install KakaduNativeProcessor dependencies
 COPY dist/deps/Linux-x86-64/lib/* /usr/lib/
@@ -50,7 +50,7 @@ RUN echo "export JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java))))" >
 RUN mvn --quiet dependency:resolve
 
 # Copy the code
-COPY --chown=cantaloupe docker/Linux-JDK11/image_files/test.properties test.properties
+COPY --chown=cantaloupe docker/image_files/test.properties test.properties
 COPY --chown=cantaloupe ./src src
 
 ENTRYPOINT mvn --batch-mode test -Pfreedeps

docker/Linux-JDK18/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:lunar
+FROM ubuntu:noble
 
 ENV JAVA_HOME=/opt/jdk
 ENV PATH=$PATH:/opt/jdk/bin:/opt/maven/bin
@@ -11,26 +11,26 @@ ARG DEBIAN_FRONTEND=noninteractive
 # * libopenjp2-tools is needed by OpenJpegProcessor
 # * All the rest is needed by GrokProcessor
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    ca-certificates \
-    ffmpeg \
-    wget \
-    libopenjp2-tools \
-    liblcms2-dev \
-    libpng-dev \
-    libzstd-dev \
-    libtiff-dev \
-    libjpeg-dev \
-    zlib1g-dev \
-    libwebp-dev \
-    libimage-exiftool-perl \
-    libgrokj2k1 \
-    grokj2k-tools \ 
-    adduser \
-    && rm -rf /var/lib/apt/lists/*
+  ca-certificates \
+  ffmpeg \
+  wget \
+  libopenjp2-tools \
+  liblcms2-dev \
+  libpng-dev \
+  libzstd-dev \
+  libtiff-dev \
+  libjpeg-dev \
+  zlib1g-dev \
+  libwebp-dev \
+  libimage-exiftool-perl \
+  libgrokj2k1 \
+  grokj2k-tools \
+  adduser \
+  && rm -rf /var/lib/apt/lists/*
 
 # Install TurboJpegProcessor dependencies
 RUN mkdir -p /opt/libjpeg-turbo/lib
-COPY docker/Linux-JDK11/image_files/libjpeg-turbo/lib64 /opt/libjpeg-turbo/lib
+COPY docker/image_files/libjpeg-turbo/lib64 /opt/libjpeg-turbo/lib
 
 # Install KakaduNativeProcessor dependencies
 COPY dist/deps/Linux-x86-64/lib/* /usr/lib/
@@ -41,15 +41,15 @@ COPY dist/deps/Linux-x86-64/lib/* /usr/lib/
 #    && wget -q https://github.com/GrokImageCompression/grok/releases/download/v7.6.5/grokj2k-tools_7.6.5-1_amd64.deb \
 #    && dpkg -i ./libgrokj2k1_7.6.5-1_amd64.deb \
 #    && dpkg -i --ignore-depends=libjpeg62-turbo ./grokj2k-tools_7.6.5-1_amd64.deb \
-    # Install OpenJDK
+# Install OpenJDK
 RUN wget -q https://download.java.net/java/GA/jdk18/43f95e8614114aeaa8e8a5fcf20a682d/36/GPL/openjdk-18_linux-x64_bin.tar.gz \
-    && tar xfz openjdk-18_linux-x64_bin.tar.gz \
-    && mv jdk-18 /opt/jdk \
-    # Install a newer Maven than the one in apt
-    && wget -q https://dlcdn.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz \
-    && tar xfz apache-maven-3.8.8-bin.tar.gz \
-    && mv apache-maven-3.8.8 /opt/maven \
-    && rm apache-maven-3.8.8-bin.tar.gz
+  && tar xfz openjdk-18_linux-x64_bin.tar.gz \
+  && mv jdk-18 /opt/jdk \
+  # Install a newer Maven than the one in apt
+  && wget -q https://dlcdn.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz \
+  && tar xfz apache-maven-3.8.8-bin.tar.gz \
+  && mv apache-maven-3.8.8 /opt/maven \
+  && rm apache-maven-3.8.8-bin.tar.gz
 
 # A non-root user is needed for some FilesystemSourceTest tests to work.
 ARG user=cantaloupe
@@ -64,7 +64,7 @@ COPY ./pom.xml pom.xml
 RUN mvn --quiet dependency:resolve
 
 # Copy the code
-COPY --chown=cantaloupe docker/Linux-JDK11/image_files/test.properties test.properties
+COPY --chown=cantaloupe docker/image_files/test.properties test.properties
 COPY --chown=cantaloupe ./src src
 
 ENTRYPOINT mvn --batch-mode test -Pfreedeps

docker/Linux-JDK21/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:lunar
+FROM ubuntu:noble
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -30,7 +30,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 # Install TurboJpegProcessor dependencies
 RUN mkdir -p /opt/libjpeg-turbo/lib
-COPY docker/Linux-JDK11/image_files/libjpeg-turbo/lib64 /opt/libjpeg-turbo/lib
+COPY docker/image_files/libjpeg-turbo/lib64 /opt/libjpeg-turbo/lib
 
 # Install KakaduNativeProcessor dependencies
 COPY dist/deps/Linux-x86-64/lib/* /usr/lib/
@@ -50,7 +50,7 @@ RUN echo "export JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java))))" >
 RUN mvn --quiet dependency:resolve
 
 # Copy the code
-COPY --chown=cantaloupe docker/Linux-JDK11/image_files/test.properties test.properties
+COPY --chown=cantaloupe docker/image_files/test.properties test.properties
 COPY --chown=cantaloupe ./src src
 
 ENTRYPOINT mvn --batch-mode test -Pfreedeps

docker/Windows-JDK11/Dockerfile

@@ -5,16 +5,16 @@ ENV chocolateyUseWindowsCompression false
 # Install the Chocolatey package manager, which makes it easier to install
 # dependencies.
 RUN powershell -Command \
-    iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')); \
-    choco feature disable --name showDownloadProgress
+  iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')); \
+  choco feature disable --name showDownloadProgress
 
 # Install various dependencies
 # TODO: openjpeg
 RUN choco install -y ojdkbuild11 maven ffmpeg
 
 # Install TurboJpegProcessor dependencies TODO: libjpeg-turbo
 #RUN mkdir -p /opt/libjpeg-turbo/lib
-#COPY docker/Windows10-JDK11/image_files/libjpeg-turbo/lib64 c:\windows\system32
+#COPY docker/image_files/libjpeg-turbo/lib64 c:\windows\system32
 
 # Install KakaduNativeProcessor dependencies
 COPY dist/deps/Windows-x86-64/lib/* c:/Windows/System32/
@@ -24,5 +24,5 @@ COPY pom.xml pom.xml
 RUN mvn dependency:resolve
 
 # Copy the code
-COPY docker/Windows-JDK11/image_files/test.properties test.properties
+COPY docker/image_files/test.properties test.properties
 COPY src src

docker/Windows-JDK17/Dockerfile

@@ -15,7 +15,7 @@ RUN choco install -y openjdk --version=17.0.2
 
 # Install TurboJpegProcessor dependencies TODO: libjpeg-turbo
 #RUN mkdir -p /opt/libjpeg-turbo/lib
-#COPY docker/Windows10-JDK11/image_files/libjpeg-turbo/lib64 c:\windows\system32
+#COPY docker/image_files/libjpeg-turbo/lib64 c:\windows\system32
 
 # Install KakaduNativeProcessor dependencies
 COPY dist/deps/Windows-x86-64/lib/* c:/Windows/System32/
@@ -25,5 +25,5 @@ COPY pom.xml pom.xml
 RUN mvn dependency:resolve
 
 # Copy the code
-COPY docker/Windows-JDK11/image_files/test.properties test.properties
+COPY docker/image_files/test.properties test.properties
 COPY src src

docker/Windows-JDK18/Dockerfile

@@ -5,14 +5,14 @@ ENV chocolateyUseWindowsCompression false
 # Install the Chocolatey package manager, which makes it easier to install
 # dependencies.
 RUN powershell -Command \
-    iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')); \
-    choco feature disable --name showDownloadProgress
+  iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')); \
+  choco feature disable --name showDownloadProgress
 
 # Install various dependencies
 # TODO: openjpeg
 RUN choco install -y maven ffmpeg
 RUN choco install -y openjdk --version=18.0.2
- 
+
 # Install TurboJpegProcessor dependencies TODO: libjpeg-turbo
 #RUN mkdir -p /opt/libjpeg-turbo/lib
 #COPY docker/Windows10-JDK11/image_files/libjpeg-turbo/lib64 c:\windows\system32
@@ -25,5 +25,5 @@ COPY pom.xml pom.xml
 RUN mvn dependency:resolve
 
 # Copy the code
-COPY docker/Windows-JDK11/image_files/test.properties test.properties
+COPY docker/image_files/test.properties test.properties
 COPY src src

docker/Windows-JDK21/Dockerfile

@@ -15,7 +15,7 @@ RUN choco install -y openjdk --version=21.0.2
 
 # Install TurboJpegProcessor dependencies TODO: libjpeg-turbo
 #RUN mkdir -p /opt/libjpeg-turbo/lib
-#COPY docker/Windows10-JDK11/image_files/libjpeg-turbo/lib64 c:\windows\system32
+#COPY docker/image_files/libjpeg-turbo/lib64 c:\windows\system32
 
 # Install KakaduNativeProcessor dependencies
 COPY dist/deps/Windows-x86-64/lib/* c:/Windows/System32/
@@ -25,5 +25,5 @@ COPY pom.xml pom.xml
 RUN mvn dependency:resolve
 
 # Copy the code
-COPY docker/Windows-JDK11/image_files/test.properties test.properties
+COPY docker/image_files/test.properties test.properties
 COPY src src