Bladeren bron

更新 spring-boot 到最新的 v2.4.2 版本

kl 4 jaren geleden
bovenliggende
commit
679459f53b
4 gewijzigde bestanden met toevoegingen van 16 en 17 verwijderingen
  1. 1 3
      office-plugin/pom.xml
  2. 9 1
      pom.xml
  3. 3 7
      server/pom.xml
  4. 3 6
      server/src/test/java/cn/keking/ServerMainTests.java

+ 1 - 3
office-plugin/pom.xml

@@ -7,9 +7,7 @@
     <artifactId>office-plugin</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+
     <repositories>
         <repository>
             <!-- required for org.hyperic:sigar -->

+ 9 - 1
pom.xml

@@ -2,15 +2,23 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
+    <packaging>pom</packaging>
 
     <groupId>cn.keking</groupId>
     <artifactId>filepreview</artifactId>
     <version>3.3.1</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
     <modules>
         <module>office-plugin</module>
         <module>server</module>
     </modules>
-    <packaging>pom</packaging>
 
     <profiles>
         <profile>

+ 3 - 7
server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.8.RELEASE</version>
+        <version>2.4.2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -14,12 +14,6 @@
     <artifactId>kkFileView</artifactId>
     <version>3.3.1</version>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-    </properties>
-
     <repositories>
         <repository>
             <!-- required for org.hyperic:sigar -->
@@ -27,6 +21,7 @@
             <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
         </repository>
     </repositories>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -197,6 +192,7 @@
             <version>0.2.1</version>
         </dependency>
     </dependencies>
+
     <build>
         <resources>
             <resource>

+ 3 - 6
server/src/test/java/cn/keking/ServerMainTests.java

@@ -1,16 +1,13 @@
 package cn.keking;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest
-public class ServerMainTests {
+ class ServerMainTests {
 
 	@Test
-	public void contextLoads() {
+	 void contextLoads() {
 	}
 
 }