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 @@
2.6
2.6
- 3.7
- 1.2
- 3.2.4
- 3.2.0
- 2.2.0
+ 3.8.1
+ 1.4
+ 3.3.0-SNAPSHOT
+ 3.2.3
+ 2.2.2
2.4.7
- 2.2.10
- 2.2.10
- 2.2.10
- 4.8.2
- 2.6.2
- 1.10.8
- 2.3.0.e2
- 3.6.0
- 1.7.25
- 1.2.3
- 2.0.3.RELEASE
- 5.0.7.RELEASE
- 5.0.6.RELEASE
- 3.5.0
- 6.8.8
+ 2.3.0
+ 2.3.0
+ 2.3.0
+ 5.3.1
+ 2.6.11
+ 2.23.0
+ 2.3.0
+ 3.141.59
+ 1.8.0-beta2
+ 1.3.0-alpha4
+ 2.1.0.RELEASE
+ 5.1.2.RELEASE
+ 5.1.1.RELEASE
+ 3.5.1
+ 7.0.0-beta1
1.2
- 2.1.1
- 2.2.3
- 5.2.12.Final
-
1.4.193
- 42.2.2
- 6.4.0.jre8
+ 2.6.2
+ 5.4.0.CR1
+ 1.4.197
+ 42.2.5
+ 7.1.2.jre11-preview
2.3.0
- 6.0.6
- 7.10.0
- 2.4.14
- 5.22.0
- 5.22.0
- 1.3
- 2.0.6
+ 8.0.13
+ 8.2.0
+ 3.0.0-alpha-3
+ 7.0.0.Beta3
+ 7.0.0.Beta3
+ 1.5
+ 2.1.2
1.5.0.0
- 6.5.0
- 10.11.1.1
+ 6.7.0
+ 10.14.2.0
1.8.0
- 2.9.5
- 1.19
+ 2.9.7
+ 1.23
2.22.1
0.9.11
- 20.0
+ 27.0-jre
1.72
- 2.22.0
+ 3.0.0-M1
1.8
-
+
org.springframework.boot
@@ -310,9 +309,9 @@
1.0.1
- javax.xml.bind
- jaxb-api
- ${jaxb-api.version}
+ javax.xml.bind
+ jaxb-api
+ ${jaxb-api.version}
com.sun.xml.bind
@@ -365,7 +364,7 @@
commons-codec
commons-codec
- 1.10
+ 1.11
commons-collections
@@ -424,7 +423,7 @@
org.jetbrains
annotations-java5
- 15.0
+ 16.0.3
javax.annotation
@@ -434,7 +433,7 @@
javax.annotation
javax.annotation-api
- 1.2
+ 1.3.2
javax.jws
@@ -651,7 +650,7 @@
org.codehaus.woodstox
stax2-api
- 3.1.4
+ 4.1
org.apache.felix
@@ -1035,7 +1034,7 @@
org.jvnet.jaxb2_commons
jaxb2-basics-runtime
- 0.6.3
+ 1.11.1
org.apache.maven
@@ -1282,7 +1281,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.5.1
+ 3.8.0
${project.source.version}
@@ -1524,7 +1523,7 @@
org.apache.maven.plugins
maven-enforcer-plugin
- 1.4.1
+ 3.0.0-M2
enforce
@@ -1539,10 +1538,10 @@
-
+
- org.springframework
- org.springframework.boot
+
- com.evolveum.midpoint.tools:test-ng
+
- xml-apis:xml-apis
+
- org.codehaus.woodstox:stax2-api
+
- org.apache.cxf:cxf-tools-common
+
- commons-beanutils:commons-beanutils-core
+
- xml-apis:xml-apis
+
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 @@
org.jasig.cas.client
cas-client-core
- 3.5.0
+ ${cas.client.version}
org.webjars
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 @@
org.apache.maven
maven-archiver
+
+
+ com.google.code.findbugs
+ jsr305
+
+
org.codehaus.plexus
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 @@
org.apache.santuario
xmlsec
+
+
+ com.fasterxml.woodstox
+ woodstox-core
+
+
org.jetbrains
@@ -191,6 +197,10 @@
4.0-SNAPSHOT
test
+
+ javax.activation
+ activation
+
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 @@
-
+
org.codehaus.mojo
jaxb2-maven-plugin
- 2.3.1
+ 2.4
xjc
@@ -147,7 +147,52 @@
+
+
+ org.glassfish.jaxb
+ jaxb-xjc-jdk9
+ 2.3.0
+
+
+ javax.activation
+ javax.activation-api
+ 1.2.0
+
+
+
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.
-
+
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 @@
test
+
+
+ apache.snapshots
+ Maven Plugin Snapshots
+ http://repository.apache.org/snapshots/
+
+ true
+
+
+
@@ -246,6 +256,7 @@
+ false
wsdl2java
@@ -261,7 +272,7 @@
org.jvnet.jaxb2_commons
jaxb2-basics
- 0.6.3
+ 1.11.1
com.evolveum.midpoint.tools
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 @@
commons-codec
- commons-lang
- commons-lang
+ org.apache.commons
+ commons-lang3
commons-io
@@ -96,12 +96,20 @@
org.jetbrains
annotations-java5
+
+ javax.xml.bind
+ jaxb-api
+
+
+ org.eclipse.birt.runtime.3_7_1
+ org.apache.xerces
+ 2.9.0
+
org.testng
testng
test
-
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 @@
provided
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
test
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 @@
test
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
test
diff --git a/pom.xml b/pom.xml
index 100bb22e0b6..bef0454ac9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.5.1
+ 3.8.0
${project.source.version}
@@ -91,7 +91,7 @@
org.apache.maven.plugins
maven-plugin-plugin
- 3.3
+ 3.6.0
org.apache.maven.plugins
@@ -163,10 +163,22 @@
Evolveum Snapshots
https://nexus.evolveum.com/nexus/content/repositories/snapshots/
+
+ jvnet-nexus-staging
+ http://maven.java.net/content/repositories/staging/
+
+
+ apache.snapshots
+ Maven Plugin Snapshots
+ http://repository.apache.org/snapshots/
+
+ true
+
+
- 1.8
+ 11
3.1.11
UTF-8
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 @@
4.0-SNAPSHOT
- 1.8
+ 11
3.1.6
@@ -149,10 +149,10 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.5.1
+ 3.8.0
- ${project.source.version}
+ ${project.source.version}
true
128m
768m
@@ -160,6 +160,13 @@
true
+
+
+ org.ow2.asm
+ asm
+ 6.2
+
+
org.apache.maven.plugins
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 remoteRepos;
/**