Merge remote-tracking branch 'origin/master'

Evolveum · Mar 25, 2020 · 9bfa736 · 9bfa736
2 parents 8acc8a6 + 84c977d
commit 9bfa736
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 34 deletions.
diff --git a/infra/schema-pure-jaxb/pom.xml b/infra/schema-pure-jaxb/pom.xml
@@ -111,22 +111,7 @@
                             <catalog>${basedir}/src/compile/resources/catalog.xml</catalog>
                             <laxSchemaValidation>true</laxSchemaValidation>
                             <verbose>false</verbose>
-                            <xjcSourceExcludeFilters>
-                                <!-- This is a workaround for xjc bug described here: https://java.net/projects/jaxb/lists/users/archive/2005-12/message/33 -->
-                                <!-- It presents itself on Windows machines. -->
-                                <!-- We simply exclude any imported files. So, after a new imported file is present, please add it into this list. -->
-                                <filter implementation="org.codehaus.mojo.jaxb2.shared.filters.pattern.PatternFileFilter">
-                                    <patterns>
-                                        <pattern>annotation-3\.xsd</pattern>
-                                        <pattern>query-3\.xsd</pattern>
-                                        <pattern>\\types-3\.xsd</pattern>      <!-- to match types but not api-types -->
-                                        <pattern>/types-3\.xsd</pattern>       <!-- to match types but not api-types -->
-                                        <pattern>common-.*\.xsd</pattern>
-                                        <pattern>scripting-3\.xsd</pattern>
-                                        <pattern>resource-schema-3\.xsd</pattern>
-                                    </patterns>
-                                </filter>
-                            </xjcSourceExcludeFilters>
+                            <!-- JDK 11 does not need exclusions of imported files like JDK 8 -->
                         </configuration>
                         <dependencies>
                             <dependency>
@@ -177,17 +162,17 @@
                             <laxSchemaValidation>true</laxSchemaValidation>
                             <verbose>false</verbose>
                             <xjcSourceExcludeFilters>
-                                <!-- This is a workaround for xjc bug described here: https://java.net/projects/jaxb/lists/users/archive/2005-12/message/33 -->
-                                <!-- It presents itself on Windows machines. -->
+                                <!-- These exclusions are a workaround for xjc bug that occurs only on Windows machines. -->
                                 <!-- We simply exclude any imported files. So, after a new imported file is present, please add it into this list. -->
                                 <filter implementation="org.codehaus.mojo.jaxb2.shared.filters.pattern.PatternFileFilter">
                                     <patterns>
-                                        <pattern>annotation-3\.xsd</pattern>
+                                        <pattern>public.annotation-3\.xsd</pattern> <!-- only from prism, not resource annotation -->
                                         <pattern>query-3\.xsd</pattern>
                                         <pattern>\\types-3\.xsd</pattern>      <!-- to match types but not api-types -->
                                         <pattern>/types-3\.xsd</pattern>       <!-- to match types but not api-types -->
                                         <pattern>common-.*\.xsd</pattern>
-                                        <pattern>scripting-3\.xsd</pattern>
+                                        <pattern>/scripting/.*</pattern>
+                                        <pattern>\\scripting\\.*</pattern>
                                         <pattern>resource-schema-3\.xsd</pattern>
                                     </patterns>
                                 </filter>

diff --git a/infra/schema/src/main/resources/xml/ns/public/model/scripting/extension-3.xsd b/infra/schema/src/main/resources/xml/ns/public/model/scripting/extension-3.xsd
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   ~ Copyright (c) 2010-2014 Evolveum and contributors
   ~
@@ -8,23 +7,17 @@
   -->
 
 <xsd:schema targetNamespace="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3"
-            xmlns:tns="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3"
-            xmlns:a="http://prism.evolveum.com/xml/ns/public/annotation-3"
-            xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-            xmlns:s="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3"
-            xmlns:apit="http://midpoint.evolveum.com/xml/ns/public/common/api-types-3"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            elementFormDefault="qualified">
+        xmlns:a="http://prism.evolveum.com/xml/ns/public/annotation-3"
+        xmlns:s="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        elementFormDefault="qualified">
 
     <xsd:annotation>
         <xsd:documentation>
             Scripting task extensions.
         </xsd:documentation>
     </xsd:annotation>
 
-    <!--<xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/common/common-3" -->
-                <!--schemaLocation="http://midpoint.evolveum.com/xml/ns/public/common/common-3"/>-->
-
     <xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/model/scripting-3"
                 schemaLocation="http://midpoint.evolveum.com/xml/ns/public/model/scripting/scripting-3"/>
 
@@ -38,7 +31,4 @@
             </xsd:appinfo>
         </xsd:annotation>
     </xsd:element>
-
 </xsd:schema>
-
-