Aligning versions of Jackson and Jetty in REST tests

Evolveum · Oct 17, 2018 · aeb1342 · aeb1342
1 parent 82f77c1
commit aeb1342
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -1018,6 +1018,11 @@
 				<artifactId>jackson-annotations</artifactId>
 				<version>${jackson.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.fasterxml.jackson.jaxrs</groupId>
+				<artifactId>jackson-jaxrs-base</artifactId>
+				<version>${jackson.version}</version>
+			</dependency>
             <dependency>
                 <groupId>org.yaml</groupId>
                 <artifactId>snakeyaml</artifactId>
@@ -1236,7 +1241,15 @@
                 <artifactId>jcommander</artifactId>
                 <version>${jcommander.version}</version>
             </dependency>
+
+            <dependency>
+				<groupId>org.eclipse.jetty</groupId>
+		       	<artifactId>jetty-server</artifactId>
+		       	<version>9.4.11.v20180605</version>
+			</dependency>
+
         </dependencies>
+
     </dependencyManagement>
 
     <organization>

diff --git a/testing/rest/pom.xml b/testing/rest/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright (c) 2013-2015 Evolveum
+  ~ Copyright (c) 2013-2018 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -93,12 +93,6 @@
 			<version>3.9-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
-		<groupId>org.codehaus.jackson</groupId>
- 		  <artifactId>jackson-jaxrs</artifactId>
- 		  <version>1.9.0</version>
- 		  <scope>test</scope>
- 		  </dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>audit-impl</artifactId>
@@ -128,6 +122,11 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-base</artifactId>
+			<scope>test</scope>
+		</dependency>
 
 		<!-- TEST dependency -->
 		<dependency>
@@ -257,31 +256,17 @@
 		<dependency>
 		   <groupId>javax.ws.rs</groupId>
 		   <artifactId>javax.ws.rs-api</artifactId>
-
 		</dependency>
-
-<!--          <dependency> -->
-<!-- 	        <groupId>org.apache.cxf</groupId> -->
-<!-- 	        <artifactId>cxf-rt-transports-http-jetty</artifactId> -->
-<!-- 	        <exclusions> -->
-<!-- 	        	<exclusion> -->
-<!-- 	        		<groupId>org.eclipse.jetty</groupId> -->
-<!-- 	        		<artifactId>jetty-server</artifactId> -->
-<!-- 	        	</exclusion> -->
-<!-- 	        </exclusions> -->
-<!--         </dependency> -->
 
 		<dependency>
 		  <groupId>commons-io</groupId>
 		  <artifactId>commons-io</artifactId>
-<!-- 		  <version>2.0.1</version> -->
 		  <scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 	       	<artifactId>jetty-server</artifactId>
-	       	<version>9.4.6.v20170531</version>
 	       	<scope>runtime</scope>
 		</dependency>
 	</dependencies>