Update NeTEx 1.14 (#63)

Author: vpaturet

bindings.xjb

@@ -15,14 +15,14 @@
 
 	<!-- See the script bin/version_updater.sh It updates version in schema locations-->
 
-	<jxb:bindings schemaLocation="./src/main/resources/xsd/1.13/NeTEx_publication.xsd">
+	<jxb:bindings schemaLocation="./src/main/resources/xsd/1.14/NeTEx_publication.xsd">
 		<jxb:schemaBindings>
 			<jxb:package name="org.rutebanken.netex.model" />
 		</jxb:schemaBindings>
 	</jxb:bindings>
 
 	<jxb:bindings
-		schemaLocation="./src/main/resources/xsd/1.13/netex_framework/netex_genericFramework/netex_organisation_version.xsd">
+		schemaLocation="./src/main/resources/xsd/1.14/netex_framework/netex_genericFramework/netex_organisation_version.xsd">
 		<jxb:bindings node="//xsd:element[@name = 'Status']">
 			<jxb:property name="StatusOrganisationGroup" />
 		</jxb:bindings>
@@ -31,35 +31,35 @@
 		</jxb:bindings>
 	</jxb:bindings>
 	<jxb:bindings
-		schemaLocation="./src/main/resources/xsd/1.13/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd">
+		schemaLocation="./src/main/resources/xsd/1.14/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd">
 		<jxb:bindings node="//xsd:element[@ref = 'ResponsibilitySetRef']">
 			<jxb:property name="ResponsibilitySetRefDistributionByGroup" />
 		</jxb:bindings>
 	</jxb:bindings>
 
 	<jxb:bindings
-		schemaLocation="./src/main/resources/xsd/1.13/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd">
+		schemaLocation="./src/main/resources/xsd/1.14/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd">
 		<jxb:bindings node="//xsd:group[@name= 'HeadwayJourneyGroupGroup']/xsd:sequence/xsd:element[@name = 'Description']">
 			<jxb:property name="DescriptionHeadwayJourneyGroupGroup" />
 		</jxb:bindings>
 	</jxb:bindings>
 
 	<jxb:bindings
-		schemaLocation="./src/main/resources/xsd/1.13/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd">
+		schemaLocation="./src/main/resources/xsd/1.14/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd">
 		<jxb:bindings node="//xsd:element[@name = 'Status']">
 			<jxb:property name="StatusPassengerContractGroup" />
 		</jxb:bindings>
 	</jxb:bindings>
 
 	<jxb:bindings
-		schemaLocation="./src/main/resources/xsd/1.13/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd">
+		schemaLocation="./src/main/resources/xsd/1.14/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd">
 		<jxb:bindings node="//xsd:element[@name = 'Status']">
 			<jxb:property name="StatusRetailDeviceGroup" />
 		</jxb:bindings>
 	</jxb:bindings>
 
 	<jxb:bindings
-		schemaLocation="./src/main/resources/xsd/1.13/netex_framework/netex_responsibility/netex_version_support.xsd">
+		schemaLocation="./src/main/resources/xsd/1.14/netex_framework/netex_responsibility/netex_version_support.xsd">
 		<jxb:bindings node="//xsd:attributeGroup[@name = 'BasicModificationDetailsGroup']/xsd:attribute[@name = 'status']">
 			<jxb:property name="status_BasicModificationDetailsGroup" />
 		</jxb:bindings>
@@ -69,7 +69,7 @@
 	</jxb:bindings>
 
 	<jxb:bindings
-		schemaLocation="./src/main/resources/xsd/1.13/netex_framework/netex_genericFramework/netex_zone_version.xsd">
+		schemaLocation="./src/main/resources/xsd/1.14/netex_framework/netex_genericFramework/netex_zone_version.xsd">
 		<jxb:bindings node="//xsd:complexType[@name = 'tariffZonesInFrame_RelStructure']/xsd:complexContent/xsd:extension[@base = 'containmentAggregationStructure']/xsd:sequence/xsd:element[@ref = 'TariffZone_']">
 			<jxb:property name="tariffZone" />
 		</jxb:bindings>

pom.xml

@@ -70,7 +70,7 @@
         <netexRepoName>NeTEx</netexRepoName>
         <netexBranch>master</netexBranch>
         <netexGithubUrl>https://github.com/entur/${netexRepoName}</netexGithubUrl>
-        <netexVersion>1.13</netexVersion>
+        <netexVersion>1.14</netexVersion>
 
         <!-- JAXB components versions -->
         <jakarta-xml-bind.version>2.3.3</jakarta-xml-bind.version>
@@ -260,6 +260,22 @@
                             </executable>
                         </configuration>
                     </execution>
+                    <execution>
+                        <!-- This downloads 1.13 for validation needs. This is not used to generate the model -->
+                        <id>download-extract-legacy-1.13</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <environmentVariables>
+                                <GITHUB_URL>${netexGithubUrl}/archive/tags/v1.0.13.zip</GITHUB_URL>
+                                <DESTINATION_PATH>src/main/resources/xsd/1.13</DESTINATION_PATH>
+                                <ZIP_PATH_TO_EXTRACT>NeTEx-tags-v1.0.13/xsd/*</ZIP_PATH_TO_EXTRACT>
+                            </environmentVariables>
+                            <executable>./bin/netex-download-extract.sh</executable>
+                        </configuration>
+                    </execution>
                     <execution>
                         <!-- This downloads 1.12 for validation needs. This is not used to generate the model -->
                         <id>download-extract-legacy-1.12</id>

src/main/java/org/rutebanken/netex/validation/NeTExValidator.java

@@ -41,7 +41,8 @@ public enum NetexVersion {
 		v1_10 ("1.10"),
 		v1_11 ("1.11"),
 		v1_12 ("1.12"),
-		v1_13 ("1.13");
+		v1_13 ("1.13"),
+		v1_14 ("1.14");
 
 		private final String folderName;
 
@@ -56,7 +57,7 @@ public String toString() {
 	}
 	private final Schema neTExSchema;
 
-	public static final NetexVersion LATEST = NetexVersion.v1_13;
+	public static final NetexVersion LATEST = NetexVersion.v1_14;
 
 	private static final Map<NetexVersion, NeTExValidator> VALIDATORS_PER_VERSION = new EnumMap<>(NetexVersion.class);