冲突解决

pom.xml

@@ -15,9 +15,19 @@
 	</parent>
 	<properties>
 		<java.version>1.8</java.version>
-		<start-class>cn.jz.TagApplication </start-class>
+		<shiro.version>1.2.3</shiro.version>
+		<mybatis-pagehelper.version>4.2.0</mybatis-pagehelper.version>
+		<start-class>com.jz.Application</start-class>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
+    </properties>
+
+    <repositories>
+        <repository>
+            <id>cloudera</id>
+            <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
+        </repository>
+    </repositories>
+    
 	<dependencies>
 		<dependency>
 			<groupId>nl.bitwalker</groupId>
@@ -221,6 +231,37 @@
 			<artifactId>hibernate-validator</artifactId>
 			<version>6.1.6.Final</version>
 		</dependency>
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.7</version><!--$NO-MVN-MAN-VER$ -->
+		</dependency>
+		<!-- agent begin -->
+		<dependency>
+			<groupId>org.apache.hadoop</groupId>
+			<artifactId>hadoop-client</artifactId>
+			<version>2.6.0-cdh5.16.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hadoop</groupId>
+			<artifactId>hadoop-common</artifactId>
+			<version>2.6.0-cdh5.16.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.kudu</groupId>
+			<artifactId>kudu-client</artifactId>
+			<version>1.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.5.3</version><!--$NO-MVN-MAN-VER$-->
+		</dependency>
 	</dependencies>
 	<build>
 		<finalName>jz-dmp-service</finalName>