Skip to content

Commit

Permalink
Merge branch 'master' into feature/boot-jar-support
Browse files Browse the repository at this point in the history
  • Loading branch information
virgo47 committed Oct 23, 2020
2 parents 3a6d6c6 + 4eb228b commit 4f280d8
Show file tree
Hide file tree
Showing 440 changed files with 10,274 additions and 4,070 deletions.
14 changes: 8 additions & 6 deletions NEWS
@@ -1,12 +1,14 @@
midPoint 4.1 "Pasteur"
midPoint 4.2 "Maxwell"
----------------------

Release 4.1 is a thirty-second midPoint release code-named Pasteur.
The 4.1 release brings major authentication improvements, user interface improvements, improved archetype functionality and a number of smaller improvements.
Release 4.2 is a thirty-third midPoint release code-named "Maxwell".
The 4.2 release brings new reporting mechanism, updates to auditing implementation,
continued improvement for authentication and handful of other interesting improvements.
Most importantly, midPoint 4.2 brings experimental updates to the very foundations of midPoint.

Release date: 9th April 2020
Release date: 23rd October 2020
Release type: Feature release
End of support: 9th April 2021
End of support: 23rd October 2021

Please see the release notes for detailed list of changes:
https://wiki.evolveum.com/display/midPoint/Release+4.1
https://wiki.evolveum.com/display/midPoint/Release+4.2
2 changes: 1 addition & 1 deletion README
@@ -1,4 +1,4 @@
MidPoint 4.2 Development Branch
MidPoint 4.3 Development Branch
-------------------------------

General information:
Expand Down
2 changes: 1 addition & 1 deletion README.md
@@ -1,4 +1,4 @@
MidPoint 4.2 Development Branch
MidPoint 4.3 Development Branch
-------------------------------

General information:
Expand Down
3 changes: 1 addition & 2 deletions RELEASE-NOTES
@@ -1,4 +1,3 @@
To see actual releases notes please go to:

https://wiki.evolveum.com/display/midPoint/Release+4.1

https://wiki.evolveum.com/display/midPoint/Release+4.2
25 changes: 23 additions & 2 deletions config/initial-objects/000-system-configuration.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2010-2019 Evolveum and contributors
~ Copyright (c) 2010-2020 Evolveum and contributors
~
~ This work is dual-licensed under the Apache License 2.0
~ and European Union Public License. See LICENSE file for details.
Expand All @@ -12,6 +12,7 @@
xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3"
xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
<name>SystemConfiguration</name>
<indestructible>true</indestructible>
<!-- <globalAccountSynchronizationSettings> -->
<!-- <assignmentPolicyEnforcement>relative</assignmentPolicyEnforcement> -->
<!-- </globalAccountSynchronizationSettings> -->
Expand All @@ -21,6 +22,12 @@
<level>ERROR</level>
<package>ro.isdc.wro.extensions.processor.css.Less4jProcessor</package>
</classLogger>
<classLogger>
<!-- disabled because INFO log during of creating
new authentication filter chain -->
<level>OFF</level>
<package>org.springframework.security.web.DefaultSecurityFilterChain</package>
</classLogger>
<classLogger>
<!-- disabled because of MID-744, helper insert messages on ERROR
level which should not be there (probably should be on TRACE) -->
Expand All @@ -42,7 +49,7 @@
<level>WARN</level>
<package>org.hibernate.engine.jdbc.batch.internal.AbstractBatchImpl</package>
</classLogger>
<!-- Diesabled because of MID-4636 -->
<!-- Disabled because of MID-4636 -->
<classLogger>
<level>OFF</level>
<package>org.hibernate.internal.ExceptionMapperStandardImpl</package>
Expand Down Expand Up @@ -402,6 +409,20 @@
<collectionRef oid="00000000-0000-0000-0000-000000000529" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>dashboard-reports-view</identifier>
<type>ReportType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000170" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>collection-reports-view</identifier>
<type>ReportType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000171" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
</objectCollectionViews>
<objectDetails>
<objectDetailsPage>
Expand Down
4 changes: 2 additions & 2 deletions config/initial-objects/030-role-superuser.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2010-2019 Evolveum and contributors
~ Copyright (c) 2010-2020 Evolveum and contributors
~
~ This work is dual-licensed under the Apache License 2.0
~ and European Union Public License. See LICENSE file for details.
Expand All @@ -9,11 +9,11 @@
xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
<name>Superuser</name>
<description>Role that gives user full authorization in MidPoint.</description>
<indestructible>true</indestructible>
<assignment>
<targetRef oid="00000000-0000-0000-0000-000000000320" type="ArchetypeType"/> <!-- System role -->
</assignment>
<authorization>
<action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-3#all</action>
</authorization>
<subtype>system</subtype>
</role>
1 change: 0 additions & 1 deletion config/initial-objects/040-role-enduser.xml
Expand Up @@ -256,5 +256,4 @@
</owner>
</object>
</authorization>
<subtype>system</subtype>
</role>
1 change: 0 additions & 1 deletion config/initial-objects/041-role-approver.xml
Expand Up @@ -124,5 +124,4 @@
<item>riskLevel</item>
<item>serviceType</item>
</authorization>
<subtype>system</subtype>
</role>
1 change: 0 additions & 1 deletion config/initial-objects/042-role-reviewer.xml
Expand Up @@ -94,5 +94,4 @@
<item>riskLevel</item>
<item>serviceType</item>
</authorization>
<subtype>system</subtype>
</role>
1 change: 0 additions & 1 deletion config/initial-objects/043-role-delegator.xml
Expand Up @@ -77,5 +77,4 @@
<item>roleMembershipRef</item>
<item>delegatedRef</item>
</authorization>
<subtype>system</subtype>
</role>
3 changes: 2 additions & 1 deletion config/initial-objects/050-user-administrator.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2010-2019 Evolveum and contributors
~ Copyright (c) 2010-2020 Evolveum and contributors
~
~ This work is dual-licensed under the Apache License 2.0
~ and European Union Public License. See LICENSE file for details.
Expand All @@ -10,6 +10,7 @@
xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
<name>administrator</name>
<indestructible>true</indestructible>
<fullName>midPoint Administrator</fullName>
<givenName>midPoint</givenName>
<familyName>Administrator</familyName>
Expand Down
40 changes: 40 additions & 0 deletions config/initial-objects/060-archetype-report-dashboard.xml
@@ -0,0 +1,40 @@
<!--
~ Copyright (c) 2020 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-000000000170"
xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3">
<name>Dashboard report</name>
<archetypePolicy>
<display>
<label>Dashboard report</label>
<pluralLabel>
<orig>Dashboard reports</orig>
<translation>
<key>DashboardReports.title</key>
</translation>
</pluralLabel>
<icon>
<cssClass>fa fa-dashboard</cssClass>
<color>#001F3F</color>
</icon>
</display>
<itemConstraint>
<path>objectCollection</path>
<visibility>hidden</visibility>
</itemConstraint>
<itemConstraint>
<path>jasper</path>
<visibility>hidden</visibility>
</itemConstraint>
</archetypePolicy>
<assignment>
<assignmentRelation>
<holderType>ReportType</holderType>
</assignmentRelation>
</assignment>
</archetype>
40 changes: 40 additions & 0 deletions config/initial-objects/061-archetype-report-collection.xml
@@ -0,0 +1,40 @@
<!--
~ Copyright (c) 2020 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-000000000171"
xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3">
<name>Collection report</name>
<archetypePolicy>
<display>
<label>Collection report</label>
<pluralLabel>
<orig>Collection reports</orig>
<translation>
<key>CollectionReports.title</key>
</translation>
</pluralLabel>
<icon>
<cssClass>fa fa-filter</cssClass>
<color>#001F3F</color>
</icon>
</display>
<itemConstraint>
<path>dashboard</path>
<visibility>hidden</visibility>
</itemConstraint>
<itemConstraint>
<path>jasper</path>
<visibility>hidden</visibility>
</itemConstraint>
</archetypePolicy>
<assignment>
<assignmentRelation>
<holderType>ReportType</holderType>
</assignmentRelation>
</assignment>
</archetype>
21 changes: 21 additions & 0 deletions config/initial-objects/080-report-audit.xml
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2010-2020 Evolveum and contributors
~
~ This work is dual-licensed under the Apache License 2.0
~ and European Union Public License. See LICENSE file for details.
-->

<report xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
oid="00000000-0000-0000-0000-000000000080">
<name>All audit records report</name>
<description>Report made from all audit records.</description>
<assignment>
<targetRef oid="00000000-0000-0000-0000-000000000171" type="ArchetypeType" />
</assignment>
<objectCollection>
<collection>
<collectionRef oid="00000000-0000-0000-0001-000000000284" type="ObjectCollectionType"/>
</collection>
</objectCollection>
</report>

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions config/initial-objects/100-report-reconciliation.xml

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions config/initial-objects/110-report-user-list.xml

Large diffs are not rendered by default.

0 comments on commit 4f280d8

Please sign in to comment.