Merge pull request #24 from FredPraca/feat/upgrade-versions

Upgrade versions

Author: makbn

README.md

@@ -72,7 +72,7 @@ remove the dots and make the first characters upper case. For example, `jthumbna
 
 ## Requirements
 
-- Java JRE **17**
+- Java JRE **21**
 - OpenOffice 4.x or LibreOffice 7.x
 
 ## Supported File Formats
@@ -97,7 +97,7 @@ remove the dots and make the first characters upper case. For example, `jthumbna
 <dependency>
   <groupId>io.github.makbn</groupId>
   <artifactId>jthumbnail</artifactId>
-  <version>2.2.0</version>
+  <version>2.2.1</version>
 </dependency>
 ```
 
@@ -108,7 +108,7 @@ remove the dots and make the first characters upper case. For example, `jthumbna
 **Step 1**. Add the dependency to the `build.gradle` file:
 
 ```gradle
-compile "io.github.makbn:jthumbnail:2.2.0"
+compile "io.github.makbn:jthumbnail:2.2.1"
 ```
 
 ## TODO

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id "org.springframework.boot" version "3.1.3"
-    id "io.spring.dependency-management" version "1.1.3"
+    id "org.springframework.boot" version "3.5.4"
+    id "io.spring.dependency-management" version "1.1.7"
     id "java-library"
     id "maven-publish"
 }
@@ -21,7 +21,7 @@ repositories {
 
 dependencyManagement {
     imports {
-        mavenBom 'org.springframework.modulith:spring-modulith-bom:1.0.0'
+        mavenBom 'org.springframework.modulith:spring-modulith-bom:1.4.2'
     }
 }
 
@@ -36,9 +36,12 @@ dependencies {
     testAnnotationProcessor "org.projectlombok:lombok:${lombok_ver}"
 
     implementation "org.springframework.modulith:spring-modulith-starter-core"
+    implementation "org.springframework.modulith:spring-modulith-events-api"
     implementation "org.springframework:spring-tx"
     implementation "org.springframework.boot:spring-boot-starter-web"
-    implementation "e-iceblue:spire.office.free:${iceblue_ver}"
+    implementation api("e-iceblue:spire.office.free:${iceblue_ver}@pom") {
+        transitive = true
+    }
     implementation "org.apache.poi:poi:${apachepoi_ver}"
     implementation "org.apache.poi:poi-scratchpad:${apachepoi_ver}"
     implementation "commons-io:commons-io:${commonsio_ver}"
@@ -61,9 +64,9 @@ dependencies {
 }
 
 group = 'io.github.makbn'
-version = 'v2.2.0'
+version = 'v2.2.1'
 description = 'JThumbnail is a Java library for creating Thumbnails of common types of files'
-java.sourceCompatibility = JavaVersion.VERSION_17
+java.sourceCompatibility = JavaVersion.VERSION_21
 
 publishing {
     publications {
@@ -72,7 +75,7 @@ publishing {
 
             groupId = 'io.github.makbn'
             artifactId = 'jthumbnail'
-            version = '2.2.0'
+            version = '2.2.1'
         }
     }
 
@@ -88,6 +91,11 @@ publishing {
     }
 }
 
+jar {
+   enabled = true
+   archiveClassifier = '' //use empty string
+}
+
 test {
     useJUnitPlatform()
     testLogging {

gradle.properties

@@ -1,16 +1,16 @@
-apachepoi_ver=5.2.2
-commonsio_ver=2.11.0
-jod_ver=4.4.2
-pdfbox_ver=2.0.26
-slf4j_ver=2.0.16
-javacv_ver=1.5.7
-opencv_ver=4.5.5-1.5.7
-thumb_ver=0.4.17
+apachepoi_ver=5.4.1
+commonsio_ver=2.20.0
+jod_ver=4.4.10
+pdfbox_ver=3.0.5
+slf4j_ver=2.0.17
+javacv_ver=1.5.12
+opencv_ver=4.11.0-1.5.12
+thumb_ver=0.4.20
 mp3agic_ver=0.9.1
-tika_ver=2.4.1
-commonscli_ver=1.5.0
+tika_ver=3.2.2
+commonscli_ver=1.10.0
 opencvplat_ver=4.0.1-1.4.4
-lombok_ver=1.18.24
-junit_ver=5.8.2
-iceblue_ver=5.3.1
-springdoc_ver=2.2.0
+lombok_ver=1.18.38
+junit_ver=5.13.4
+iceblue_ver=5.4.0
+springdoc_ver=2.8.9

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/io/github/makbn/jthumbnail/api/controller/ThumbnailController.java

@@ -1,5 +1,25 @@
 package io.github.makbn.jthumbnail.api.controller;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Optional;
+
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.core.io.Resource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
 import io.github.makbn.jthumbnail.api.model.JThumbnailApiResponse;
 import io.github.makbn.jthumbnail.api.model.Thumbnail;
 import io.github.makbn.jthumbnail.api.service.ThumbnailService;
@@ -13,19 +33,6 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AccessLevel;
 import lombok.experimental.FieldDefaults;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Optional;
 
 @CrossOrigin("*")
 @RestController
@@ -35,7 +42,6 @@
 public class ThumbnailController {
     ThumbnailService service;
 
-    @Autowired
     public ThumbnailController(ThumbnailService service) {
         this.service = service;
     }

src/main/java/io/github/makbn/jthumbnail/api/service/ThumbnailService.java

@@ -1,19 +1,5 @@
 package io.github.makbn.jthumbnail.api.service;
 
-import io.github.makbn.jthumbnail.api.model.Thumbnail;
-import io.github.makbn.jthumbnail.core.JThumbnailer;
-import io.github.makbn.jthumbnail.core.config.AppSettings;
-import io.github.makbn.jthumbnail.core.model.ThumbnailCandidate;
-import io.github.makbn.jthumbnail.core.model.ThumbnailEvent;
-import lombok.AccessLevel;
-import lombok.NonNull;
-import lombok.experimental.FieldDefaults;
-import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.modulith.ApplicationModuleListener;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -24,6 +10,20 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
+import org.springframework.modulith.events.ApplicationModuleListener;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.github.makbn.jthumbnail.api.model.Thumbnail;
+import io.github.makbn.jthumbnail.core.JThumbnailer;
+import io.github.makbn.jthumbnail.core.config.AppSettings;
+import io.github.makbn.jthumbnail.core.model.ThumbnailCandidate;
+import io.github.makbn.jthumbnail.core.model.ThumbnailEvent;
+import lombok.AccessLevel;
+import lombok.NonNull;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.log4j.Log4j2;
+
 @Component
 @Log4j2
 @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
@@ -35,7 +35,6 @@ public class ThumbnailService {
     // can be replaced with LoadingCache to prevent OOM
     Map<String, File> temporaryFilesMap;
 
-    @Autowired
     public ThumbnailService(JThumbnailer thumbnailer, AppSettings settings) {
         this.thumbnailer = thumbnailer;
         this.settings = settings;

src/main/java/io/github/makbn/jthumbnail/core/JThumbnailer.java

@@ -1,5 +1,13 @@
 package io.github.makbn.jthumbnail.core;
 
+import java.io.Closeable;
+import java.io.File;
+
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.stereotype.Component;
+
 import io.github.makbn.jthumbnail.core.exception.ThumbnailerException;
 import io.github.makbn.jthumbnail.core.exception.ThumbnailerRuntimeException;
 import io.github.makbn.jthumbnail.core.listener.ThumbnailListener;
@@ -8,14 +16,6 @@
 import io.github.makbn.jthumbnail.core.util.mime.MimeTypeDetector;
 import lombok.AccessLevel;
 import lombok.experimental.FieldDefaults;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.stereotype.Component;
-
-import java.io.Closeable;
-import java.io.File;
 
 @Component
 @EnableAsync
@@ -25,7 +25,6 @@ public class JThumbnailer implements Closeable {
     MimeTypeDetector typeDetector;
     ApplicationEventPublisher events;
 
-    @Autowired
     public JThumbnailer(ThumbnailerManager manager, ApplicationEventPublisher events) {
         this.manager = manager;
         this.events = events;

src/main/java/io/github/makbn/jthumbnail/core/ThumbnailerManager.java

@@ -1,19 +1,5 @@
 package io.github.makbn.jthumbnail.core;
 
-import io.github.makbn.jthumbnail.core.exception.ThumbnailerException;
-import io.github.makbn.jthumbnail.core.exception.ThumbnailerRuntimeException;
-import io.github.makbn.jthumbnail.core.model.ExecutionResult;
-import io.github.makbn.jthumbnail.core.thumbnailers.Thumbnailer;
-import io.github.makbn.jthumbnail.core.util.mime.MimeTypeDetector;
-import lombok.AccessLevel;
-import lombok.experimental.FieldDefaults;
-import lombok.experimental.NonFinal;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FilenameUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.DependsOn;
-import org.springframework.stereotype.Component;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -24,6 +10,20 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.stereotype.Component;
+
+import io.github.makbn.jthumbnail.core.exception.ThumbnailerException;
+import io.github.makbn.jthumbnail.core.exception.ThumbnailerRuntimeException;
+import io.github.makbn.jthumbnail.core.model.ExecutionResult;
+import io.github.makbn.jthumbnail.core.thumbnailers.Thumbnailer;
+import io.github.makbn.jthumbnail.core.util.mime.MimeTypeDetector;
+import lombok.AccessLevel;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.NonFinal;
+import lombok.extern.slf4j.Slf4j;
+
 
 /**
  * This class manages all available Thumbnailers.
@@ -67,7 +67,6 @@ public class ThumbnailerManager implements Thumbnailer {
     /**
      * Initialise Thumbnail Manager
      */
-    @Autowired
     public ThumbnailerManager(List<? extends Thumbnailer> thumbnailers) {
         this.thumbnailers = registerThumbnailer(thumbnailers);
         this.mimeTypeDetector = new MimeTypeDetector();

src/main/java/io/github/makbn/jthumbnail/core/config/OfficeManagerConfiguration.java

@@ -1,27 +1,26 @@
 package io.github.makbn.jthumbnail.core.config;
 
-import io.github.makbn.jthumbnail.core.exception.ThumbnailerRuntimeException;
-import lombok.AccessLevel;
-import lombok.experimental.FieldDefaults;
+import java.io.File;
+import java.io.IOException;
+
 import org.jodconverter.core.office.OfficeException;
 import org.jodconverter.core.office.OfficeManager;
 import org.jodconverter.local.office.ExistingProcessAction;
 import org.jodconverter.local.office.LocalOfficeManager;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
 
-import java.io.File;
-import java.io.IOException;
+import io.github.makbn.jthumbnail.core.exception.ThumbnailerRuntimeException;
+import lombok.AccessLevel;
+import lombok.experimental.FieldDefaults;
 
 @Configuration("jtOfficeManagerConfiguration")
 @DependsOn("jtApplicationConfig")
 @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
 public class OfficeManagerConfiguration {
     OfficeManager officeManager;
 
-    @Autowired
     public OfficeManagerConfiguration(AppSettings settings) throws IOException {
         File dir = settings.getOfficeDirectory();
 
@@ -32,7 +31,6 @@ public OfficeManagerConfiguration(AppSettings settings) throws IOException {
                 .taskExecutionTimeout(settings.getTimeout())
                 .maxTasksPerProcess(settings.getMaxTaskPerProcess())
                 .existingProcessAction(ExistingProcessAction.CONNECT_OR_KILL)
-                .disableOpengl(true)
                 .officeHome(settings.getOpenOfficePath())
                 .install()
                 .build();
@@ -44,7 +42,7 @@ public OfficeManagerConfiguration(AppSettings settings) throws IOException {
     }
 
     @Bean("officeManager")
-    public OfficeManager getOfficeManager() {
+    OfficeManager getOfficeManager() {
         return officeManager;
     }