Merge branch 'master' into bugfixing

Evolveum · Oct 17, 2023 · 513ade0 · 513ade0
2 parents 2dc55b2 + 65f7ca7
commit 513ade0
Show file tree

Hide file tree

Showing 94 changed files with 844 additions and 376 deletions.
diff --git a/INSTALL b/INSTALL
@@ -7,7 +7,7 @@ https://docs.evolveum.com/midpoint/install/source/
 
 1. Prerequisites:
 
-    1. Java (JDK) 11 or 17
+    1. Java (JDK) 17 or 21
     2. Apache Maven 3
     3. midPoint source code retrieved via Git
 

diff --git a/NEWS b/NEWS
@@ -1,12 +1,12 @@
-MidPoint 4.7 "Johnson"
+MidPoint 4.8 "Curie"
 ----------------------
 
-Release 4.7 is a forty-fifth midPoint release code-named Johnson.
-The 4.7 release brings simulation and preview features, object marks and improvements to identity governance reporting, password reset and user experience.
+Release 4.8 is a fifty-first midPoint release code-named Curie.
+The 4.8 release brings streamlined upgrade process, role mining, security, stability and miscellaneous improvements.
 
-Release date: 14th April 2023
-Release type: Feature release
-End of support: 14th April 2024
+Release date: 17th October 2023
+Release type: Long-term support release (LTS)
+End of support: 17th October 2028
 
 Please see the release notes for detailed list of changes:
-https://docs.evolveum.com/midpoint/release/4.7/
+https://docs.evolveum.com/midpoint/release/4.8/
diff --git a/README b/README
@@ -1,4 +1,4 @@
-MidPoint 4.8 Development Branch
+MidPoint 4.9 Development Branch
 -------------------------------
 
 General information:

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-MidPoint 4.8 Development Branch
+MidPoint 4.9 Development Branch
 -------------------------------
 
 General information:

diff --git a/config/initial-objects/archetype/024-archetype-operation-request.xml b/config/initial-objects/archetype/024-archetype-operation-request.xml
@@ -26,7 +26,12 @@
                 <panel id="3">
                     <identifier>childCases</identifier>
                     <display>
-                        <label>Child cases</label>
+                        <label>
+                            <orig>Child cases</orig>
+                            <translation>
+                                <key>ChildCases.panel.title</key>
+                            </translation>
+                        </label>
                         <icon>
                             <cssClass>fa fa-circle-o</cssClass>
                         </icon>
@@ -37,7 +42,12 @@
                 <panel id="4">
                     <identifier>operationRequestCase</identifier>
                     <display>
-                        <label>Operation request</label>
+                        <label>
+                            <orig>Operation request</orig>
+                            <translation>
+                                <key>OperationRequest.panel.title</key>
+                            </translation>
+                        </label>
                         <icon>
                             <cssClass>fa fa-circle-o</cssClass>
                         </icon>

diff --git a/config/initial-objects/archetype/025-archetype-approval-case.xml b/config/initial-objects/archetype/025-archetype-approval-case.xml
@@ -26,7 +26,12 @@
                 <panel id="3">
                     <identifier>caseWorkItems</identifier>
                     <display>
-                        <label>Workitems</label>
+                        <label>
+                            <orig>Workitems</orig>
+                            <translation>
+                                <key>Workitems.panel.title</key>
+                            </translation>
+                        </label>
                         <icon>
                             <cssClass>fa fa-circle-o</cssClass>
                         </icon>
@@ -37,7 +42,12 @@
                 <panel id="4">
                     <identifier>approvalCase</identifier>
                     <display>
-                        <label>Approvals</label>
+                        <label>
+                            <orig>Approvals</orig>
+                            <translation>
+                                <key>Approvals.case.panel</key>
+                            </translation>
+                        </label>
                         <icon>
                             <cssClass>fa fa-circle-o</cssClass>
                         </icon>

diff --git a/config/initial-objects/archetype/029-archetype-application.xml b/config/initial-objects/archetype/029-archetype-application.xml
@@ -17,7 +17,12 @@
     <archetypePolicy>
         <display>
             <label>Application</label>
-            <pluralLabel>Applications</pluralLabel>
+            <pluralLabel>
+                <orig>Applications</orig>
+                <translation>
+                    <key>Applications.title</key>
+                </translation>
+            </pluralLabel>
             <icon>
                 <cssClass>fa fa-cloud</cssClass>
                 <color>blue</color>

diff --git a/config/initial-objects/archetype/703-archetype-resource-template.xml b/config/initial-objects/archetype/703-archetype-resource-template.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (C) 2010-2023 Evolveum and contributors
+  ~
+  ~ This work is dual-licensed under the Apache License 2.0
+  ~ and European Union Public License. See LICENSE file for details.
+  -->
+<archetype oid="00000000-0000-0000-0000-000000000703"
+        xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+        xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
+    <name>Resource template</name>
+    <description>
+        Archetype for resource templates.
+    </description>
+    <archetypePolicy>
+        <display>
+            <label>
+                <t:orig>Resource template</t:orig>
+                <t:translation>
+                    <t:key>ResourceType.template.title</t:key>
+                </t:translation>
+            </label>
+            <pluralLabel>
+                <t:orig>Resource templates</t:orig>
+                <t:translation>
+                    <t:key>ResourceType.templates.title</t:key>
+                </t:translation>
+            </pluralLabel>
+            <icon>
+                <cssClass>fa fa-file-alt</cssClass>
+            </icon>
+        </display>
+        <adminGuiConfiguration>
+            <objectDetails>
+                <panel id="1">
+                    <identifier>resourceAccounts</identifier>
+                    <visibility>hidden</visibility>
+                </panel>
+                <panel id="2">
+                    <identifier>resourceEntitlements</identifier>
+                    <visibility>hidden</visibility>
+                </panel>
+                <panel id="3">
+                    <identifier>resourceGenerics</identifier>
+                    <visibility>hidden</visibility>
+                </panel>
+                <panel id="4">
+                    <identifier>resourceUncategorized</identifier>
+                    <visibility>hidden</visibility>
+                </panel>
+            </objectDetails>
+        </adminGuiConfiguration>
+    </archetypePolicy>
+    <assignment id="5">
+        <identifier>holderType</identifier>
+        <assignmentRelation id="6">
+            <holderType>ResourceType</holderType>
+        </assignmentRelation>
+    </assignment>
+</archetype>
diff --git a/config/initial-objects/object-collection/340-object-collection-resource-templates.xml b/config/initial-objects/object-collection/340-object-collection-resource-templates.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2010-2019 Evolveum and contributors
+  ~
+  ~ This work is dual-licensed under the Apache License 2.0
+  ~ and European Union Public License. See LICENSE file for details.
+  -->
+
+<objectCollection xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+        xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
+        oid="00000000-0000-0000-0001-000000000340">
+    <name>All resource templates</name>
+    <type>ResourceType</type>
+    <filter>
+        <q:text>archetypeRef matches (oid = "00000000-0000-0000-0000-000000000703")
+            or (template = true or abstract = true)
+        </q:text>
+    </filter>
+</objectCollection>
diff --git a/config/initial-objects/role/041-role-approver.xml b/config/initial-objects/role/041-role-approver.xml
@@ -6,8 +6,7 @@
   ~ and European Union Public License. See LICENSE file for details.
   -->
 <role oid="00000000-0000-0000-0000-00000000000a"
-      xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-      xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3">
+      xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
     <name>Approver</name>
     <description>Role authorizing users to make approval decisions on work items.</description>
     <assignment id="1">
@@ -29,23 +28,23 @@
         <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-ui-3#service</action>
     </authorization>
     <authorization id="3">
-        <name>workitems-delegate</name>
+        <name>own-workitems-read-complete-delegate</name>
         <description>
-            Allow delegation of own work items.
-        </description>
-        <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-model-3#delegateOwnWorkItems</action>
-    </authorization>
-    <!-- TODO:
-    <authorization>
-        <name>workitems-read</name>
-        <description>
-            ...
+            Allows reading, completion, and delegation of own work items.
         </description>
         <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-model-3#read</action>
+        <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-model-3#completeWorkItem</action>
+        <action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-model-3#delegateWorkItem</action>
         <object>
-            <type>WorkItemType</type>
+            <parent>
+                <type>CaseType</type>
+                <path>workItem</path>
+            </parent>
+            <assignee>
+                <special>self</special>
+            </assignee>
         </object>
-    </authorization> -->
+    </authorization>
     <authorization id="4">
         <name>cases-read</name>
         <description>
@@ -57,8 +56,17 @@
         <object id="9">
             <type>CaseType</type>
         </object>
-        <item>requesterRef</item>
+        <item>name</item>
+        <item>archetypeRef</item>
+        <item>metadata</item>
+        <item>parentRef</item>
+        <item>requestorRef</item>
+        <item>objectRef</item>
+        <item>targetRef</item>
+        <item>state</item>
+        <item>stageNumber</item>
         <item>approvalContext</item>
+        <item>modelContext</item>
     </authorization>
     <authorization id="5">
         <name>users-read</name>

diff --git a/config/initial-objects/system-configuration/000-system-configuration.xml b/config/initial-objects/system-configuration/000-system-configuration.xml
@@ -381,8 +381,8 @@
                     </target>
                 </action>
             </widget>
-           <widget id="29">
-               <identifier>listResourcesWidget</identifier>
+            <widget id="29">
+                <identifier>listResourcesWidget</identifier>
                 <display>
                     <label>
                         <orig>List resources</orig>
@@ -398,7 +398,7 @@
                 <panelType>linkWidget</panelType>
                 <action id="38">
                     <identifier>list-resources-widget-action</identifier>
-                   <target>
+                    <target>
                         <targetUrl>/admin/resources</targetUrl>
                     </target>
                 </action>
@@ -908,14 +908,45 @@
                     </searchItems>
                 </searchBoxConfiguration>
             </objectCollectionView>
+            <objectCollectionView>
+                <identifier>resource-templates</identifier>
+                <display>
+                    <label>
+                        <orig>Resource templates</orig>
+                        <translation>
+                            <key>ResourceType.templates.title</key>
+                        </translation>
+                    </label>
+                    <pluralLabel>
+                        <orig>All resource templates</orig>
+                        <translation>
+                            <key>ResourceType.template.all.title</key>
+                        </translation>
+                    </pluralLabel>
+                    <singularLabel>Resource template</singularLabel>
+                    <icon>
+                        <cssClass>fa fa-file-alt</cssClass>
+                    </icon>
+                </display>
+                <type>ResourceType</type>
+                <collection>
+                    <collectionRef oid="00000000-0000-0000-0001-000000000340" relation="org:default" type="c:ObjectCollectionType">
+                    </collectionRef>
+                </collection>
+            </objectCollectionView>
         </objectCollectionViews>
         <objectDetails>
             <objectDetailsPage id="83">
                 <type>c:TaskType</type>
                 <panel id="85">
                     <identifier>advanced-options-panel</identifier>
                     <display>
-                        <label>Advanced options</label>
+                        <label>
+                            <orig>Advanced options</orig>
+                            <translation>
+                                <key>TaskType.advancedOptions</key>
+                            </translation>
+                        </label>
                     </display>
                     <panelType>formPanel</panelType>
                     <container id="87">
@@ -941,7 +972,12 @@
                 <panel id="86">
                     <identifier>operational-attributes-panel</identifier>
                     <display>
-                        <label>Operational attributes</label>
+                        <label>
+                            <orig>Operational attributes</orig>
+                            <translation>
+                                <key>TaskType.operationalAttributes</key>
+                            </translation>
+                        </label>
                     </display>
                     <panelType>formPanel</panelType>
                     <container id="92">
@@ -1040,6 +1076,7 @@
                     <display>
                         <label>Application.panel.applications</label>
                     </display>
+                    <applicableForOperation>modify</applicableForOperation>
                     <panelType>roleMemberships</panelType>
                     <listView>
                         <identifier>applications</identifier>

diff --git a/custom/pom.xml b/custom/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <artifactId>midpoint</artifactId>
         <groupId>com.evolveum.midpoint</groupId>
-        <version>4.8-SNAPSHOT</version>
+        <version>4.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>custom</artifactId>

diff --git a/dist/javadoc/pom.xml b/dist/javadoc/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <artifactId>dist</artifactId>
         <groupId>com.evolveum.midpoint</groupId>
-        <version>4.8-SNAPSHOT</version>
+        <version>4.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>javadoc</artifactId>

diff --git a/dist/midpoint-api/pom.xml b/dist/midpoint-api/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <artifactId>dist</artifactId>
         <groupId>com.evolveum.midpoint</groupId>
-        <version>4.8-SNAPSHOT</version>
+        <version>4.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>midpoint-api</artifactId>

diff --git a/dist/pom.xml b/dist/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <artifactId>midpoint</artifactId>
         <groupId>com.evolveum.midpoint</groupId>
-        <version>4.8-SNAPSHOT</version>
+        <version>4.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>dist</artifactId>