Dependency updates

seabamirum · May 26, 2024 · c47d20c · c47d20c
1 parent 3e37ee8
commit c47d20c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>fun.seabird</groupId>
   <artifactId>ebird-media-sorter</artifactId>
-  <version>2.3.2</version>
+  <version>2.3.4</version>
   <name>ebird-media-sorter</name>
 
  <build>
@@ -49,7 +49,7 @@
 	<dependency>
 	    <groupId>com.google.guava</groupId>
 	    <artifactId>guava</artifactId>
-	    <version>33.0.0-jre</version>
+	    <version>33.2.0-jre</version>
 	</dependency>
 
 	<!-- https://mvnrepository.com/artifact/com.drewnoakes/metadata-extractor -->
@@ -69,49 +69,49 @@
 	<dependency>
 	  <groupId>org.apache.commons</groupId>
 	  <artifactId>commons-imaging</artifactId>
-	  <version>1.0-alpha3</version>
+	  <version>1.0.0-alpha5</version>
 	</dependency>
 
 	<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
 	<dependency>
 	    <groupId>commons-io</groupId>
 	    <artifactId>commons-io</artifactId>
-	    <version>2.15.1</version>
+	    <version>2.16.1</version>
 	</dependency>	
 
 <!-- https://mvnrepository.com/artifact/org.openjfx/javafx-base -->
 <dependency>
     <groupId>org.openjfx</groupId>
     <artifactId>javafx-base</artifactId>
-    <version>21.0.1</version>
+    <version>22.0.1</version>
 </dependency>
 
 <!-- https://mvnrepository.com/artifact/org.openjfx/javafx-controls -->
 <dependency>
     <groupId>org.openjfx</groupId>
     <artifactId>javafx-controls</artifactId>
-    <version>21.0.1</version>
+    <version>22.0.1</version>
 </dependency>
 
 <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
 <dependency>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-api</artifactId>
-    <version>2.0.12</version>
+    <version>2.0.13</version>
 </dependency>
 
 <!-- https://mvnrepository.com/artifact/ch.qos.logback/logback-core -->
 <dependency>
     <groupId>ch.qos.logback</groupId>
     <artifactId>logback-core</artifactId>
-    <version>1.5.3</version>
+    <version>1.5.6</version>
 </dependency>
 
 <!-- https://mvnrepository.com/artifact/ch.qos.logback/logback-classic -->
 <dependency>
     <groupId>ch.qos.logback</groupId>
     <artifactId>logback-classic</artifactId>
-    <version>1.5.3</version>
+    <version>1.5.6</version>
 </dependency>
 
 	<dependency>

diff --git a/src/main/java/fun/seabird/MediaSortTask.java b/src/main/java/fun/seabird/MediaSortTask.java
@@ -26,8 +26,6 @@
 
 import javax.annotation.Nullable;
 
-import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.ImageWriteException;
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.ImageMetadata;
 import org.apache.commons.imaging.common.ImageMetadata.ImageMetadataItem;
@@ -131,7 +129,7 @@ public static JpegImageMetadata shouldAdjustExif(byte[] jpegImageFile) {
 		ImageMetadata metadata;
 		try {
 			metadata = Imaging.getMetadata(jpegImageFile);
-		} catch (ImageReadException | IOException e) {
+		} catch (IOException e) {
 			e.printStackTrace();
 			return null;
 		}
@@ -160,8 +158,6 @@ private static boolean changeDateTimeOrig(Path imageFile, String newDateTime) th
 			return false;
 
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-		try {
 			TiffImageMetadata exif = jpegMetadata.getExif();
 			TiffOutputSet outputSet = exif != null ? exif.getOutputSet() : new TiffOutputSet();
 			TiffOutputDirectory exifDirectory = outputSet.getOrCreateExifDirectory();
@@ -174,10 +170,6 @@ private static boolean changeDateTimeOrig(Path imageFile, String newDateTime) th
 			try (OutputStream os = new BufferedOutputStream(Files.newOutputStream(imageFile))) {
 				os.write(baos.toByteArray());
 			}
-		} catch (ImageWriteException | ImageReadException e) {
-			logger.error("Error adjusting EXIF data", e);
-			return false;
-		}
 
 		return true;
 	}