Merge remote-tracking branch 'origin/master'

Evolveum · Mar 14, 2018 · 27147b4 · 27147b4
2 parents aa091b4 + 1da4e21
commit 27147b4
Show file tree

Hide file tree

Showing 601 changed files with 7,198 additions and 3,215 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -62,11 +62,11 @@
         <quartz.version>2.3.0.e2</quartz.version>
         <selenium.version>1.0.1</selenium.version>
         <slf4j.version>1.7.25</slf4j.version>
-        <logback.version>1.1.11</logback.version>
+        <logback.version>1.2.3</logback.version>
         <spring.boot.version>1.5.8.e1</spring.boot.version>
-        <spring.version>4.3.12.RELEASE</spring.version>
-        <spring.security.version>4.2.3.RELEASE</spring.security.version>
-        <cas.client.version>3.4.1</cas.client.version>
+        <spring.version>4.3.14.RELEASE</spring.version>
+        <spring.security.version>4.2.4.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>
         <xmlunit.version>2.1.1</xmlunit.version>
@@ -75,14 +75,14 @@
         <h2.version>1.4.193</h2.version>
         <jdbc.postgres>9.4.1212.jre7</jdbc.postgres>
         <jdbc.mariadb>1.5.5</jdbc.mariadb>
-        <jdbc.mysql>6.0.5</jdbc.mysql>
+        <jdbc.mysql>6.0.6</jdbc.mysql>
         <wicket.version>7.10.0</wicket.version>
-        <groovy.version>2.4.0</groovy.version>
+        <groovy.version>2.4.14</groovy.version>
         <activiti-engine.version>5.22.0</activiti-engine.version>
         <activiti-spring.version>5.22.0</activiti-spring.version>
         <commons-email.version>1.3</commons-email.version>
         <xmlsec.version>2.0.6</xmlsec.version>
-        <connid.version>1.4.3.0</connid.version>
+        <connid.version>1.4.4.0-SNAPSHOT</connid.version>
         <jasper.version>6.4.1</jasper.version>
         <derby.version>10.11.1.1</derby.version>
         <wro4j.version>1.8.0</wro4j.version>
@@ -246,11 +246,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-c3p0</artifactId>
-                <version>${hibernate.version}</version>
-            </dependency>
             <dependency>
 	            <groupId>org.hibernate.javax.persistence</groupId>
 	            <artifactId>hibernate-jpa-2.1-api</artifactId>
@@ -259,8 +254,13 @@
 	        <dependency>
 	            <groupId>com.mchange</groupId>
 	            <artifactId>c3p0</artifactId>
-	            <version>0.9.2.1</version>
+	            <version>0.9.5.2</version>
 	        </dependency>
+            <dependency>
+                <groupId>com.zaxxer</groupId>
+                <artifactId>HikariCP</artifactId>
+                <version>2.7.8</version>
+            </dependency>
             <dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>jul-to-slf4j</artifactId>
@@ -748,6 +748,10 @@
                         <groupId>com.mchange</groupId>
                         <artifactId>mchange-commons-java</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>com.zaxxer</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>