Merge remote-tracking branch 'origin/master'

Evolveum · Jul 4, 2017 · 106f8f8 · 106f8f8
2 parents 478893e + b962fbd
commit 106f8f8
Show file tree

Hide file tree

Showing 95 changed files with 904 additions and 804 deletions.
diff --git a/NEWS b/NEWS
@@ -1,38 +1,29 @@
-midPoint 3.5 "Einstein"
+midPoint 3.6 "Comenius"
 ----------------------------------
 
-Release 3.5 is eighteenth midPoint release code-named Einstein. The 3.5
-release brings lots of features related to identity governance,
-self-registration and support for JSON/YAML.
+Release 3.6 is twenty first midPoint release code-named Comenius.
+The 3.6 release brings numerous new features especially in the
+field of identity governance, password management and identity
+connectors.
 
-Release date: 21st December 2016
+Release date: 4th July 2017
 
-Changes with respect to version 3.4.1:
-    Role catalog
-    Role request based on shopping cart paradigm
-    JSON/YAML support
-    Object lifecycle property
-    Passive Attribute Caching (EXPERIMENTAL)
-    Deputy (ad-hoc privilege delegation)
-    Object history (time machine)
-    Interactive audit log viewer
-    Audit log indexing improvements
-    Assignment metadata
-    Basic role lifecycle management (role approvals)
-    Improved approval processes
-    Self-registration
-    E-mail based password reset
-    Experimental support for policy rules
-    Weak construction
-    Improvements to AD connector in multi-domain environment
-    Identity merge
-    Better control over administration GUI forms
-    MariaDB support
-    Configurable limitations of parallel execution of tasks
-    Various user interface improvements
-    Internal code cleanup
-    Documentation improvements
+Changes with respect to version 3.5.1:
+    Major SoD improvements
+    Certificaiton improvements
+    Escalation
+    Other identity governance features
+    Password hashing
+    Manual connectors by ITSM integration
+    Important improvements to mappings, expressions, object templates and other mechanisms
+    Custom forms
+    Quasi-fulltext search
+    Shopping cart and role catalog improvements
+    Numerous GUI improvements
+    Significantly improved Powershell support
+    New CSV connector
+    Other connector improvements
 
 Java 7 environment is no longer supported.
 XPath2 scripting is no longer supported.
-CSVFile Connector is deprecated.
+CSVFile Connector is no longer supported.
diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,5 @@
 MidPoint Identity Manager
-Copyright 2010-2016 Evolveum
+Copyright 2010-2017 Evolveum
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

diff --git a/README b/README
@@ -1,4 +1,4 @@
-midPoint 3.5 "Einstein"
+midPoint 3.6 "Comenius"
 ------------------------------------
 
 General information:

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 Status: [![Build Status](https://travis-ci.org/Evolveum/midpoint.svg?branch=master)](https://travis-ci.org/Evolveum/midpoint)
 
-midPoint 3.5 "Einstein"
+midPoint 3.6 "Comenius"
 ------------------------------------
 
 General information:

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
@@ -1,4 +1,4 @@
 To see actual releases notes please go to:
 
-https://wiki.evolveum.com/display/midPoint/Release+3.5
+https://wiki.evolveum.com/display/midPoint/Release+3.6
 
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.evolveum.midpoint</groupId>
         <artifactId>midpoint</artifactId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.7-SNAPSHOT</version>
     </parent>
     <pluginRepositories>
         <pluginRepository>
@@ -661,7 +661,7 @@
             <dependency>
                 <groupId>com.evolveum.polygon</groupId>
                 <artifactId>connector-ldap</artifactId>
-                <version>1.4.5</version>
+                <version>1.5-SNAPSHOT</version>
                 <exclusions>
 					<exclusion> <!-- Version in dependency of org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j conflicts with xalan. Can be removed when connector version is bumped beyond 1.4.2.17 -->
                         <groupId>xml-apis</groupId>

diff --git a/cli/common/pom.xml b/cli/common/pom.xml
@@ -23,12 +23,12 @@
     <name>midPoint CLI Interface - common</name>
     <groupId>com.evolveum.midpoint.cli</groupId>
     <artifactId>common</artifactId>
-    <version>3.6-SNAPSHOT</version>
+    <version>3.7-SNAPSHOT</version>
 
     <parent>
         <groupId>com.evolveum.midpoint</groupId>
         <artifactId>cli</artifactId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.7-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/cli/ninja/pom.xml b/cli/ninja/pom.xml
@@ -23,12 +23,12 @@
     <name>midPoint CLI Interface - ninja</name>
     <groupId>com.evolveum.midpoint.cli</groupId>
     <artifactId>ninja</artifactId>
-    <version>3.6-SNAPSHOT</version>
+    <version>3.7-SNAPSHOT</version>
 
     <parent>
         <groupId>com.evolveum.midpoint</groupId>
         <artifactId>cli</artifactId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.7-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/cli/pom.xml b/cli/pom.xml
@@ -22,13 +22,13 @@
 
     <name>midPoint CLI Interface</name>
     <artifactId>cli</artifactId>
-    <version>3.6-SNAPSHOT</version>
+    <version>3.7-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.evolveum.midpoint</groupId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.7-SNAPSHOT</version>
         <relativePath>../build-system/pom.xml</relativePath>
     </parent>
 

diff --git a/cli/seppuku/pom.xml b/cli/seppuku/pom.xml
@@ -23,12 +23,12 @@
     <name>midPoint CLI Interface - seppuku</name>
     <groupId>com.evolveum.midpoint.cli</groupId>
     <artifactId>seppuku</artifactId>
-    <version>3.6-SNAPSHOT</version>
+    <version>3.7-SNAPSHOT</version>
 
     <parent>
         <groupId>com.evolveum.midpoint</groupId>
         <artifactId>cli</artifactId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.7-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/custom/pom.xml b/custom/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>parent</artifactId>
 		<groupId>com.evolveum.midpoint</groupId>
-		<version>3.6-SNAPSHOT</version>
+		<version>3.7-SNAPSHOT</version>
 		<relativePath>../build-system/pom.xml</relativePath>
 	</parent>
 	<organization>

diff --git a/dist/midpoint-api/pom.xml b/dist/midpoint-api/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.evolveum.midpoint</groupId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.7-SNAPSHOT</version>
         <relativePath>../../build-system/pom.xml</relativePath>
     </parent>
     <organization>
@@ -51,31 +51,31 @@
    	<dependency>
             <groupId>com.evolveum.midpoint.model</groupId>
             <artifactId>model-api</artifactId>
-            <version>3.6-SNAPSHOT</version>
+            <version>3.7-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.infra</groupId>
             <artifactId>common</artifactId>
-            <version>3.6-SNAPSHOT</version>
+            <version>3.7-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.infra</groupId>
             <artifactId>schema</artifactId>
-            <version>3.6-SNAPSHOT</version>
+            <version>3.7-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.infra</groupId>
             <artifactId>prism</artifactId>
-            <version>3.6-SNAPSHOT</version>
+            <version>3.7-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.infra</groupId>
             <artifactId>util</artifactId>
-            <version>3.6-SNAPSHOT</version>
+            <version>3.7-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/dist/pom.xml b/dist/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.evolveum.midpoint</groupId>
-        <version>3.6-SNAPSHOT</version>
+        <version>3.7-SNAPSHOT</version>
         <relativePath>../build-system/pom.xml</relativePath>
     </parent>
     <organization>
@@ -51,20 +51,20 @@
    		<dependency>
             <groupId>com.evolveum.midpoint.gui</groupId>
             <artifactId>admin-gui</artifactId>
-            <version>3.6-SNAPSHOT</version>
+            <version>3.7-SNAPSHOT</version>
             <type>war</type>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.tools</groupId>
             <artifactId>repo-ninja</artifactId>
-            <version>3.6-SNAPSHOT</version>
+            <version>3.7-SNAPSHOT</version>
             <type>zip</type>
             <classifier>bin</classifier>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.tools</groupId>
             <artifactId>repo-ninja</artifactId>
-            <version>3.6-SNAPSHOT</version>
+            <version>3.7-SNAPSHOT</version>
         </dependency> 
     	<dependency><!-- Not used, but required for surefire plugin not to complain -->
             <groupId>org.testng</groupId>
@@ -78,7 +78,7 @@
                 <!-- Used to pull XSD files from the JAR -->
                 <groupId>com.evolveum.midpoint.tools</groupId>
                 <artifactId>schema-dist-maven-plugin</artifactId>
-                <version>3.6-SNAPSHOT</version>
+                <version>3.7-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <id>schemadist-prism</id>