You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2021/01/08 09:33:51 UTC
[jackrabbit-filevault] branch master updated: fix schema
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
The following commit(s) were added to refs/heads/master by this push:
new 925f820 fix schema
925f820 is described below
commit 925f820096e8568fe6c4558ca25fa0f050725f93
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Jan 8 10:33:38 2021 +0100
fix schema
update to latest JUnit4
---
parent/pom.xml | 2 +-
vault-validation/src/main/resources/filter.xsd | 12 ++++--------
.../validation/spi/impl/AdvancedFilterValidatorTest.java | 2 +-
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index e181597..5896ca9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -546,7 +546,7 @@ Bundle-Category: jackrabbit
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/vault-validation/src/main/resources/filter.xsd b/vault-validation/src/main/resources/filter.xsd
index f1d0d98..12d91ca 100644
--- a/vault-validation/src/main/resources/filter.xsd
+++ b/vault-validation/src/main/resources/filter.xsd
@@ -23,22 +23,18 @@
</xs:extension>
</xs:simpleContent>
</xs:complexType>
- <xs:attribute name="type">
- <xs:simpleType>
+ <xs:simpleType name="type">
<xs:restriction base="xs:string">
<xs:pattern value="(|cleanup)"/>
</xs:restriction>
</xs:simpleType>
- </xs:attribute>
- <xs:attribute name="mode">
- <xs:simpleType>
+ <xs:simpleType name="mode">
<xs:restriction base="xs:string">
<xs:enumeration value="replace"/>
<xs:enumeration value="merge"/>
<xs:enumeration value="update"/>
</xs:restriction>
</xs:simpleType>
- </xs:attribute>
<xs:element name="workspaceFilter">
<xs:complexType>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
@@ -49,8 +45,8 @@
<xs:element type="includeExcludeType" name="include"/>
</xs:choice>
<xs:attribute type="xs:string" name="root" use="required"/>
- <xs:attribute ref="type"/>
- <xs:attribute ref="mode"/>
+ <xs:attribute name="type" type="type"/>
+ <xs:attribute name="mode" type="mode"/>
</xs:complexType>
</xs:element>
</xs:sequence>
diff --git a/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorTest.java b/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorTest.java
index 6d2ff46..e7454db 100644
--- a/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorTest.java
+++ b/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorTest.java
@@ -384,7 +384,7 @@ public class AdvancedFilterValidatorTest {
new ValidationMessage(ValidationMessageSeverity.WARN,
"cvc-enumeration-valid: Value 'invalid' is not facet-valid with respect to enumeration '[replace, merge, update]'. It must be a value from the enumeration.", 19, 49, null),
new ValidationMessage(ValidationMessageSeverity.WARN,
- "cvc-attribute.3: The value 'invalid' of attribute 'mode' on element 'filter' is not valid with respect to its type, 'null'.", 19, 49, null), // unclear why type is 'null'
+ "cvc-attribute.3: The value 'invalid' of attribute 'mode' on element 'filter' is not valid with respect to its type, 'mode'.", 19, 49, null), // unclear why type is 'null'
new ValidationMessage(ValidationMessageSeverity.WARN,
"cvc-complex-type.3.2.2: Attribute 'mode' is not allowed to appear in element 'exclude'.", 20, 51, null),
new ValidationMessage(ValidationMessageSeverity.WARN,