Browse Source

Merge branch 'develop' of http://39.106.8.246:3003/BDTP/adm-middleware.git into develop

zhangqiankun 3 years ago
parent
commit
8c23198121
1 changed files with 15 additions and 4 deletions
  1. 15 4
      pom.xml

+ 15 - 4
pom.xml

@@ -55,6 +55,12 @@
 		<dependency>
 			<groupId>com.persagy</groupId>
 			<artifactId>integrated-config-client</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>objenesis</artifactId>
+					<groupId>org.objenesis</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
         <dependency>
             <groupId>com.persagy</groupId>
@@ -64,11 +70,11 @@
 			<groupId>com.persagy</groupId>
 			<artifactId>dmp-server</artifactId>
 		</dependency>
-		<dependency>
+		<!--<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
 			<version>1.2.47</version>
-		</dependency>
+		</dependency>-->
 		<dependency>
 			<groupId>javax.ws.rs</groupId>
 			<artifactId>jsr311-api</artifactId>
@@ -78,7 +84,13 @@
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
             <version>${easyexcel.version}</version>
-        </dependency>
+			<exclusions>
+				<exclusion>
+					<artifactId>asm</artifactId>
+					<groupId>org.ow2.asm</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -88,6 +100,5 @@
 			<artifactId>gt-main</artifactId>
 			<version>23.0</version>
 		</dependency>
-
 	</dependencies>
 </project>