1.media 迁移到 jdk 模块

2.gson 版本升级到 2.10.1

jdk/pom.xml

@@ -15,4 +15,24 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
     </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.sejda.imageio</groupId>
+            <artifactId>webp-imageio</artifactId>
+            <version>0.1.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>net.coobird</groupId>
+            <artifactId>thumbnailator</artifactId>
+            <version>0.4.20</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.10.1</version>
+        </dependency>
+    </dependencies>
 </project>

media/src/main/java/cn/reghao/jutil/media/FFmpegWrapper.java → jdk/src/main/java/cn/reghao/jutil/jdk/media/FFmpegWrapper.java

@@ -1,11 +1,11 @@
-package cn.reghao.jutil.media;
+package cn.reghao.jutil.jdk.media;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import cn.reghao.jutil.jdk.shell.Shell;
-import cn.reghao.jutil.media.model.AudioProps;
-import cn.reghao.jutil.media.model.MediaProps;
-import cn.reghao.jutil.media.model.VideoProps;
+import cn.reghao.jutil.jdk.media.model.AudioProps;
+import cn.reghao.jutil.jdk.media.model.MediaProps;
+import cn.reghao.jutil.jdk.media.model.VideoProps;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;

media/src/main/java/cn/reghao/jutil/media/ImageOps.java → jdk/src/main/java/cn/reghao/jutil/jdk/media/ImageOps.java

@@ -1,4 +1,4 @@
-package cn.reghao.jutil.media;
+package cn.reghao.jutil.jdk.media;
 
 import net.coobird.thumbnailator.Thumbnails;
 

media/src/main/java/cn/reghao/jutil/media/MediaQuality.java → jdk/src/main/java/cn/reghao/jutil/jdk/media/MediaQuality.java

@@ -1,4 +1,4 @@
-package cn.reghao.jutil.media;
+package cn.reghao.jutil.jdk.media;
 
 /**
  * 视频质量

media/src/main/java/cn/reghao/jutil/media/MediaResolution.java → jdk/src/main/java/cn/reghao/jutil/jdk/media/MediaResolution.java

@@ -1,4 +1,4 @@
-package cn.reghao.jutil.media;
+package cn.reghao.jutil.jdk.media;
 
 /**
  * 视频图像分辨率

media/src/main/java/cn/reghao/jutil/media/model/AudioProps.java → jdk/src/main/java/cn/reghao/jutil/jdk/media/model/AudioProps.java

@@ -1,4 +1,4 @@
-package cn.reghao.jutil.media.model;
+package cn.reghao.jutil.jdk.media.model;
 
 /**
  * @author reghao

media/src/main/java/cn/reghao/jutil/media/model/MediaProps.java → jdk/src/main/java/cn/reghao/jutil/jdk/media/model/MediaProps.java

@@ -1,4 +1,4 @@
-package cn.reghao.jutil.media.model;
+package cn.reghao.jutil.jdk.media.model;
 
 import java.time.LocalDateTime;
 

media/src/main/java/cn/reghao/jutil/media/model/VideoProps.java → jdk/src/main/java/cn/reghao/jutil/jdk/media/model/VideoProps.java

@@ -1,4 +1,4 @@
-package cn.reghao.jutil.media.model;
+package cn.reghao.jutil.jdk.media.model;
 
 /**
  * @author reghao

media/pom.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>jutil</artifactId>
-        <groupId>cn.reghao.jutil</groupId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>media</artifactId>
-
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.reghao.jutil</groupId>
-            <artifactId>jdk</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.sejda.imageio</groupId>
-            <artifactId>webp-imageio</artifactId>
-            <version>0.1.6</version>
-        </dependency>
-
-        <dependency>
-            <groupId>net.coobird</groupId>
-            <artifactId>thumbnailator</artifactId>
-            <version>0.4.20</version>
-        </dependency>
-    </dependencies>
-</project>

pom.xml

@@ -12,7 +12,6 @@
         <module>jdk</module>
         <module>tool</module>
         <module>web</module>
-        <module>media</module>
     </modules>
 
     <properties>
@@ -22,14 +21,6 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.8.5</version>
-        </dependency>
-    </dependencies>
-
     <distributionManagement>
         <repository>
             <id>maven-local-hosted</id>