Merge branch 'post-3.8-fixes' into feature/certification-reiteration

Evolveum · Jun 12, 2018 · 8e8fdfd · 8e8fdfd
2 parents 28a0bf5 + c92667d
commit 8e8fdfd
Show file tree

Hide file tree

Showing 402 changed files with 38,766 additions and 17,471 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -74,7 +74,7 @@
         <cron4j.version>2.2.3</cron4j.version>
         <hibernate.version>5.2.12.Final</hibernate.version>
         <h2.version>1.4.193</h2.version>
-        <jdbc.postgres>9.4.1212.jre7</jdbc.postgres>
+        <jdbc.postgres>42.2.2</jdbc.postgres>
         <jdbc.mariadb>1.5.5</jdbc.mariadb>
         <jdbc.mysql>6.0.6</jdbc.mysql>
         <wicket.version>7.10.0</wicket.version>
@@ -1434,6 +1434,10 @@
 									<name>suitename</name>
 									<value>Integration</value>
 								</property>
+								<property>
+									<name>usedefaultlisteners</name>
+									<value>false</value> <!-- do not generate HTML to make the runs faster -->
+								</property>
 							</properties>
 						</configuration>
 					</execution>
@@ -1466,9 +1470,11 @@
 					<!-- 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/Bamboo_db_configs/mssqljdbc4.jar</additionalClasspathElement>
-						<additionalClasspathElement>/opt/Bamboo_db_configs/ojdbc6.jar</additionalClasspathElement>
+						<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>

diff --git a/config/sql/_all/h2-3.8-all.sql b/config/sql/_all/h2-3.8-all.sql
@@ -385,7 +385,7 @@ CREATE TABLE m_object_ext_string (
 );
 CREATE TABLE m_object_subtype (
   object_oid VARCHAR(36) NOT NULL,
-  subType    VARCHAR(255)
+  subtype    VARCHAR(255)
 );
 CREATE TABLE m_object_text_info (
   owner_oid VARCHAR(36)  NOT NULL,
@@ -777,16 +777,24 @@ CREATE INDEX iAExtensionString
   ON m_assignment_ext_string (stringValue);
 CREATE INDEX iAssignmentReferenceTargetOid
   ON m_assignment_reference (targetOid);
+CREATE INDEX iAuditDeltaRecordId
+  ON m_audit_delta (record_id);
 CREATE INDEX iTimestampValue
   ON m_audit_event (timestampValue);
 CREATE INDEX iChangedItemPath
   ON m_audit_item (changedItemPath);
+CREATE INDEX iAuditItemRecordId
+  ON m_audit_item (record_id);
 CREATE INDEX iAuditPropValRecordId
   ON m_audit_prop_value (record_id);
 CREATE INDEX iAuditRefValRecordId
   ON m_audit_ref_value (record_id);
 CREATE INDEX iCaseWorkItemRefTargetOid
   ON m_case_wi_reference (targetOid);
+
+ALTER TABLE m_ext_item
+  ADD CONSTRAINT iExtItemDefinition UNIQUE (itemName, itemType, kind);
+
 CREATE INDEX iObjectNameOrig
   ON m_object (name_orig);
 CREATE INDEX iObjectNameNorm

diff --git a/config/sql/_all/mysql-3.8-all-utf8mb4.sql b/config/sql/_all/mysql-3.8-all-utf8mb4.sql
@@ -482,7 +482,7 @@ CREATE TABLE m_object_ext_string (
   ENGINE = InnoDB;
 CREATE TABLE m_object_subtype (
   object_oid VARCHAR(36)  CHARSET utf8 COLLATE utf8_bin NOT NULL,
-  subType    VARCHAR(255)
+  subtype    VARCHAR(255)
 )
   DEFAULT CHARACTER SET utf8mb4
   COLLATE utf8mb4_bin
@@ -985,16 +985,23 @@ CREATE INDEX iAExtensionString
   ON m_assignment_ext_string (stringValue);
 CREATE INDEX iAssignmentReferenceTargetOid
   ON m_assignment_reference (targetOid);
+CREATE INDEX iAuditDeltaRecordId
+  ON m_audit_delta (record_id);
 CREATE INDEX iTimestampValue
   ON m_audit_event (timestampValue);
 CREATE INDEX iChangedItemPath
   ON m_audit_item (changedItemPath);
+CREATE INDEX iAuditItemRecordId
+  ON m_audit_item (record_id);
 CREATE INDEX iAuditPropValRecordId
   ON m_audit_prop_value (record_id);
 CREATE INDEX iAuditRefValRecordId
   ON m_audit_ref_value (record_id);
 CREATE INDEX iCaseWorkItemRefTargetOid
   ON m_case_wi_reference (targetOid);
+
+ALTER TABLE m_ext_item
+  ADD CONSTRAINT iExtItemDefinition UNIQUE (itemName, itemType, kind);
 CREATE INDEX iObjectNameOrig
   ON m_object (name_orig);
 CREATE INDEX iObjectNameNorm

diff --git a/config/sql/_all/mysql-3.8-all.sql b/config/sql/_all/mysql-3.8-all.sql
@@ -482,7 +482,7 @@ CREATE TABLE m_object_ext_string (
   ENGINE = InnoDB;
 CREATE TABLE m_object_subtype (
   object_oid VARCHAR(36) NOT NULL,
-  subType    VARCHAR(255)
+  subtype    VARCHAR(255)
 )
   DEFAULT CHARACTER SET utf8
   COLLATE utf8_bin
@@ -985,16 +985,23 @@ CREATE INDEX iAExtensionString
   ON m_assignment_ext_string (stringValue);
 CREATE INDEX iAssignmentReferenceTargetOid
   ON m_assignment_reference (targetOid);
+CREATE INDEX iAuditDeltaRecordId
+  ON m_audit_delta (record_id);
 CREATE INDEX iTimestampValue
   ON m_audit_event (timestampValue);
 CREATE INDEX iChangedItemPath
   ON m_audit_item (changedItemPath);
+CREATE INDEX iAuditItemRecordId
+  ON m_audit_item (record_id);
 CREATE INDEX iAuditPropValRecordId
   ON m_audit_prop_value (record_id);
 CREATE INDEX iAuditRefValRecordId
   ON m_audit_ref_value (record_id);
 CREATE INDEX iCaseWorkItemRefTargetOid
   ON m_case_wi_reference (targetOid);
+
+ALTER TABLE m_ext_item
+  ADD CONSTRAINT iExtItemDefinition UNIQUE (itemName, itemType, kind);
 CREATE INDEX iObjectNameOrig
   ON m_object (name_orig);
 CREATE INDEX iObjectNameNorm