diff --git a/.gitignore b/.gitignore
index 16dc62e8e96..b3be89ec71b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
.settings
.idea
*.iml
+*.versionsBackup
target
rebel.xml
samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/bin
diff --git a/build-system/pom.xml b/build-system/pom.xml
index 789ee3ecabf..520748dd182 100644
--- a/build-system/pom.xml
+++ b/build-system/pom.xml
@@ -25,7 +25,7 @@
com.evolveum.midpoint
midpoint
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
@@ -406,7 +406,7 @@
com.evolveum.polygon
connector-ldap
- 1.4.1.23
+ 1.4.2.0-SNAPSHOT
com.evolveum.polygon
@@ -828,6 +828,7 @@
+ src/test/resources/truststore.jks
target/midpoint-home
${project.build.directory}/test-classes/logging.properties
diff --git a/cli/common/pom.xml b/cli/common/pom.xml
index fc4ba74ed3c..9f602f1f48d 100644
--- a/cli/common/pom.xml
+++ b/cli/common/pom.xml
@@ -23,12 +23,12 @@
midPoint CLI Interface - common
com.evolveum.midpoint.cli
common
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
com.evolveum.midpoint
cli
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
diff --git a/cli/ninja/pom.xml b/cli/ninja/pom.xml
index 92b97e7a5a4..0e573815ff2 100644
--- a/cli/ninja/pom.xml
+++ b/cli/ninja/pom.xml
@@ -23,12 +23,12 @@
midPoint CLI Interface - ninja
com.evolveum.midpoint.cli
ninja
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
com.evolveum.midpoint
cli
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
diff --git a/cli/pom.xml b/cli/pom.xml
index bcb4bbbfccd..a471a5cd414 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -22,13 +22,13 @@
midPoint CLI Interface
cli
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
pom
parent
com.evolveum.midpoint
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
../build-system/pom.xml
diff --git a/cli/seppuku/pom.xml b/cli/seppuku/pom.xml
index df633f75e18..c92371c674c 100644
--- a/cli/seppuku/pom.xml
+++ b/cli/seppuku/pom.xml
@@ -23,12 +23,12 @@
midPoint CLI Interface - seppuku
com.evolveum.midpoint.cli
seppuku
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
com.evolveum.midpoint
cli
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
diff --git a/custom/pom.xml b/custom/pom.xml
index 3d6e3bec8af..04331affaf5 100644
--- a/custom/pom.xml
+++ b/custom/pom.xml
@@ -23,7 +23,7 @@
parent
com.evolveum.midpoint
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
../build-system/pom.xml
diff --git a/dist/midpoint-api/pom.xml b/dist/midpoint-api/pom.xml
index 244503b4db2..2710a2fe1fd 100644
--- a/dist/midpoint-api/pom.xml
+++ b/dist/midpoint-api/pom.xml
@@ -24,7 +24,7 @@
parent
com.evolveum.midpoint
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
../../build-system/pom.xml
@@ -51,22 +51,22 @@
com.evolveum.midpoint.model
model-api
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
com.evolveum.midpoint.infra
common
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
com.evolveum.midpoint.infra
schema
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
com.evolveum.midpoint.infra
util
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
diff --git a/dist/pom.xml b/dist/pom.xml
index e04a17c0240..503185882ff 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -24,7 +24,7 @@
parent
com.evolveum.midpoint
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
../build-system/pom.xml
@@ -51,20 +51,20 @@
com.evolveum.midpoint.gui
admin-gui
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
war
com.evolveum.midpoint.tools
repo-ninja
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
zip
bin
com.evolveum.midpoint.tools
repo-ninja
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
diff --git a/gui/admin-gui-en-US/pom.xml b/gui/admin-gui-en-US/pom.xml
index ff33f66a434..75d5991af66 100644
--- a/gui/admin-gui-en-US/pom.xml
+++ b/gui/admin-gui-en-US/pom.xml
@@ -21,11 +21,11 @@
com.evolveum.midpoint.gui
admin-gui-en-US
jar
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
gui
com.evolveum.midpoint
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
https://github.com/Evolveum/midpoint.git
@@ -44,7 +44,7 @@
com.evolveum.midpoint.tools
test-ng
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
test
diff --git a/gui/admin-gui-es-ES/pom.xml b/gui/admin-gui-es-ES/pom.xml
index dd4e639770d..d26db87772d 100644
--- a/gui/admin-gui-es-ES/pom.xml
+++ b/gui/admin-gui-es-ES/pom.xml
@@ -21,11 +21,11 @@
com.evolveum.midpoint.gui
admin-gui-es-ES
jar
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
gui
com.evolveum.midpoint
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
https://github.com/Evolveum/midpoint.git
@@ -44,7 +44,7 @@
com.evolveum.midpoint.tools
test-ng
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
test
diff --git a/gui/admin-gui-sk-SK/pom.xml b/gui/admin-gui-sk-SK/pom.xml
index a4242b50b50..f40883afdc0 100644
--- a/gui/admin-gui-sk-SK/pom.xml
+++ b/gui/admin-gui-sk-SK/pom.xml
@@ -21,11 +21,11 @@
com.evolveum.midpoint.gui
admin-gui-sk-SK
jar
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
gui
com.evolveum.midpoint
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
https://github.com/Evolveum/midpoint.git
@@ -44,7 +44,7 @@
com.evolveum.midpoint.tools
test-ng
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
test
diff --git a/gui/admin-gui-tr-TR/pom.xml b/gui/admin-gui-tr-TR/pom.xml
index fc17a776749..904b0adbe16 100644
--- a/gui/admin-gui-tr-TR/pom.xml
+++ b/gui/admin-gui-tr-TR/pom.xml
@@ -21,11 +21,11 @@
com.evolveum.midpoint.gui
admin-gui-tr-TR
jar
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
gui
com.evolveum.midpoint
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
@@ -39,7 +39,7 @@
com.evolveum.midpoint.tools
test-ng
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
test
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
index e89bd9b9004..6c95a225aaa 100644
--- a/gui/admin-gui/pom.xml
+++ b/gui/admin-gui/pom.xml
@@ -20,11 +20,11 @@
com.evolveum.midpoint.gui
admin-gui
war
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
gui
com.evolveum.midpoint
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
https://github.com/Evolveum/midpoint.git
@@ -188,22 +188,22 @@
com.evolveum.midpoint.gui
admin-gui-en-US
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
com.evolveum.midpoint.gui
admin-gui-sk-SK
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
com.evolveum.midpoint.gui
admin-gui-tr-TR
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
com.evolveum.midpoint.gui
admin-gui-es-ES
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
@@ -216,7 +216,7 @@
com.evolveum.midpoint.repo
repo-api
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
jaxb-impl
@@ -231,38 +231,38 @@
com.evolveum.midpoint.model
report-api
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
com.evolveum.midpoint.model
model-api
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
com.evolveum.midpoint.model
certification-api
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
com.evolveum.midpoint.repo
security-api
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
com.evolveum.midpoint.model
workflow-api
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
com.evolveum.midpoint.model
notifications-api
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
com.evolveum.midpoint.repo
repo-sql-impl
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
runtime
@@ -278,7 +278,7 @@
com.evolveum.midpoint.repo
repo-cache
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
runtime
@@ -302,25 +302,25 @@
com.evolveum.midpoint.repo
task-quartz-impl
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
runtime
com.evolveum.midpoint.repo
audit-impl
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
runtime
com.evolveum.midpoint.repo
security-impl
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
runtime
com.evolveum.midpoint.model
model-impl
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
runtime
@@ -332,31 +332,31 @@
com.evolveum.midpoint.model
certification-impl
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
runtime
com.evolveum.midpoint.model
workflow-impl
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
runtime
com.evolveum.midpoint.model
notifications-impl
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
runtime
com.evolveum.midpoint.provisioning
provisioning-impl
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
runtime
com.evolveum.midpoint.repo
system-init
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
runtime
@@ -368,13 +368,13 @@
com.evolveum.midpoint.model
report-impl
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
runtime
com.evolveum.midpoint.model
report-ds-impl
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
runtime
@@ -392,7 +392,7 @@
com.evolveum.midpoint.infra
common
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
xml-apis
@@ -496,13 +496,13 @@
com.evolveum.midpoint.repo
repo-test-util
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
test
com.evolveum.midpoint.repo
repo-sql-impl-test
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
test
@@ -519,7 +519,7 @@
com.evolveum.midpoint.tools
test-ng
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
test
@@ -641,7 +641,7 @@
com.evolveum.midpoint.model
model-test
- 3.2-SNAPSHOT
+ 3.3-SNAPSHOT
test
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/MenuItem.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/MenuItem.java
index ba6fc6e0c2f..a0f06e4374f 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/MenuItem.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/MenuItem.java
@@ -1,12 +1,14 @@
package com.evolveum.midpoint.web.component.menu.top;
import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
-import com.github.sommeri.less4j.core.ast.Page;
+import org.apache.commons.lang.Validate;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author lazyman
@@ -19,6 +21,8 @@ public class MenuItem implements Serializable {
private boolean menuHeader;
private PageParameters pageParameters;
+ private List