Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Sep 26, 2021 · c7145fe · c7145fe
2 parents c5613cd + 3050008
commit c7145fe
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 23 deletions.
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -270,7 +270,7 @@
         </dependency>
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
+            <artifactId>ojdbc11</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -901,7 +901,7 @@
                         </exclude>
                         <exclude>
                             <groupId>com.oracle.database.jdbc</groupId>
-                            <artifactId>ojdbc8</artifactId>
+                            <artifactId>ojdbc11</artifactId>
                         </exclude>
                     </excludes>
                     -->
@@ -943,7 +943,7 @@
                                 <!-- note how the archive is treated as a normal file directory -->
                                 <directory>${project.build.directory}/midpoint-executable.war/WEB-INF/lib-provided</directory>
                                 <includes>
-                                    <include>ojdbc8-*.jar</include>
+                                    <include>ojdbc11-*.jar</include>
                                     <include>ucp-*.jar</include>
                                     <include>oraclepki-*.jar</include>
                                     <include>osdt_cert-*.jar</include>

diff --git a/gui/midpoint-jar/pom.xml b/gui/midpoint-jar/pom.xml
@@ -78,7 +78,7 @@
         </dependency>
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
+            <artifactId>ojdbc11</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -122,7 +122,7 @@
                         </exclude>
                         <exclude>
                             <groupId>com.oracle.database.jdbc</groupId>
-                            <artifactId>ojdbc8</artifactId>
+                            <artifactId>ojdbc11</artifactId>
                         </exclude>
                     </excludes>
                     -->
@@ -152,7 +152,7 @@
                                 <directory>${project.build.directory}/midpoint.jar/BOOT-INF/lib</directory>
                                 <includes>
                                     <include>admin-gui-*.war</include>
-                                    <include>ojdbc8-*.jar</include>
+                                    <include>ojdbc11-*.jar</include>
                                     <include>ucp-*.jar</include>
                                     <include>oraclepki-*.jar</include>
                                     <include>osdt_cert-*.jar</include>

diff --git a/pom.xml b/pom.xml
@@ -211,7 +211,7 @@
         <wicket.chartjs.version>0.1</wicket.chartjs.version>
         <!-- Groovy 3.0.8 is also default for Spring Boot 2.5.0 -->
         <groovy.version>3.0.8</groovy.version>
-        <xmlsec.version>2.2.2</xmlsec.version>
+        <xmlsec.version>2.2.3</xmlsec.version>
         <!-- NOTE: also update the version number in TestConnectorManager -->
         <connid.version>1.5.0.18</connid.version>
         <derby.version>10.15.2.0</derby.version>

diff --git a/repo/repo-sql-impl-test/pom.xml b/repo/repo-sql-impl-test/pom.xml
@@ -146,7 +146,7 @@
         </dependency>
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
+            <artifactId>ojdbc11</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>

diff --git a/testing/rest/src/test/resources/repo/json/policy-validate-implicit-multi-conflict.json b/testing/rest/src/test/resources/repo/json/policy-validate-implicit-multi-conflict.json
@@ -4,7 +4,7 @@
     "policyItemDefinition": [
       {
         "target": {
-          "path": "employeeType"
+          "path": "subtype"
         },
         "valuePolicyRef": {
           "type": "http://midpoint.evolveum.com/xml/ns/public/common/common-3#ValuePolicyType",

diff --git a/testing/rest/src/test/resources/repo/json/user-darthadder.json b/testing/rest/src/test/resources/repo/json/user-darthadder.json
@@ -23,7 +23,7 @@
     "activation" : {
       "administrativeStatus" : "enabled"
     },
-    "employeeType" : ["user", "123user", "employeE"],
+    "subtype" : ["user", "123user", "employeE"],
     "employeeNumber" : "123456",
     "organization" : ["Org1", "Org2", "Org3"],
     "fullName" : "Darth Adder",

diff --git a/testing/rest/src/test/resources/repo/resource-opendj.xml b/testing/rest/src/test/resources/repo/resource-opendj.xml
@@ -441,13 +441,13 @@ This is now the only account type that midPoint can work with. -->
 
                 </attribute>
                 <attribute>
-                <ref>ri:employeeType</ref>
+                <ref>ri:subtype</ref>
                 <displayName>Employee Type</displayName>
 
                 <outbound>
                 <strength>weak</strength>
                     <source>
-                        <path>$user/employeeType</path>
+                        <path>$user/subtype</path>
                     </source>
                 </outbound>
             </attribute>

diff --git a/testing/rest/src/test/resources/repo/role-enduser.xml b/testing/rest/src/test/resources/repo/role-enduser.xml
@@ -165,5 +165,5 @@
         </object>
         <item>approvalContext</item>
     </authorization>
-    <roleType>system</roleType>
+    <subtype>system</subtype>
 </role>
diff --git a/testing/rest/src/test/resources/repo/role-proxy.xml b/testing/rest/src/test/resources/repo/role-proxy.xml
@@ -16,7 +16,7 @@
             <type>UserType</type>
             <filter>
                 <q:equal>
-                    <q:path>employeeType</q:path>
+                    <q:path>subtype</q:path>
                     <q:value>enduser</q:value>
                 </q:equal>
             </filter>

diff --git a/testing/rest/src/test/resources/repo/user-egoist.xml b/testing/rest/src/test/resources/repo/user-egoist.xml
@@ -21,7 +21,7 @@
     <c:fullName>Self Seeker</c:fullName>
     <c:givenName>Self</c:givenName>
     <c:familyName>Seeker</c:familyName>
-    <c:employeeType>enduser</c:employeeType>
+    <c:subtype>enduser</c:subtype>
     <c:credentials xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
         <c:password>
             <c:value xmlns:enc="http://www.w3.org/2001/04/xmlenc#" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">

diff --git a/testing/rest/src/test/resources/repo/user-head.xml b/testing/rest/src/test/resources/repo/user-head.xml
@@ -18,7 +18,7 @@
     <c:fullName>Head of Heads</c:fullName>
     <c:givenName>Head</c:givenName>
     <c:familyName>of Heads</c:familyName>
-    <c:employeeType>superuser</c:employeeType>
+    <c:subtype>superuser</c:subtype>
     <c:credentials xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
         <c:password>
             <c:value xmlns:enc="http://www.w3.org/2001/04/xmlenc#" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">

diff --git a/testing/rest/src/test/resources/repo/user-somebody.xml b/testing/rest/src/test/resources/repo/user-somebody.xml
@@ -21,7 +21,7 @@
     <c:fullName>Some Body</c:fullName>
     <c:givenName>Some</c:givenName>
     <c:familyName>body</c:familyName>
-    <c:employeeType>enduser</c:employeeType>
+    <c:subtype>enduser</c:subtype>
     <c:credentials xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
         <c:password>
             <c:value xmlns:enc="http://www.w3.org/2001/04/xmlenc#" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">

diff --git a/testing/rest/src/test/resources/repo/xml/policy-validate-implicit-multi-conflict.xml b/testing/rest/src/test/resources/repo/xml/policy-validate-implicit-multi-conflict.xml
@@ -14,7 +14,7 @@
           xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
     <policyItemDefinition>
         <target>
-            <path>employeeType</path>
+            <path>subtype</path>
         </target>
         <valuePolicyRef oid="00000000-0000-0000-1111-000000000003" type="c:ValuePolicyType"/>
     </policyItemDefinition>

diff --git a/testing/rest/src/test/resources/repo/xml/user-darthadder.xml b/testing/rest/src/test/resources/repo/xml/user-darthadder.xml
@@ -27,9 +27,9 @@
     <c:fullName>Darth Adder</c:fullName>
     <c:givenName>Darth</c:givenName>
     <c:familyName>Adder</c:familyName>
-    <c:employeeType>user</c:employeeType>
-    <c:employeeType>123user</c:employeeType>
-    <c:employeeType>employeE</c:employeeType>
+    <c:subtype>user</c:subtype>
+    <c:subtype>123user</c:subtype>
+    <c:subtype>employeE</c:subtype>
     <c:employeeNumber>123456</c:employeeNumber>
     <c:organization>Org1</c:organization>
     <c:organization>Org2</c:organization>

diff --git a/testing/rest/src/test/resources/repo/yaml/policy-validate-implicit-multi-conflict.yml b/testing/rest/src/test/resources/repo/yaml/policy-validate-implicit-multi-conflict.yml
@@ -2,7 +2,7 @@
 policyItemsDefinition:
   policyItemDefinition:
   - target:
-      path: "employeeType"
+      path: "subtype"
     valuePolicyRef:
       type: "http://midpoint.evolveum.com/xml/ns/public/common/common-3#ValuePolicyType"
       oid: "00000000-0000-0000-1111-000000000003"
diff --git a/testing/rest/src/test/resources/repo/yaml/user-darthadder.yml b/testing/rest/src/test/resources/repo/yaml/user-darthadder.yml
@@ -31,7 +31,7 @@ user:
   fullName: "Darth Adder"
   givenName: "Darth"
   familyName: "Adder"
-  employeeType :
+  subtype :
   - "user"
   - "123user"
   - "employeE"