Merge remote-tracking branch 'origin/master'

Evolveum · Nov 11, 2019 · 6044b24 · 6044b24
2 parents 35812b1 + 9c90d72
commit 6044b24
Show file tree

Hide file tree

Showing 13 changed files with 366 additions and 355 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -1725,6 +1725,9 @@
                     <consoleOutput>true</consoleOutput>
                     <failsOnError>true</failsOnError>
                     <linkXRef>false</linkXRef>
+                    <includes>**/*.java</includes>
+                    <!-- Also need to add suffixes to checkstyle.xml -->
+                    <resourceIncludes>**/*.properties,**/*.xml,**/*.xsd,**/*.wsdl,**/*.json,**/*.yaml,**/*.yml</resourceIncludes>
                 </configuration>
                 <executions>
                     <execution>

diff --git a/build-tools/src/main/resources/midpoint-build/checkstyle-suppressions.xml b/build-tools/src/main/resources/midpoint-build/checkstyle-suppressions.xml
@@ -8,6 +8,10 @@
     <suppress files="[/\\]annotation_3[/\\]" checks="ConstantName"/>
     <suppress files="[/\\]query_3[/\\]" checks="ConstantName|AvoidNestedBlocks|NeedBraces"/>
     <suppress files="[/\\]types_3[/\\]" checks="ConstantName|AvoidNestedBlocks|NeedBraces"/>
+    <suppress files="[/\\]public[/\\]query-3.xsd$" checks="NewlineAtEndOfFile"/>
+    <suppress files="[/\\]public[/\\]types-3.xsd$" checks="NewlineAtEndOfFile"/>
+    <suppress files="[/\\]public[/\\]annotation-3.xsd$" checks="NewlineAtEndOfFile"/>
+    <suppress files="[/\\]test[/\\]foo.*-1.xsd$" checks="NewlineAtEndOfFile"/>
     <suppress files="[/\\]com[/\\]evolveum[/\\]midpoint[/\\]prism[/\\]delta[/\\]builder[/\\]" checks="TypeName"/>
     <suppress files="[/\\]com[/\\]evolveum[/\\]midpoint[/\\]prism[/\\]query[/\\]builder[/\\]" checks="TypeName"/>
     <suppress files="[/\\]com[/\\]evolveum[/\\]midpoint[/\\]prism[/\\]impl[/\\]query[/\\]builder[/\\]" checks="TypeName"/>

diff --git a/build-tools/src/main/resources/midpoint-build/checkstyle.xml b/build-tools/src/main/resources/midpoint-build/checkstyle.xml
@@ -10,6 +10,7 @@
     -->
     <property name="severity" value="error"/>
 
+    <!-- Also need to add suffixes to parent pom.xml in checkstyle plugin configuration -->
     <property name="fileExtensions" value="java, properties, xml, xsd, wsdl, json, yml, yaml"/>
 
     <!-- Excludes all 'module-info.java' files              -->

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -12465,15 +12465,15 @@
                                         focus then their outcome does not depend on their position in
                                         assignment/inducement hierarchy and these roles can be made idempotent.
                                     </p>
-								</p>
-							</xsd:documentation>
-							<xsd:appinfo>
-								<a:displayName>AbstractRoleType.idempotent</a:displayName>
-								<a:since>3.6</a:since>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element name="riskLevel" type="xsd:string" minOccurs="0">
+                                </p>
+                            </xsd:documentation>
+                            <xsd:appinfo>
+                                <a:displayName>AbstractRoleType.idempotent</a:displayName>
+                                <a:since>3.6</a:since>
+                            </xsd:appinfo>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="riskLevel" type="xsd:string" minOccurs="0">
                         <xsd:annotation>
                             <xsd:documentation>
                                 <p>

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
@@ -1526,6 +1526,9 @@
                     <xsd:documentation>
                         Value of the Content-ID header of MIME body part for this attachment.
                     </xsd:documentation>
+                    <xsd:appinfo>
+                        <a:since>4.1</a:since>
+                    </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>