Merge pull request #7 from 17629354490/master

upgrade jdk version
gudaoxuri · Jan 6, 2024 · 04fd5c4 · 04fd5c4
2 parents 4f47ba8 + 7928f33
commit 04fd5c4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/it/pom.xml b/it/pom.xml
@@ -28,7 +28,7 @@
     <version>3.0.0</version>
 
     <properties>
-        <java.version>11</java.version>
+        <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
         <maven.compiler.encoding>${project.build.sourceEncoding}</maven.compiler.encoding>
@@ -40,7 +40,7 @@
         <maven.deploy.skip>true</maven.deploy.skip>
         <junit.version>5.10.0</junit.version>
 
-        <graalvm.version>22.3.3</graalvm.version>
+        <graalvm.version>21.2.0</graalvm.version>
 
         <mainClass>com.ecfront.dew.common.test.graalvm.NativeImageMain</mainClass>
         <imageName>NativeImageTest</imageName>

diff --git a/pom.xml b/pom.xml
@@ -26,10 +26,10 @@
     <description>Dew公共模块</description>
     <url>https://github.com/gudaoxuri/dew-common</url>
     <packaging>jar</packaging>
-    <version>3.0.4</version>
+    <version>3.0.5</version>
 
     <properties>
-        <java.version>11</java.version>
+        <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
         <maven.compiler.encoding>${project.build.sourceEncoding}</maven.compiler.encoding>
@@ -47,8 +47,8 @@
         <asciidoctorj.version>2.5.7</asciidoctorj.version>
         <jruby.version>9.3.2.0</jruby.version>
 
-        <graalvm.version>22.3.3</graalvm.version>
-        <graalvm.plugin.version>22.3.3</graalvm.plugin.version>
+        <graalvm.version>23.0.2</graalvm.version>
+        <graalvm.plugin.version>21.2.0</graalvm.plugin.version>
         <mainClass></mainClass>
         <imageName></imageName>
     </properties>
@@ -76,6 +76,13 @@
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
             <version>${beanutils.version}</version>
+            <exclusions>
+                <!-- This package has a security vulnerability and has been excluded -->
+                <exclusion>
+                    <artifactId>commons-collections</artifactId>
+                    <groupId>commons-collections</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--$.bean dependency end-->
         <!--$.encrypt dependency begin-->
@@ -155,7 +162,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.12.1</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
@@ -183,6 +190,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.2</version>
                 <dependencies>
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
@@ -220,7 +228,6 @@
                         </goals>
                         <configuration>
                             <backend>html5</backend>
-                            <sourceHighlighter>coderay</sourceHighlighter>
                             <attributes>
                                 <imagesdir>./images</imagesdir>
                                 <toc>left</toc>