Merge branch 'master' of http://git.hikcreate.com/lifuyi5/ftp_pic

pom.xml

@@ -44,6 +44,10 @@
                     <artifactId>slf4j-log4j12</artifactId>
                     <artifactId>slf4j-log4j12</artifactId>
                     <groupId>org.slf4j</groupId>
                     <groupId>org.slf4j</groupId>
                 </exclusion>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
             </exclusions>
             </exclusions>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
@@ -88,5 +92,10 @@
             </plugin>
             </plugin>
         </plugins>
         </plugins>
     </build>
     </build>
-
+    <repositories>
+        <repository>
+            <id>cloudera</id>
+            <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
+        </repository>
+    </repositories>
 </project>
 </project>