Merge branch 'master' of csk/kmall-pt into master

kmall-common/pom.xml

@@ -21,6 +21,7 @@
         <jackson.version>2.5.0</jackson.version>
         <jackson.core.version>2.7.3</jackson.core.version>
         <poi.version>3.15</poi.version>
+        <poi.ooxml.version>3.15</poi.ooxml.version>
         <xmlbeans.version>2.6.0</xmlbeans.version>
         <guava.version>17.0</guava.version>
         <bouncycastle.version>1.45</bouncycastle.version>
@@ -103,7 +104,7 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>${poi.version}</version>
+            <version>${poi.ooxml.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
@@ -116,11 +117,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>${poi.version}</version>
-        </dependency>
 
         <!-- redis clients -->
         <dependency>
@@ -184,6 +180,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <!-- POI依赖 ，处理EXCEL WORD  PDF -->
     </dependencies>
 

kmall-framework/pom.xml

@@ -10,7 +10,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>kmall-framework</artifactId>
-    <version>${kmall-version}</version>
 
     <name>kmall-framework</name>
     <description>
@@ -46,7 +45,7 @@
 
     </dependencies>
 
-    <build>
+    <!--<build>
         <sourceDirectory>src/main/java</sourceDirectory>
         <finalName>kmall-framework</finalName>
 
@@ -73,13 +72,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.18.1</version>
+                <version>${maven.surefire.plugin.version}</version>
                 <configuration>
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
-            <!-- 合并多个war -->
-            <!--<plugin>
+            &lt;!&ndash; 合并多个war &ndash;&gt;
+            &lt;!&ndash;<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <version>2.6</version>
@@ -95,10 +94,10 @@
                         &lt;!&ndash; 待添加其他要合并的 web 模块 &ndash;&gt;
                     </overlays>
                 </configuration>
-            </plugin>-->
+            </plugin>&ndash;&gt;
         </plugins>
 
 
-    </build>
+    </build>-->
 
 </project>

kmall-schedule/pom.xml

@@ -95,6 +95,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>${maven.jar.version}</version>
                 <configuration>
                     <archive>
                         <addMavenDescriptor>false</addMavenDescriptor>

pom.xml

@@ -30,8 +30,13 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <!-- 编译时的编码 -->
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+
+
+        <maven.resources.version>3.1.0</maven.resources.version>
         <maven.compiler.version>3.8.0</maven.compiler.version>
         <maven.war.version>3.2.2</maven.war.version>
+        <maven.jar.version>3.1.1</maven.jar.version>
+        <maven.surefire.plugin.version>2.22.1</maven.surefire.plugin.version>
 
         <servlet-version>3.1.0</servlet-version>
         <junit-version>4.12</junit-version>
@@ -62,6 +67,7 @@
         <jstl-version>1.2</jstl-version>
         <taglibs-version>1.1.2</taglibs-version>
         <freemarker-version>2.3.23</freemarker-version>
+
     </properties>
 
     <!-- 阿里云maven仓库 -->
@@ -327,6 +333,7 @@
             <artifactId>freemarker</artifactId>
             <version>${freemarker-version}</version>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -348,6 +355,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
+                <version>${maven.resources.version}</version>
                 <configuration>
                     <encoding>${maven.compiler.encoding}</encoding>
                 </configuration>