Remove Grok

cantaloupe-project · Jul 31, 2024 · 493c503 · 493c503
1 parent e1a9d6d
commit 493c503
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 867 deletions.
diff --git a/README.md b/README.md
@@ -50,7 +50,6 @@ continuous integration. The following dependencies are required:
 
 * MinIO (for S3SourceTest & S3CacheTest)
 * FFmpeg (for FfmpegProcessorTest)
-* Grok (for GrokProcessorTest)
 * OpenJPEG (for OpenJpegProcessorTest)
 * TurboJPEG with Java binding (for TurboJpegProcessorTest)
 * Redis (for RedisCacheTest)

diff --git a/cantaloupe.properties.sample b/cantaloupe.properties.sample
@@ -331,7 +331,7 @@ JdbcSource.connection_timeout = 10
 processor.selection_strategy = AutomaticSelectionStrategy
 
 # Built-in processors are `Java2dProcessor`, TurboJpegProcessor`,
-# `KakaduNativeProcessor`, `OpenJpegProcessor`, `GrokProcessor`,`JaiProcessor`,
+# `KakaduNativeProcessor`, `OpenJpegProcessor`, `JaiProcessor`,
 # `PdfBoxProcessor`, and `FfmpegProcessor`.
 # Some of these have third-party dependencies and won't work out-of-the-box.
 
@@ -443,14 +443,6 @@ FfmpegProcessor.path_to_binaries =
 # Overrides the PATH.
 OpenJpegProcessor.path_to_binaries =
 
-#----------------------------------------
-# GrokProcessor
-#----------------------------------------
-
-# Optional absolute path of the directory containing grk_decompress.
-# Overrides the PATH.
-GrokProcessor.path_to_binaries =
-
 #----------------------------------------
 # PdfBoxProcessor
 #----------------------------------------

diff --git a/docker/Linux-GraalVM20/Dockerfile b/docker/Linux-GraalVM20/Dockerfile
@@ -20,8 +20,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
                 zlib1g-dev \
                 libwebp-dev \
                 libimage-exiftool-perl \
-                libgrokj2k1 \
-                grokj2k-tools \ 
                 adduser \
     && rm -rf /var/lib/apt/lists/*
 
@@ -32,12 +30,6 @@ COPY docker/Linux-JDK11/image_files/libjpeg-turbo/lib64 /opt/libjpeg-turbo/lib
 # Install KakaduNativeProcessor dependencies
 COPY dist/deps/Linux-x86-64/lib/* /usr/lib/
 
-# Install GrokProcessor dependencies
-#RUN wget -q https://github.com/GrokImageCompression/grok/releases/download/v7.6.5/libgrokj2k1_7.6.5-1_amd64.deb \
-#    && wget -q https://github.com/GrokImageCompression/grok/releases/download/v7.6.5/grokj2k-tools_7.6.5-1_amd64.deb \
-#    && dpkg -i --ignore-depends=libjpeg62-turbo ./grokj2k-tools_7.6.5-1_amd64.deb
-#    && dpkg -i ./libgrokj2k1_7.6.5-1_amd64.deb \
-
 # 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 \

diff --git a/docker/Linux-JDK11/Dockerfile b/docker/Linux-JDK11/Dockerfile
@@ -18,8 +18,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
                 zlib1g-dev \
                 libwebp-dev \
                 libimage-exiftool-perl \
-                libgrokj2k1 \
-                grokj2k-tools \ 
                 adduser \
     && rm -rf /var/lib/apt/lists/*
 
@@ -30,17 +28,11 @@ COPY docker/Linux-JDK11/image_files/libjpeg-turbo/lib64 /opt/libjpeg-turbo/lib
 # Install KakaduNativeProcessor dependencies
 COPY dist/deps/Linux-x86-64/lib/* /usr/lib/
 
-# Install GrokProcessor dependencies
-#RUN wget -q https://github.com/GrokImageCompression/grok/releases/download/v7.6.5/libgrokj2k1_7.6.5-1_amd64.deb \
-#    && 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
-
 # A non-root user is needed for some FilesystemSourceTest tests to work.
 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
 

diff --git a/docker/Linux-JDK18/Dockerfile b/docker/Linux-JDK18/Dockerfile
@@ -9,7 +9,6 @@ ARG DEBIAN_FRONTEND=noninteractive
 # * ffmpeg is needed by FfmpegProcessor
 # * wget download stuffs in this dockerfile
 # * 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 \
@@ -23,8 +22,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     zlib1g-dev \
     libwebp-dev \
     libimage-exiftool-perl \
-    libgrokj2k1 \
-    grokj2k-tools \ 
     adduser \
     && rm -rf /var/lib/apt/lists/*
 
@@ -35,13 +32,7 @@ COPY docker/Linux-JDK11/image_files/libjpeg-turbo/lib64 /opt/libjpeg-turbo/lib
 # Install KakaduNativeProcessor dependencies
 COPY dist/deps/Linux-x86-64/lib/* /usr/lib/
 
-# Install various other dependencies that aren't in apt
-# Install GrokProcessor dependencies
-#RUN wget -q https://github.com/GrokImageCompression/grok/releases/download/v7.6.5/libgrokj2k1_7.6.5-1_amd64.deb \
-#    && 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 \

diff --git a/pom.xml b/pom.xml
@@ -340,7 +340,7 @@
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>htmlunit-driver</artifactId>
-            <version>2.21</version> 
+            <version>2.21</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -568,7 +568,6 @@
                                 <exclude>FfmpegProcessorTest</exclude>
                                 <exclude>*Kakadu*Test</exclude>
                                 <exclude>OpenJpegProcessorTest</exclude>
-                                <exclude>GrokProcessorTest</exclude>
                                 <exclude>RedisCacheTest</exclude>
                                 <exclude>TurboJpegProcessorTest</exclude>
                                 <exclude>TurboJPEG*Test</exclude>

diff --git a/src/main/java/edu/illinois/library/cantaloupe/config/Key.java b/src/main/java/edu/illinois/library/cantaloupe/config/Key.java
@@ -144,7 +144,6 @@ public enum Key {
     MAX_SCALE("max_scale"),
     META_IDENTIFIER_TRANSFORMER("meta_identifier.transformer"),
     OPENJPEGPROCESSOR_PATH_TO_BINARIES("OpenJpegProcessor.path_to_binaries"),
-    GROKPROCESSOR_PATH_TO_BINARIES("GrokProcessor.path_to_binaries"),
     OVERLAY_ENABLED("overlays.BasicStrategy.enabled"),
     OVERLAY_IMAGE("overlays.BasicStrategy.image"),
     OVERLAY_INSET("overlays.BasicStrategy.inset"),

diff --git a/src/main/java/edu/illinois/library/cantaloupe/processor/AutomaticSelectionStrategy.java b/src/main/java/edu/illinois/library/cantaloupe/processor/AutomaticSelectionStrategy.java
@@ -12,8 +12,7 @@ class AutomaticSelectionStrategy implements SelectionStrategy {
 
     private static final List<Class<? extends Processor>> JP2_CANDIDATES = List.of(
             KakaduNativeProcessor.class,
-            OpenJpegProcessor.class,
-            GrokProcessor.class);
+            OpenJpegProcessor.class);
     private static final List<Class<? extends Processor>> JPG_CANDIDATES = List.of(
             TurboJpegProcessor.class,
             Java2dProcessor.class);