Skip to content

Commit 3489b3a

Browse files
committed
Merge branch 'main' into add_variants_to_schema
# Conflicts: # pom.xml
2 parents 3501131 + 7ee2276 commit 3489b3a

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.findologic</groupId>
55
<artifactId>xml-export</artifactId>
66
<packaging>jar</packaging>
7-
<version>1.8.0-SO-variants-dev3-SNAPSHOT</version>
7+
<version>2.1.0-FINDO-9595-SO-dev1-SNAPSHOT</version>
88
<name>xml-export</name>
99
<url>http://maven.apache.org</url>
1010
</project>

src/main/resources/findologic_20.xsd

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,10 @@
2121
</xs:unique>
2222
</xs:element>
2323
</xs:sequence>
24-
<xs:attribute type="versionType" name="version" use="required"/>
24+
<xs:attribute type="xs:string" name="version"/>
2525
</xs:complexType>
2626
</xs:element>
2727

28-
<xs:simpleType name="versionType">
29-
<xs:restriction base="xs:string">
30-
<xs:enumeration value="2.0"/>
31-
</xs:restriction>
32-
</xs:simpleType>
33-
3428
<!-- Structure of items. -->
3529
<xs:complexType name="itemType">
3630
<xs:all>

0 commit comments

Comments
 (0)