Merge branch 'Develop' into 'Test'

Develop







See merge request !1095

mooctest-site-server/pom.xml

@@ -233,6 +233,7 @@
             <groupId>cn.afterturn</groupId>
             <artifactId>easypoi-base</artifactId>
             <version>3.0.3</version>
+
         </dependency>
         <dependency>
             <groupId>cn.afterturn</groupId>
@@ -387,27 +388,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- poi office -->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>3.17</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>3.17</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml-schemas</artifactId>
-            <version>3.17</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>4.1</version>
-        </dependency>
 
     </dependencies>
 

pom.xml

@@ -42,11 +42,11 @@
             <!--<artifactId>poi</artifactId>-->
             <!--<version>3.9</version>-->
         <!--</dependency>-->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>3.15</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.apache.poi</groupId>-->
+<!--            <artifactId>poi-ooxml</artifactId>-->
+<!--            <version>3.15</version>-->
+<!--        </dependency>-->
         <!--<dependency>-->
             <!--<groupId>org.apache.poi</groupId>-->
             <!--<artifactId>poi-ooxml-schemas</artifactId>-->