Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Jun 22, 2018 · a92f487 · a92f487
2 parents 718bb45 + f02a143
commit a92f487
Show file tree

Hide file tree

Showing 58 changed files with 6,692 additions and 1,824 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -63,10 +63,10 @@
         <selenium.version>1.0.1</selenium.version>
         <slf4j.version>1.7.25</slf4j.version>
         <logback.version>1.2.3</logback.version>
-        <spring.boot.version>1.5.8.e1</spring.boot.version> <!-- can be replaced by a stock version;
+        <spring.boot.version>2.0.1.RELEASE</spring.boot.version> <!-- can be replaced by a stock version;
                 ideally after https://github.com/spring-projects/spring-boot/issues/11367 is resolved but it should be OK even before that -->
-        <spring.version>4.3.14.RELEASE</spring.version>
-        <spring.security.version>4.2.4.RELEASE</spring.security.version>
+        <spring.version>5.0.6.RELEASE</spring.version>
+        <spring.security.version>5.0.6.RELEASE</spring.security.version>
         <cas.client.version>3.5.0</cas.client.version>
         <testng.version>6.8.8</testng.version>
         <xml.resolver.version>1.2</xml.resolver.version>
@@ -88,7 +88,7 @@
         <jasper.version>6.5.0</jasper.version>
         <derby.version>10.11.1.1</derby.version>
         <wro4j.version>1.8.0</wro4j.version>
-        <jackson.version>2.8.9</jackson.version>
+        <jackson.version>2.9.5</jackson.version>
         <snakeyaml.version>1.15</snakeyaml.version>
         <surefire.version>2.20.1</surefire.version>
         <reflections.version>0.9.11</reflections.version>
@@ -831,6 +831,11 @@
 				<artifactId>spring-aop</artifactId>
 				<version>${spring.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-jcl</artifactId>
+				<version>${spring.version}</version>
+			</dependency>
             <dependency>
                 <groupId>org.springframework.security</groupId>
                 <artifactId>spring-security-config</artifactId>