diff --git a/bindings.xjb b/bindings.xjb
index e6536c9..a6502a6 100644
--- a/bindings.xjb
+++ b/bindings.xjb
@@ -14,14 +14,14 @@
-|
+|
+ schemaLocation="./src/main/resources/xsd/1.16/netex_framework/netex_genericFramework/netex_organisation_version.xsd">
@@ -30,35 +30,35 @@
+ schemaLocation="./src/main/resources/xsd/1.16/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd">
+ schemaLocation="./src/main/resources/xsd/1.16/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd">
+ schemaLocation="./src/main/resources/xsd/1.16/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd">
+ schemaLocation="./src/main/resources/xsd/1.16/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd">
+ schemaLocation="./src/main/resources/xsd/1.16/netex_framework/netex_responsibility/netex_version_support.xsd">
@@ -68,7 +68,7 @@
+ schemaLocation="./src/main/resources/xsd/1.16/netex_framework/netex_genericFramework/netex_zone_version.xsd">
diff --git a/pom.xml b/pom.xml
index c4a1e0d..7aa9bb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,9 +69,9 @@
11
NeTEx
- master
+ update_dsj
https://github.com/entur/${netexRepoName}
- 1.15
+ 1.16
4.0.0
@@ -230,22 +230,22 @@
${maven-exec-plugin.version}
-
-
- download-extract-current-version
- generate-sources
-
- exec
-
-
-
- ${netexGithubUrl}/archive/${netexBranch}.zip
- src/main/resources/xsd/${netexVersion}
- NeTEx-${netexBranch}/xsd/*
-
- ./bin/netex-download-extract.sh
-
-
+
+
replace-hard-coded-id-in-bindings-file
generate-sources
@@ -261,6 +261,22 @@
+
+
+ download-extract-legacy-1.15
+ generate-resources
+
+ exec
+
+
+
+ ${netexGithubUrl}/archive/tags/v1.0.15.zip
+ src/main/resources/xsd/1.15
+ NeTEx-tags-v1.0.15/xsd/*
+
+ ./bin/netex-download-extract.sh
+
+
download-extract-legacy-1.14
diff --git a/src/main/java/org/rutebanken/netex/validation/NeTExValidator.java b/src/main/java/org/rutebanken/netex/validation/NeTExValidator.java
index f214f93..4b3f4a8 100644
--- a/src/main/java/org/rutebanken/netex/validation/NeTExValidator.java
+++ b/src/main/java/org/rutebanken/netex/validation/NeTExValidator.java
@@ -43,7 +43,8 @@ public enum NetexVersion {
v1_12 ("1.12"),
v1_13 ("1.13"),
v1_14 ("1.14"),
- v1_15 ("1.15");
+ v1_15 ("1.15"),
+ v1_16 ("1.16");
private final String folderName;
@@ -58,7 +59,7 @@ public String toString() {
}
private final Schema neTExSchema;
- public static final NetexVersion LATEST = NetexVersion.v1_15;
+ public static final NetexVersion LATEST = NetexVersion.v1_16;
private static final Map VALIDATORS_PER_VERSION = new EnumMap<>(NetexVersion.class);
diff --git a/src/test/java/org/rutebanken/netex/model/UnmarshalTimetableFrameTest.java b/src/test/java/org/rutebanken/netex/model/UnmarshalTimetableFrameTest.java
index d3c1a07..9f2dcbf 100644
--- a/src/test/java/org/rutebanken/netex/model/UnmarshalTimetableFrameTest.java
+++ b/src/test/java/org/rutebanken/netex/model/UnmarshalTimetableFrameTest.java
@@ -97,8 +97,10 @@ void unmarshalTimetableFrame() throws JAXBException {
" \n" +
" cancellation" +
" \n" +
- " \n" +
- " \n" +
+ " \n" +
+ " " +
+ " \n" +
+ " \n" +
" \n" +
" \n" +
" \n" +
@@ -127,12 +129,13 @@ void unmarshalTimetableFrame() throws JAXBException {
DatedServiceJourney dsj = (DatedServiceJourney) timetableFrame.getVehicleJourneys().getVehicleJourneyOrDatedVehicleJourneyOrNormalDatedVehicleJourney().get(1);
assertEquals("VYG:OperatingDay:2023-12-09", dsj.getOperatingDayRef().getRef());
- assertEquals("VYG:ServiceJourney:96-KMB_87815-R", dsj.getJourneyRef().get(0).getValue().getRef());
- assertEquals("VYG:DatedServiceJourney:8916_KVG-DEG_23-10-19", dsj.getJourneyRef().get(1).getValue().getRef());
+ assertEquals("VYG:ServiceJourney:96-KMB_87815-R", dsj.getJourneyRef().getValue().getRef());
+ assertEquals("VYG:DatedServiceJourney:8916_KVG-DEG_23-10-19", dsj.getReplacedJourneys().getDatedVehicleJourneyRefOrNormalDatedVehicleJourneyRef().get(0).getValue().getRef());
assertEquals("cancellation", dsj.getServiceAlteration().value());
+
}