From 5aad0ab71bdb180525f3d6a82c8f24997bbaee67 Mon Sep 17 00:00:00 2001
From: skublik <lskublik@evolveum.com>
Date: Thu, 22 Nov 2018 09:56:14 +0100
Subject: [PATCH] changes for upgrade to java 11

---
 build-system/pom.xml                          | 136 +++++++++---------
 gui/admin-gui/pom.xml                         |   2 +-
 .../admin/services/PageServiceHistory.java    |   5 -
 infra/prism-maven-plugin/pom.xml              |   6 +
 .../midpoint/prism/maven/SchemaDocMojo.java   |  16 ++-
 infra/prism/pom.xml                           |  10 ++
 infra/schema-pure-jaxb/pom.xml                |  49 ++++++-
 .../src/compile/resources/catalog.xml         |   2 +-
 infra/schema/pom.xml                          |  13 +-
 infra/util/pom.xml                            |  14 +-
 .../com/evolveum/midpoint/util/DOMUtil.java   |   6 +-
 .../com/evolveum/midpoint/util/MiscUtil.java  |   2 +-
 .../com/evolveum/midpoint/util/QNameUtil.java |   4 +-
 .../midpoint/util/ReflectionUtil.java         |   2 +-
 .../com/evolveum/midpoint/util/UglyHacks.java |   2 +-
 .../midpoint/util/histogram/Histogram.java    |   2 +-
 .../midpoint/util/logging/LoggingUtils.java   |   2 +-
 model/certification-impl/pom.xml              |   4 +-
 model/workflow-impl/pom.xml                   |   4 +-
 pom.xml                                       |  18 ++-
 samples/model-client-sample/pom.xml           |  13 +-
 .../tools/schemadist/SchemaDistMojo.java      |  12 +-
 22 files changed, 219 insertions(+), 105 deletions(-)

diff --git a/build-system/pom.xml b/build-system/pom.xml
index 536dc527838..31e3948b0cb 100644
--- a/build-system/pom.xml
+++ b/build-system/pom.xml
@@ -47,57 +47,56 @@
         <!-- Dependencies global versions -->
         <commons.io.version>2.6</commons.io.version>
         <commons.lang.version>2.6</commons.lang.version>
-        <commons.lang3.version>3.7</commons.lang3.version>
-        <commons.cli>1.2</commons.cli>
-        <cxf.version>3.2.4</cxf.version>
-        <cxf-xjc.version>3.2.0</cxf-xjc.version>
-        <wss4j.version>2.2.0</wss4j.version>
+        <commons.lang3.version>3.8.1</commons.lang3.version>
+        <commons.cli>1.4</commons.cli>
+        <cxf.version>3.3.0-SNAPSHOT</cxf.version>
+        <cxf-xjc.version>3.2.3</cxf-xjc.version>
+        <wss4j.version>2.2.2</wss4j.version>
         <dbunit.version>2.4.7</dbunit.version>
-        <jaxb-api.version>2.2.10</jaxb-api.version>
-        <jaxb.version>2.2.10</jaxb.version>
-        <jaxb-xjc.version>2.2.10</jaxb-xjc.version>
-        <junit.version>4.8.2</junit.version>
-        <opendj.version>2.6.2</opendj.version>
-        <mockito.version>1.10.8</mockito.version>
-        <quartz.version>2.3.0.e2</quartz.version>
-        <selenium.version>3.6.0</selenium.version>
-        <slf4j.version>1.7.25</slf4j.version>
-        <logback.version>1.2.3</logback.version>
-        <spring.boot.version>2.0.3.RELEASE</spring.boot.version>
-        <spring.version>5.0.7.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>
+        <jaxb-api.version>2.3.0</jaxb-api.version>
+        <jaxb.version>2.3.0</jaxb.version>
+        <jaxb-xjc.version>2.3.0</jaxb-xjc.version>
+        <junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
+        <opendj.version>2.6.11</opendj.version>
+        <mockito.version>2.23.0</mockito.version>
+        <quartz.version>2.3.0</quartz.version>
+        <selenium.version>3.141.59</selenium.version>
+        <slf4j.version>1.8.0-beta2</slf4j.version>
+        <logback.version>1.3.0-alpha4</logback.version>
+        <spring.boot.version>2.1.0.RELEASE</spring.boot.version>
+        <spring.version>5.1.2.RELEASE</spring.version>
+        <spring.security.version>5.1.1.RELEASE</spring.security.version>
+        <cas.client.version>3.5.1</cas.client.version>
+        <testng.version>7.0.0-beta1</testng.version>
         <xml.resolver.version>1.2</xml.resolver.version>
-        <xmlunit.version>2.1.1</xmlunit.version>
-        <cron4j.version>2.2.3</cron4j.version>
-        <hibernate.version>5.2.12.Final</hibernate.version>
-        <h2.version>1.4.193</h2.version>
-        <jdbc.postgres>42.2.2</jdbc.postgres>
-        <jdbc.sqlserver>6.4.0.jre8</jdbc.sqlserver>
+        <xmlunit.version>2.6.2</xmlunit.version>
+        <hibernate.version>5.4.0.CR1</hibernate.version>
+        <h2.version>1.4.197</h2.version>
+        <jdbc.postgres>42.2.5</jdbc.postgres>
+        <jdbc.sqlserver>7.1.2.jre11-preview</jdbc.sqlserver>
         <jdbc.mariadb>2.3.0</jdbc.mariadb>
-        <jdbc.mysql>6.0.6</jdbc.mysql>
-        <wicket.version>7.10.0</wicket.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>
+        <jdbc.mysql>8.0.13</jdbc.mysql>
+        <wicket.version>8.2.0</wicket.version>
+        <groovy.version>3.0.0-alpha-3</groovy.version>
+        <activiti-engine.version>7.0.0.Beta3</activiti-engine.version>
+        <activiti-spring.version>7.0.0.Beta3</activiti-spring.version>
+        <commons-email.version>1.5</commons-email.version>
+        <xmlsec.version>2.1.2</xmlsec.version>
         <connid.version>1.5.0.0</connid.version>
-        <jasper.version>6.5.0</jasper.version>
-        <derby.version>10.11.1.1</derby.version>
+        <jasper.version>6.7.0</jasper.version>
+        <derby.version>10.14.2.0</derby.version>
         <wro4j.version>1.8.0</wro4j.version>
-        <jackson.version>2.9.5</jackson.version>
-        <snakeyaml.version>1.19</snakeyaml.version>
+        <jackson.version>2.9.7</jackson.version>
+        <snakeyaml.version>1.23</snakeyaml.version>
         <surefire.version>2.22.1</surefire.version>
         <reflections.version>0.9.11</reflections.version>
-        <guava.version>20.0</guava.version>
+        <guava.version>27.0-jre</guava.version>
         <jcommander.version>1.72</jcommander.version>
-		<failsafe.version>2.22.0</failsafe.version>
+		<failsafe.version>3.0.0-M1</failsafe.version>
 		<antrun.version>1.8</antrun.version>
     </properties>
     <dependencyManagement>
-        <dependencies>
+        <dependencies>	
             <dependency>
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
@@ -310,9 +309,9 @@
                 <version>1.0.1</version>
             </dependency>
             <dependency>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                    <version>${jaxb-api.version}</version>
+				<groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>${jaxb-api.version}</version>
             </dependency>          
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
@@ -365,7 +364,7 @@
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>1.10</version>
+                <version>1.11</version>
             </dependency>
             <dependency>
                 <groupId>commons-collections</groupId>
@@ -424,7 +423,7 @@
             <dependency>
                 <groupId>org.jetbrains</groupId>
                 <artifactId>annotations-java5</artifactId>
-                <version>15.0</version>
+                <version>16.0.3</version>
             </dependency>
             <dependency>
                 <groupId>javax.annotation</groupId>
@@ -434,7 +433,7 @@
             <dependency>
                 <groupId>javax.annotation</groupId>
                 <artifactId>javax.annotation-api</artifactId>
-                <version>1.2</version>
+                <version>1.3.2</version>
             </dependency>
             <dependency>
 				<groupId>javax.jws</groupId>
@@ -651,7 +650,7 @@
 				<!-- make this dependency explicit to detect conflicts with older versions -->
 			  <groupId>org.codehaus.woodstox</groupId>
 			  <artifactId>stax2-api</artifactId>
-			  <version>3.1.4</version>
+			  <version>4.1</version>
 			</dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
@@ -1035,7 +1034,7 @@
 	        <dependency>
 	            <groupId>org.jvnet.jaxb2_commons</groupId>
 	            <artifactId>jaxb2-basics-runtime</artifactId>
-	            <version>0.6.3</version>
+	            <version>1.11.1</version>
 	        </dependency>
 			<dependency>
 				<groupId>org.apache.maven</groupId>
@@ -1282,7 +1281,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.5.1</version>
+				<version>3.8.0</version>
 				<configuration>
 					<source>${project.source.version}</source>
 					<target>${project.source.version}</target>
@@ -1524,7 +1523,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>1.4.1</version>
+				<version>3.0.0-M2</version>
 				<executions>
 					<execution>
 						<id>enforce</id>
@@ -1539,10 +1538,10 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
+			<!--<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>3.0.2</version>
+				<version>3.1.1</version>
 				<executions>
 					<execution>
 						<id>analyze</id>
@@ -1552,42 +1551,49 @@
 						<configuration>
 							<failOnWarning>true</failOnWarning>
 							<ignoreNonCompile>true</ignoreNonCompile>
-							<ignoredUnusedDeclaredDependencies>
+							<ignoredUnusedDeclaredDependencies>-->
 
 								<!-- There are dependencies in this master POM. So they are projected 
 									everywhere, used or unused. -->
-								<ignoredUnusedDeclaredDependency>org.springframework</ignoredUnusedDeclaredDependency>
-                                <ignoredUnusedDeclaredDependency>org.springframework.boot</ignoredUnusedDeclaredDependency>
+								<!--<ignoredUnusedDeclaredDependency>org.springframework</ignoredUnusedDeclaredDependency>
+                                <ignoredUnusedDeclaredDependency>org.springframework.boot</ignoredUnusedDeclaredDependency>-->
 
 								<!-- Common "drill" for all modules. -->
-								<ignoredUnusedDeclaredDependency>com.evolveum.midpoint.tools:test-ng</ignoredUnusedDeclaredDependency>
+								<!--<ignoredUnusedDeclaredDependency>com.evolveum.midpoint.tools:test-ng</ignoredUnusedDeclaredDependency>
 								<ignoredUnusedDeclaredDependency>org.testng:testng</ignoredUnusedDeclaredDependency>
-								<ignoredUnusedDeclaredDependency>commons-lang:commons-lang</ignoredUnusedDeclaredDependency>
+								<ignoredUnusedDeclaredDependency>commons-lang:commons-lang</ignoredUnusedDeclaredDependency>-->
 
 								<!-- There is some kind of conflict between these. TODO: clean up -->
-								<ignoredUnusedDeclaredDependency>xml-apis:xml-apis</ignoredUnusedDeclaredDependency>
+								<!--<ignoredUnusedDeclaredDependency>xml-apis:xml-apis</ignoredUnusedDeclaredDependency>
 								<ignoredUnusedDeclaredDependency>stax:stax-api</ignoredUnusedDeclaredDependency>
-								<ignoredUnusedDeclaredDependency>org.springframework.ldap:spring-ldap-core</ignoredUnusedDeclaredDependency>
+								<ignoredUnusedDeclaredDependency>org.springframework.ldap:spring-ldap-core</ignoredUnusedDeclaredDependency>-->
 
 								<!-- We are making this dependency explicit to detect conflicts early -->
-								<ignoredUnusedDeclaredDependency>org.codehaus.woodstox:stax2-api</ignoredUnusedDeclaredDependency>
+								<!--<ignoredUnusedDeclaredDependency>org.codehaus.woodstox:stax2-api</ignoredUnusedDeclaredDependency>-->
 
 								<!-- The xjc-plugin does not compile without dependency on this -->
-								<ignoredUnusedDeclaredDependency>org.apache.cxf:cxf-tools-common</ignoredUnusedDeclaredDependency>
+								<!--<ignoredUnusedDeclaredDependency>org.apache.cxf:cxf-tools-common</ignoredUnusedDeclaredDependency>-->
 
 								<!-- Cannot help myself with this one (commons-configuration 1.6 causes this) TODO: revisit -->
-								<ignoredUnusedDeclaredDependency>commons-beanutils:commons-beanutils-core</ignoredUnusedDeclaredDependency>
+								<!--<ignoredUnusedDeclaredDependency>commons-beanutils:commons-beanutils-core</ignoredUnusedDeclaredDependency>
 							</ignoredUnusedDeclaredDependencies>
-							<ignoredUsedUndeclaredDependencies>
+							<ignoredUsedUndeclaredDependencies>-->
 								<!-- There is some kind of conflict between these. TODO: clean up -->
-								<ignoredUsedUndeclaredDependency>xml-apis:xml-apis</ignoredUsedUndeclaredDependency>
+								<!--<ignoredUsedUndeclaredDependency>xml-apis:xml-apis</ignoredUsedUndeclaredDependency>
 								<ignoredUsedUndeclaredDependency>stax:stax-api</ignoredUsedUndeclaredDependency>
 								<ignoredUsedUndeclaredDependency>org.springframework.ldap:spring-ldap-core</ignoredUsedUndeclaredDependency>
 							</ignoredUsedUndeclaredDependencies>
 						</configuration>
 					</execution>
 				</executions>
-			</plugin>
+				<dependencies>
+					<dependency>
+						<groupId>org.ow2.asm</groupId>
+						<artifactId>asm</artifactId>
+						<version>7.0</version>
+					</dependency>
+				</dependencies>
+			</plugin>-->
 		</plugins>
 	</build>
 
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
index 201f750044b..06a07ad812b 100644
--- a/gui/admin-gui/pom.xml
+++ b/gui/admin-gui/pom.xml
@@ -212,7 +212,7 @@
         <dependency>
             <groupId>org.jasig.cas.client</groupId>
             <artifactId>cas-client-core</artifactId>
-            <version>3.5.0</version>
+            <version>${cas.client.version}</version>
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServiceHistory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServiceHistory.java
index 6ad13201457..4061ce32842 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServiceHistory.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServiceHistory.java
@@ -23,17 +23,12 @@
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.application.AuthorizationAction;
 import com.evolveum.midpoint.web.application.PageDescriptor;
-import com.evolveum.midpoint.web.component.FocusSummaryPanel;
 import com.evolveum.midpoint.web.component.ObjectSummaryPanel;
 import com.evolveum.midpoint.web.component.prism.ObjectWrapper;
-import com.evolveum.midpoint.web.page.admin.roles.PageAdminRoles;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ServiceType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 import org.apache.wicket.model.IModel;
 
-import javax.xml.ws.Service;
-
 /**
  * Created by honchar
  */
diff --git a/infra/prism-maven-plugin/pom.xml b/infra/prism-maven-plugin/pom.xml
index 23de506444a..1b0928922c5 100644
--- a/infra/prism-maven-plugin/pom.xml
+++ b/infra/prism-maven-plugin/pom.xml
@@ -55,6 +55,12 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-archiver</artifactId>
+			<exclusions>
+				<exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>jsr305</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
diff --git a/infra/prism-maven-plugin/src/main/java/com/evolveum/midpoint/prism/maven/SchemaDocMojo.java b/infra/prism-maven-plugin/src/main/java/com/evolveum/midpoint/prism/maven/SchemaDocMojo.java
index a45ad079fca..f4242dd903d 100644
--- a/infra/prism-maven-plugin/src/main/java/com/evolveum/midpoint/prism/maven/SchemaDocMojo.java
+++ b/infra/prism-maven-plugin/src/main/java/com/evolveum/midpoint/prism/maven/SchemaDocMojo.java
@@ -92,13 +92,19 @@ public class SchemaDocMojo extends AbstractMojo {
      */
     private File resourcesDir;
 
-    /** @parameter default-value="${project}" */
+    /** 
+	 * @parameter default-value="${project}" 
+	 */
     private org.apache.maven.project.MavenProject project;
 
-    /** @parameter */
+    /** 
+	 * @parameter 
+	 */
     private MavenArchiveConfiguration archive = new MavenArchiveConfiguration();
 
-    /** @parameter default-value="${project.build.finalName}" */
+    /** 
+	* @parameter default-value="${project.build.finalName}" 
+	*/
     private String finalName;
 
     /**
@@ -106,7 +112,9 @@ public class SchemaDocMojo extends AbstractMojo {
      */
     private MavenProjectHelper projectHelper;
 
-    /** @component role="org.codehaus.plexus.archiver.Archiver" roleHint="zip" */
+    /** 
+	* @component role="org.codehaus.plexus.archiver.Archiver" roleHint="zip" 
+	*/
     private ZipArchiver zipArchiver;
 
     private String getTemplateDirName() {
diff --git a/infra/prism/pom.xml b/infra/prism/pom.xml
index eb1833f738e..a8dc95023ec 100644
--- a/infra/prism/pom.xml
+++ b/infra/prism/pom.xml
@@ -66,6 +66,12 @@
 		<dependency>
 			<groupId>org.apache.santuario</groupId>
 			<artifactId>xmlsec</artifactId>
+			<exclusions>
+				<exclusion>
+                    <groupId>com.fasterxml.woodstox</groupId>
+                    <artifactId>woodstox-core</artifactId>
+                </exclusion>
+            </exclusions>
 		</dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
@@ -191,6 +197,10 @@
             <version>4.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
+        <dependency> 
+        	<groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/infra/schema-pure-jaxb/pom.xml b/infra/schema-pure-jaxb/pom.xml
index 93d96376704..4dc6d7b2382 100644
--- a/infra/schema-pure-jaxb/pom.xml
+++ b/infra/schema-pure-jaxb/pom.xml
@@ -111,10 +111,10 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
+           <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxb2-maven-plugin</artifactId>
-                <version>2.3.1</version>
+                <version>2.4</version>
                 <executions>
                     <execution>
                         <id>xjc</id>
@@ -147,7 +147,52 @@
                         </filter>
                     </xjcSourceExcludeFilters>
                 </configuration>
+				<dependencies>
+    <dependency>
+        <groupId>org.glassfish.jaxb</groupId>
+        <artifactId>jaxb-xjc-jdk9</artifactId>
+        <version>2.3.0</version>
+    </dependency>
+    <dependency>
+        <groupId>javax.activation</groupId>
+        <artifactId>javax.activation-api</artifactId>
+        <version>1.2.0</version>
+    </dependency>
+</dependencies>
             </plugin>
+		<!-- 	<plugin>
+    <groupId>org.codehaus.mojo</groupId>
+    <artifactId>exec-maven-plugin</artifactId>
+    <version>1.6.0</version>
+    <executions>
+        <execution>
+            <id>execute xjc</id>
+            <phase>generate-sources</phase>
+            <goals>
+                <goal>exec</goal>
+            </goals>
+            <configuration>
+                <executable>xjc</executable>
+                <longModulepath>false</longModulepath>
+                <arguments>
+					<argument>-d</argument>
+                    <argument>-catalog</argument>
+					<argument>${basedir}/src/compile/resources/catalog.xml</argument>
+					<argument>-nv</argument>
+					<argument>true</argument>
+					<argument>-verbose</argument>
+                    <argument>-b</argument>
+                    <argument>${project.basedir}/target/midpoint-schema/*/*/*/*/annotation-3.xsd</argument>
+					<argument>${project.basedir}/target/midpoint-schema/*/*/*/*/query-3.xsd</argument>
+					<argument>${project.basedir}/target/midpoint-schema/*/*/*/*/types-3.xsd</argument>
+					<argument>${project.basedir}/target/midpoint-schema/*/*/*/*/common-*.xsd</argument>
+					<argument>${project.basedir}/target/midpoint-schema/*/*/*/*/*/scripting-3.xsd</argument>
+					<argument>${project.basedir}/target/midpoint-schema/*/*/*/*/*/resource-schema-3.xsd</argument>
+                </arguments>
+            </configuration>
+        </execution>
+    </executions>
+</plugin>-->
         </plugins>
     </build>
 </project>
diff --git a/infra/schema-pure-jaxb/src/compile/resources/catalog.xml b/infra/schema-pure-jaxb/src/compile/resources/catalog.xml
index 12e41aaa7a6..cf1470b3c7d 100644
--- a/infra/schema-pure-jaxb/src/compile/resources/catalog.xml
+++ b/infra/schema-pure-jaxb/src/compile/resources/catalog.xml
@@ -50,7 +50,7 @@ Used when building via xjc.
     <public publicId="http://midpoint.evolveum.com/xml/ns/public/gui/admin-1" uri="../../../target/midpoint-schema/xml/ns/public/gui/admin-1.xsd" />
 
     <!-- provisioning -->
-    <public publicId="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" uri="../../../target/midpoint-schema/xml/ns/public/connector/icf-1/resource-schema-3.xsd" />
+    <public publicId="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" uri="../../../target/midpoint-schema/xml/ns/public/connector/icf-1/resource-schema-3.xsd" /> 
     <public publicId="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-3" uri="../../../target/midpoint-schema/xml/ns/public/connector/icf-1/connector-schema-3.xsd" />
     <public publicId="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3" uri="../../../target/midpoint-schema/xml/ns/public/resource/capabilities-3.xsd" />
 
diff --git a/infra/schema/pom.xml b/infra/schema/pom.xml
index 993f67c98c6..64f48482600 100644
--- a/infra/schema/pom.xml
+++ b/infra/schema/pom.xml
@@ -145,6 +145,16 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+	<pluginRepositories>         
+   		<pluginRepository>
+      		<id>apache.snapshots</id>
+      		<name>Maven Plugin Snapshots</name>
+      		<url>http://repository.apache.org/snapshots/</url>
+      		<snapshots>
+        		<enabled>true</enabled>
+      		</snapshots>
+    	</pluginRepository>
+	</pluginRepositories>
     <build>
         <plugins>
             <plugin>
@@ -246,6 +256,7 @@
                                     </extraargs>
                                 </wsdlOption>
                             </wsdlOptions>
+                            <validateWsdl>false</validateWsdl>
                         </configuration>
                         <goals>
                             <goal>wsdl2java</goal>
@@ -261,7 +272,7 @@
                     <dependency>
                         <groupId>org.jvnet.jaxb2_commons</groupId>
                         <artifactId>jaxb2-basics</artifactId>
-                        <version>0.6.3</version>
+                        <version>1.11.1</version>
                     </dependency>
                     <dependency>
                         <groupId>com.evolveum.midpoint.tools</groupId>
diff --git a/infra/util/pom.xml b/infra/util/pom.xml
index 694f5a1df9d..3635fee952f 100644
--- a/infra/util/pom.xml
+++ b/infra/util/pom.xml
@@ -45,8 +45,8 @@
 			<artifactId>commons-codec</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
+			<groupId>org.apache.commons</groupId>
+    		<artifactId>commons-lang3</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
@@ -96,12 +96,20 @@
 			<groupId>org.jetbrains</groupId>
 			<artifactId>annotations-java5</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+		</dependency>
+		<dependency>
+  			<groupId>org.eclipse.birt.runtime.3_7_1</groupId>
+  			<artifactId>org.apache.xerces</artifactId>
+  			<version>2.9.0</version>
+		</dependency>
         <!-- Test -->
 		<dependency>
 			<groupId>org.testng</groupId>
 			<artifactId>testng</artifactId>
 			<scope>test</scope>
 		</dependency>
-		
 	</dependencies>
 </project>
diff --git a/infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java b/infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
index 0a912e1e99a..e1da98f23a5 100644
--- a/infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
+++ b/infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
@@ -38,11 +38,11 @@
 
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
-import com.sun.org.apache.xml.internal.utils.XMLChar;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
+import org.apache.xerces.util.XMLChar;
 import org.jetbrains.annotations.NotNull;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Comment;
diff --git a/infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java b/infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
index 1fa263f734f..06291341e3c 100644
--- a/infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
+++ b/infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
@@ -16,7 +16,7 @@
 package com.evolveum.midpoint.util;
 
 import com.evolveum.midpoint.util.exception.SystemException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 import com.evolveum.midpoint.util.logging.Trace;
diff --git a/infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java b/infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
index 06a72fcba05..4783d50ce20 100644
--- a/infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
+++ b/infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
@@ -25,8 +25,8 @@
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.w3c.dom.Node;
diff --git a/infra/util/src/main/java/com/evolveum/midpoint/util/ReflectionUtil.java b/infra/util/src/main/java/com/evolveum/midpoint/util/ReflectionUtil.java
index 0177d6301de..c1fe59a2078 100644
--- a/infra/util/src/main/java/com/evolveum/midpoint/util/ReflectionUtil.java
+++ b/infra/util/src/main/java/com/evolveum/midpoint/util/ReflectionUtil.java
@@ -20,7 +20,7 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author semancik
diff --git a/infra/util/src/main/java/com/evolveum/midpoint/util/UglyHacks.java b/infra/util/src/main/java/com/evolveum/midpoint/util/UglyHacks.java
index baac29a7573..e9834655176 100644
--- a/infra/util/src/main/java/com/evolveum/midpoint/util/UglyHacks.java
+++ b/infra/util/src/main/java/com/evolveum/midpoint/util/UglyHacks.java
@@ -20,7 +20,7 @@
 
 import javax.xml.XMLConstants;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
diff --git a/infra/util/src/main/java/com/evolveum/midpoint/util/histogram/Histogram.java b/infra/util/src/main/java/com/evolveum/midpoint/util/histogram/Histogram.java
index 1d5fb6f0a7d..caa15590b05 100644
--- a/infra/util/src/main/java/com/evolveum/midpoint/util/histogram/Histogram.java
+++ b/infra/util/src/main/java/com/evolveum/midpoint/util/histogram/Histogram.java
@@ -16,7 +16,7 @@
 
 package com.evolveum.midpoint.util.histogram;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 
diff --git a/infra/util/src/main/java/com/evolveum/midpoint/util/logging/LoggingUtils.java b/infra/util/src/main/java/com/evolveum/midpoint/util/logging/LoggingUtils.java
index c4f8578c3e6..ba848b4d4fa 100644
--- a/infra/util/src/main/java/com/evolveum/midpoint/util/logging/LoggingUtils.java
+++ b/infra/util/src/main/java/com/evolveum/midpoint/util/logging/LoggingUtils.java
@@ -20,7 +20,7 @@
 import java.util.List;
 
 import ch.qos.logback.classic.Level;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 /**
  *
diff --git a/model/certification-impl/pom.xml b/model/certification-impl/pom.xml
index a282502870a..ea855e146d5 100644
--- a/model/certification-impl/pom.xml
+++ b/model/certification-impl/pom.xml
@@ -277,8 +277,8 @@
 			<scope>provided</scope> 
 		</dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
 <!--             <version>4.8.2</version> -->
             <scope>test</scope>
         </dependency>
diff --git a/model/workflow-impl/pom.xml b/model/workflow-impl/pom.xml
index 54d1dae05f9..de7b53ccc99 100644
--- a/model/workflow-impl/pom.xml
+++ b/model/workflow-impl/pom.xml
@@ -300,8 +300,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
 <!--             <version>4.8.2</version> -->
             <scope>test</scope>
         </dependency>
diff --git a/pom.xml b/pom.xml
index 100bb22e0b6..bef0454ac9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.5.1</version>
+				<version>3.8.0</version>
 				<configuration>
 					<source>${project.source.version}</source>
 					<target>${project.source.version}</target>
@@ -91,7 +91,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-plugin-plugin</artifactId>
-					<version>3.3</version>		<!-- 3.2 does not work because of some internal error; 3.4+ probably because of some misconfiguration -->
+					<version>3.6.0</version>		<!-- 3.2 does not work because of some internal error; 3.4+ probably because of some misconfiguration -->
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -163,10 +163,22 @@
 			<name>Evolveum Snapshots</name>
 			<url>https://nexus.evolveum.com/nexus/content/repositories/snapshots/</url>
 		</repository>
+		<repository>
+			<id>jvnet-nexus-staging</id>
+			<url>http://maven.java.net/content/repositories/staging/</url>
+		</repository>
+		<repository>
+      <id>apache.snapshots</id>
+      <name>Maven Plugin Snapshots</name>
+      <url>http://repository.apache.org/snapshots/</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+	  </repository>
 	</repositories>
 	<properties>
 		<!-- Build system options - more options in build-system/pom.xml -->
-		<project.source.version>1.8</project.source.version>
+		<project.source.version>11</project.source.version>
 		<clover.version>3.1.11</clover.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
diff --git a/samples/model-client-sample/pom.xml b/samples/model-client-sample/pom.xml
index 10ce6a8412a..f9ac0fae4e7 100644
--- a/samples/model-client-sample/pom.xml
+++ b/samples/model-client-sample/pom.xml
@@ -23,7 +23,7 @@
 	<!-- NOTE: no parent. We want this to be completely stand-alone. -->
 	<version>4.0-SNAPSHOT</version>
 	<properties>
-		<project.source.version>1.8</project.source.version>
+		<project.source.version>11</project.source.version>
     	<cxf.version>3.1.6</cxf.version>
 	</properties>
 	<organization>
@@ -149,10 +149,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.8.0</version>
                 <configuration>
                     <source>${project.source.version}</source>
-                    <target>${project.source.version}</target>
+					<target>${project.source.version}</target>
                     <fork>true</fork>
                     <meminitial>128m</meminitial>
                     <maxmem>768m</maxmem>
@@ -160,6 +160,13 @@
                     <showWarnings>true</showWarnings>
                     <!--verbose>true</verbose> <showWarnings>false</showWarnings -->
                 </configuration>
+				<dependencies>
+					<dependency>
+						<groupId>org.ow2.asm</groupId>
+						<artifactId>asm</artifactId>
+						<version>6.2</version>
+					</dependency>
+				</dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/tools/schema-dist-maven-plugin/src/main/java/com/evolveum/midpoint/tools/schemadist/SchemaDistMojo.java b/tools/schema-dist-maven-plugin/src/main/java/com/evolveum/midpoint/tools/schemadist/SchemaDistMojo.java
index b6d91a2b0af..9f1ef7b979a 100644
--- a/tools/schema-dist-maven-plugin/src/main/java/com/evolveum/midpoint/tools/schemadist/SchemaDistMojo.java
+++ b/tools/schema-dist-maven-plugin/src/main/java/com/evolveum/midpoint/tools/schemadist/SchemaDistMojo.java
@@ -102,13 +102,19 @@ public class SchemaDistMojo extends AbstractMojo {
      */
     private File resourcesDir;
 
-    /** @parameter default-value="${project}" */
+    /** 
+     * @parameter default-value="${project}" 
+     */
     private org.apache.maven.project.MavenProject project;
 
-    /** @parameter default-value="${localRepository}" */
+    /** 
+     * @parameter default-value="${localRepository}" 
+     */
     private ArtifactRepository local;
 
-    /** @parameter default-value="${project.remoteArtifactRepositories}" */
+    /** 
+     * @parameter default-value="${project.remoteArtifactRepositories}" 
+     */
     protected List<ArtifactRepository> remoteRepos;
 
     /**