Merge branch 'master' into feature/certification-reiteration

Evolveum · Jun 22, 2018 · 575e9a6 · 575e9a6
2 parents 89e9b7f + b17b639
commit 575e9a6
Show file tree

Hide file tree

Showing 180 changed files with 8,885 additions and 2,580 deletions.
diff --git a/NEWS b/NEWS
@@ -1,22 +1,55 @@
-midPoint 3.7 "Darwin"
+midPoint 3.8 "Watt"
 ----------------------------------
 
-Release 3.7 is a twenty third midPoint release code-named Darwin.
-The 3.7 release brings new deployment model and numerous gradual improvements.
-There are improvements of identity governance features, improvements of user
-interface and internal improvements.
+Release 3.8 is a twenty sixth midPoint release code-named Watt. 
+The 3.8 release brings major performance and scalability improvements. 
+There are also provisioning, security and user interface improvements.
 
-Release date: 18th December 2017
+Release date: 13th June 2018
 
-Changes with respect to version 3.6.1:
-    Stand-alone deployment based on Spring Boot
+Changes with respect to version 3.7:
     User interface improvements
-    Governance improvements
-    Expression, mapping and bulk action improvements
+        User-friendly policy selection
+        User-friendly entitlement association management
+        GUI support for more complex data in object extension (containers), improved GUI customization (experimental)
+        Simple GUI pages for cases (internal midPoint tickets) contributed by Exclamation Labs
+        Support for custom static web content in midpoint home directory
+        Support for experimental annotation
+        Ability to override experimental and deprecated annotations
+        Minor user experience improvements
+    Data model improvements
+        Full implementation of subType property
+        Properties locality, costCenter, preferredLanguage, locale, timezone, emailAddress and telephoneNumber moved up from UserType to FocusType.
+        Customizable PolyString normalization
     Security improvements
-    Task improvements
+        Password Policy: prohibited projection values
+        Negative item enumeration in authorizations (exceptItem)
+        Expression code requires just execution-phase authorizations, it does not need request-phase authorizations any more
+        Improved password metadata
+    Provisioning
+        Provisioning Propagation
+        Ad-hoc provisioning script execution
+        Improved error handling, especially criticality of ITSM errors
+        Provisioning dependencies may use filter in dependency specification
+    Performance and scalability improvements
+        Optimized database schema for better performance and scalability
+        Autoincrement field for audit record storage
+        Multi-node, partitioned and stateful tasks
+        Audit delta and operation result compression
+        Repository layer cache
     Miscellaneous improvements
+        Improved handling of function library updates
+        Minor mapping improvements
+        Basic data protection features (experimental)
+        Improved SMS gateway support (HTTP POST method)
+        Support for configuration variable in inbound mappings
+        Start scripts for ninja tool (ninja.sh, ninja.bat)
+        Improved documentation
+    Connectors
+        CSV connector supports script execution
+        Active Directory connector supports CredSSP version 5 and 6 (see CVE-2018-0886)
 
-Java 7 environment is no longer supported.
-XPath2 scripting is no longer supported.
-CSVFile Connector is no longer supported.
+Oracle database 11g is no longer supported. It is replaced by Oracle 12c database support.
+Support for PostgreSQL 9.4 and earlier is deprecated. PostgreSQL 8.4.x and earlier is no longer supported.
+MySQL 5.6 and earlier is no longer supported.
+Microsoft SQL 2008 and 2008 R2 are no longer supported. Microsoft SQL Server 2012 support is deprecated.
diff --git a/README b/README
@@ -1,4 +1,4 @@
-MidPoint 3.8 development branch
+MidPoint 3.9 development branch
 ------------------------------------
 
 General information:
@@ -26,6 +26,7 @@ The most important features of midPoint are:
    - Support for ConnId and OpenICF connectors
    - Provisioning consistency and error handling
    - Support for security auditing and reporting
+   - Data protection (experimental)
    - Workflow
    - Reporting
    - Notifications

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.8 development branch
+MidPoint 3.9 development branch
 ------------------------------------
 
 General information:
@@ -32,6 +32,7 @@ Other features:
 - Entitlements
 - Support for ConnId and OpenICF connectors
 - Provisioning consistency and error handling
+- Data protection (experimental)
 - Reporting
 - Notifications
 - Local Java APIs, Remote web service interface (SOAP), REST API

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.7
+https://wiki.evolveum.com/display/midPoint/Release+3.8
 
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.8-SNAPSHOT</version>
+        <version>3.9-SNAPSHOT</version>
     </parent>
     <pluginRepositories>
         <pluginRepository>
@@ -63,10 +63,10 @@
         <selenium.version>1.0.1</selenium.version>
         <slf4j.version>1.7.25</slf4j.version>
         <logback.version>1.2.3</logback.version>
-        <spring.boot.version>1.5.8.e1</spring.boot.version> <!-- can be replaced by a stock version;
+        <spring.boot.version>2.0.1.RELEASE</spring.boot.version> <!-- can be replaced by a stock version;
                 ideally after https://github.com/spring-projects/spring-boot/issues/11367 is resolved but it should be OK even before that -->
-        <spring.version>4.3.14.RELEASE</spring.version>
-        <spring.security.version>4.2.4.RELEASE</spring.security.version>
+        <spring.version>5.0.6.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>
         <xml.resolver.version>1.2</xml.resolver.version>
@@ -75,6 +75,7 @@
         <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>
         <jdbc.mariadb>1.5.5</jdbc.mariadb>
         <jdbc.mysql>6.0.6</jdbc.mysql>
         <wicket.version>7.10.0</wicket.version>
@@ -87,7 +88,7 @@
         <jasper.version>6.5.0</jasper.version>
         <derby.version>10.11.1.1</derby.version>
         <wro4j.version>1.8.0</wro4j.version>
-        <jackson.version>2.8.9</jackson.version>
+        <jackson.version>2.9.5</jackson.version>
         <snakeyaml.version>1.15</snakeyaml.version>
         <surefire.version>2.20.1</surefire.version>
         <reflections.version>0.9.11</reflections.version>
@@ -830,6 +831,11 @@
 				<artifactId>spring-aop</artifactId>
 				<version>${spring.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-jcl</artifactId>
+				<version>${spring.version}</version>
+			</dependency>
             <dependency>
                 <groupId>org.springframework.security</groupId>
                 <artifactId>spring-security-config</artifactId>
@@ -885,6 +891,11 @@
                 <artifactId>postgresql</artifactId>
                 <version>${jdbc.postgres}</version>
             </dependency>
+            <dependency>
+                <groupId>com.microsoft.sqlserver</groupId>
+                <artifactId>mssql-jdbc</artifactId>
+                <version>${jdbc.sqlserver}</version>
+            </dependency>
             <dependency>
                 <groupId>org.mariadb.jdbc</groupId>
                 <artifactId>mariadb-java-client</artifactId>
@@ -1470,13 +1481,9 @@
 					<!-- it's used for bamboo build to load jdbc libraries which can not 
 						be installed to public maven repository (MS SQL, ORACLE) -->
 					<additionalClasspathElements>
-						<additionalClasspathElement>/opt/jenkins_db_configs/mssqljdbc4.jar</additionalClasspathElement>
 						<additionalClasspathElement>/opt/jenkins_db_configs/ojdbc7.jar</additionalClasspathElement>
 						<!-- used running tests on windows machines -->
-                        <additionalClasspathElement>c:\midpoint\jdbc-drivers\sqljdbc42.jar</additionalClasspathElement>
                         <additionalClasspathElement>c:\midpoint\jdbc-drivers\ojdbc7.jar</additionalClasspathElement>
-						<additionalClasspathElement>c:\Program Files\Microsoft JDBC DRIVER
-							4.0 for SQL Server\sqljdbc_4.0\enu\sqljdbc4.jar</additionalClasspathElement>
 					</additionalClasspathElements>
 				</configuration>
 				<dependencies>

diff --git a/...tial-objects/020-system-configuration.xml → ...tial-objects/000-system-configuration.xml b/...tial-objects/020-system-configuration.xml → ...tial-objects/000-system-configuration.xml
@@ -49,6 +49,11 @@
             <level>WARN</level>
             <package>org.hibernate.engine.jdbc.batch.internal.AbstractBatchImpl</package>
         </classLogger>
+        <!-- Diesabled because of MID-4636 -->
+        <classLogger>
+            <level>OFF</level>
+            <package>org.hibernate.internal.ExceptionMapperStandardImpl</package>
+        </classLogger>
         <classLogger>
             <!-- disabled because of MID-1612, jasper library needs to be fixed -->
             <level>OFF</level>

diff --git a/config/initial-objects/030-role-superuser.xml b/config/initial-objects/030-role-superuser.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2017 Evolveum
+  ~ Copyright (c) 2010-2018 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,5 +21,5 @@
     <authorization>
         <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-3#all</action>
     </authorization>
-    <roleType>system</roleType>
+    <subtype>system</subtype>
 </role>
diff --git a/config/initial-objects/040-role-enduser.xml b/config/initial-objects/040-role-enduser.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2017 Evolveum
+  ~ Copyright (c) 2010-2018 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -221,5 +221,5 @@
     		</owner>
         </object>
     </authorization>
-    <roleType>system</roleType>
+    <subtype>system</subtype>
 </role>
diff --git a/config/initial-objects/041-role-approver.xml b/config/initial-objects/041-role-approver.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2017 Evolveum
+  ~ Copyright (c) 2017-2018 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -130,5 +130,5 @@
         <item>riskLevel</item>
         <item>serviceType</item>
     </authorization>
-    <roleType>system</roleType>
+    <subtype>system</subtype>
 </role>
diff --git a/config/initial-objects/042-role-reviewer.xml b/config/initial-objects/042-role-reviewer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2017 Evolveum
+  ~ Copyright (c) 2010-2018 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -100,5 +100,5 @@
         <item>riskLevel</item>
         <item>serviceType</item>
     </authorization>
-    <roleType>system</roleType>
+    <subtype>system</subtype>
 </role>
diff --git a/config/initial-objects/043-role-delegator.xml b/config/initial-objects/043-role-delegator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2016-2017 Evolveum
+  ~ Copyright (c) 2016-2018 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -83,4 +83,5 @@
     	<item>roleMembershipRef</item>
     	<item>delegatedRef</item>
     </authorization>
+    <subtype>system</subtype>
 </role>
diff --git a/config/initial-objects/200-lookup-languages.xml b/config/initial-objects/200-lookup-languages.xml
@@ -53,10 +53,18 @@
 		<key>fi</key>
 		<label>Suomi</label>
 	</row>
+	<row>
+		<key>fr</key>
+		<label>Français</label>
+	</row>
 	<row>
 		<key>hu</key>
 		<label>Magyar</label>
 	</row>
+	<row>
+		<key>it</key>
+		<label>Italiano</label>
+	</row>
 	<row>
 		<key>pl</key>
 		<label>Język polski</label>

diff --git a/config/initial-objects/210-lookup-locales.xml b/config/initial-objects/210-lookup-locales.xml
@@ -44,10 +44,18 @@
 		<key>fi</key>
 		<label>Suomi</label>
 	</row>
+	<row>
+		<key>fr</key>
+		<label>Français</label>
+	</row>
 	<row>
 		<key>hu</key>
 		<label>Magyar</label>
 	</row>
+	<row>
+		<key>it</key>
+		<label>Italiano</label>
+	</row>
 	<row>
 		<key>pl</key>
 		<label>Język polski</label>

diff --git a/config/initial-objects/240-lookup-state.xml b/config/initial-objects/240-lookup-state.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2017 Evolveum, AMI Praha
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<lookupTable oid="00000000-0000-0000-0000-000000000240"
+             xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+
+    <name>States</name>
+
+    <row>
+        <key>open</key>
+        <label>Open</label>
+    </row>
+    <row>
+        <key>closed</key>
+        <label>Closed</label>
+    </row>
+
+</lookupTable>