Upgrade to netex2-java-model 3.0.0 (NeTEx 2.0)

.github/workflows/pr.yml

@@ -14,7 +14,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-java@v6.0.1
         with:
-          java-version: 17.0.13
+          java-version: 21
           distribution: liberica
       - name: Cache Maven dependencies
         uses: actions/cache@v6.1.0

.github/workflows/push.yml

@@ -5,8 +5,6 @@ on:
       - master
       - 3.x
 env:
-    JFROG_USER: ${{ secrets.ARTIFACTORY_AUTH_USER }}
-    JFROG_PASS: ${{ secrets.ARTIFACTORY_AUTH_TOKEN }}
     SONATYPE_GPG_KEY_BASE64: ${{ secrets.SONATYPE_GPG_KEY_BASE64 }}
     SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
     SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
@@ -25,7 +23,7 @@ jobs:
           wget https://raw.githubusercontent.com/entur/ror-maven-settings/master/.m2/settings_release_maven_central.xml -O .github/workflows/settings.xml
       - uses: actions/setup-java@v6.0.1
         with:
-          java-version: 17.0.13
+          java-version: 21
           distribution: liberica
       - name: Cache Maven dependencies
         uses: actions/cache@v6.1.0
@@ -103,4 +101,4 @@ jobs:
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git tag -a "${tag}" -m "Release ${tag}" "${sha}"
           git push origin "${tag}"
-          echo "Tagged ${tag} at ${sha}" >> "$GITHUB_STEP_SUMMARY"
+          echo "Tagged ${tag} at ${sha}" >> "$GITHUB_STEP_SUMMARY"

CLAUDE.md

@@ -15,13 +15,13 @@ Java library for parsing NeTEx (Network Timetable Exchange) XML files into a que
 - **Format code (prettier)**: `mvn prettier:write`
 - **Full build with formatting check (CI)**: `mvn verify -P prettierCheck`
 
-Requires Java 17+. Uses JUnit 5 and AssertJ for tests.
+Requires Java 21+. Uses JUnit 5 and AssertJ for tests.
 
 ## Architecture
 
 ### Parsing Pipeline
 
-1. **`NetexParser`** (entry point, `org.entur.netex`) — accepts a ZIP path or `InputStream`, uses JAXB to unmarshal NeTEx XML into `PublicationDeliveryStructure` objects from the `netex-java-model` dependency.
+1. **`NetexParser`** (entry point, `org.entur.netex`) — accepts a ZIP path or `InputStream`, uses JAXB to unmarshal NeTEx XML into `PublicationDeliveryStructure` objects from the `netex2-java-model` dependency.
 2. **`NetexDocumentParser`** — routes each NeTEx frame type to its specialized parser. Handles recursive `CompositeFrame` nesting.
 3. **Frame parsers** (`org.entur.netex.loader.parser`) — one per frame type (`ServiceFrameParser`, `TimeTableFrameParser`, `SiteFrameParser`, `ServiceCalendarFrameParser`, `ResourceFrameParser`, `FareFrameParser`, `VehicleScheduleFrameParser`). Each extends the abstract `NetexParser<T>` which enforces a two-step pattern: `parse(T node)` then `setResultOnIndex(NetexEntitiesIndex)`.
 
@@ -33,7 +33,7 @@ Requires Java 17+. Uses JUnit 5 and AssertJ for tests.
 
 ### Key Dependency
 
-`org.entur:netex-java-model` provides all JAXB-generated NeTEx model classes (`org.rutebanken.netex.model.*`).
+`org.entur:netex2-java-model` provides all JAXB-generated NeTEx model classes (`org.entur.netex2.model.*`).
 
 ## Adding Support for New NeTEx Entities
 

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.entur</groupId>
     <artifactId>netex-parser-java</artifactId>
-    <version>4.0.19-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
 
     <name>netex-java-parser</name>
     <description>Library for parsing NeTEx files and looking up entities in an index.</description>
@@ -50,9 +50,9 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jdk.version>17</jdk.version>
+        <jdk.version>21</jdk.version>
 
-        <netex-java-model.version>2.0.16.2</netex-java-model.version>
+        <netex2-java-model.version>3.0.0</netex2-java-model.version>
         <guava.version>32.1.3-jre</guava.version>
 
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
@@ -92,8 +92,8 @@
     <dependencies>
         <dependency>
             <groupId>org.entur</groupId>
-            <artifactId>netex-java-model</artifactId>
-            <version>${netex-java-model.version}</version>
+            <artifactId>netex2-java-model</artifactId>
+            <version>${netex2-java-model.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -343,7 +343,7 @@
             </activation>
 
             <properties>
-                <jdk.version>17</jdk.version>
+                <jdk.version>21</jdk.version>
             </properties>
 
             <build>

src/main/java/org/entur/netex/NetexParser.java

@@ -11,7 +11,7 @@
 import org.entur.netex.index.impl.NetexEntitiesIndexImpl;
 import org.entur.netex.loader.NetexXmlParser;
 import org.entur.netex.loader.parser.NetexDocumentParser;
-import org.rutebanken.netex.model.PublicationDeliveryStructure;
+import org.entur.netex2.model.PublicationDeliveryStructure;
 
 /**
  * Main entry point to the library. Used to parse a NeTEx publication

src/main/java/org/entur/netex/index/api/NetexEntitiesIndex.java

@@ -4,48 +4,48 @@
 import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.Map;
-import org.rutebanken.netex.model.Authority;
-import org.rutebanken.netex.model.Block;
-import org.rutebanken.netex.model.Branding;
-import org.rutebanken.netex.model.CompositeFrame;
-import org.rutebanken.netex.model.DatedServiceJourney;
-import org.rutebanken.netex.model.DayType;
-import org.rutebanken.netex.model.DayTypeAssignment;
-import org.rutebanken.netex.model.DeadRun;
-import org.rutebanken.netex.model.DestinationDisplay;
-import org.rutebanken.netex.model.FareZone;
-import org.rutebanken.netex.model.FlexibleLine;
-import org.rutebanken.netex.model.FlexibleStopPlace;
-import org.rutebanken.netex.model.GroupOfLines;
-import org.rutebanken.netex.model.GroupOfStopPlaces;
-import org.rutebanken.netex.model.GroupOfTariffZones;
-import org.rutebanken.netex.model.JourneyPattern;
-import org.rutebanken.netex.model.Line;
-import org.rutebanken.netex.model.Network;
-import org.rutebanken.netex.model.Notice;
-import org.rutebanken.netex.model.NoticeAssignment;
-import org.rutebanken.netex.model.OperatingDay;
-import org.rutebanken.netex.model.OperatingPeriod;
-import org.rutebanken.netex.model.Operator;
-import org.rutebanken.netex.model.Parking;
-import org.rutebanken.netex.model.PassengerStopAssignment;
-import org.rutebanken.netex.model.Quay;
-import org.rutebanken.netex.model.ResourceFrame;
-import org.rutebanken.netex.model.Route;
-import org.rutebanken.netex.model.RoutePoint;
-import org.rutebanken.netex.model.ScheduledStopPoint;
-import org.rutebanken.netex.model.ServiceCalendarFrame;
-import org.rutebanken.netex.model.ServiceFrame;
-import org.rutebanken.netex.model.ServiceJourney;
-import org.rutebanken.netex.model.ServiceJourneyInterchange;
-import org.rutebanken.netex.model.ServiceJourneyPattern;
-import org.rutebanken.netex.model.ServiceLink;
-import org.rutebanken.netex.model.SiteFrame;
-import org.rutebanken.netex.model.StopPlace;
-import org.rutebanken.netex.model.TariffZone;
-import org.rutebanken.netex.model.TimetableFrame;
-import org.rutebanken.netex.model.TopographicPlace;
-import org.rutebanken.netex.model.VehicleScheduleFrame;
+import org.entur.netex2.model.Authority;
+import org.entur.netex2.model.Block;
+import org.entur.netex2.model.Branding;
+import org.entur.netex2.model.CompositeFrame;
+import org.entur.netex2.model.DatedServiceJourney;
+import org.entur.netex2.model.DayType;
+import org.entur.netex2.model.DayTypeAssignment;
+import org.entur.netex2.model.DeadRun;
+import org.entur.netex2.model.DestinationDisplay;
+import org.entur.netex2.model.FareZone;
+import org.entur.netex2.model.FlexibleLine;
+import org.entur.netex2.model.FlexibleStopPlace;
+import org.entur.netex2.model.GroupOfLines;
+import org.entur.netex2.model.GroupOfStopPlaces;
+import org.entur.netex2.model.GroupOfTariffZones;
+import org.entur.netex2.model.JourneyPattern;
+import org.entur.netex2.model.Line;
+import org.entur.netex2.model.Network;
+import org.entur.netex2.model.Notice;
+import org.entur.netex2.model.NoticeAssignment;
+import org.entur.netex2.model.OperatingDay;
+import org.entur.netex2.model.OperatingPeriod;
+import org.entur.netex2.model.Operator;
+import org.entur.netex2.model.Parking;
+import org.entur.netex2.model.PassengerStopAssignment;
+import org.entur.netex2.model.Quay;
+import org.entur.netex2.model.ResourceFrame;
+import org.entur.netex2.model.Route;
+import org.entur.netex2.model.RoutePoint;
+import org.entur.netex2.model.ScheduledStopPoint;
+import org.entur.netex2.model.ServiceCalendarFrame;
+import org.entur.netex2.model.ServiceFrame;
+import org.entur.netex2.model.ServiceJourney;
+import org.entur.netex2.model.ServiceJourneyInterchange;
+import org.entur.netex2.model.ServiceJourneyPattern;
+import org.entur.netex2.model.ServiceLink;
+import org.entur.netex2.model.SiteFrame;
+import org.entur.netex2.model.StopPlace;
+import org.entur.netex2.model.TariffZone;
+import org.entur.netex2.model.TimetableFrame;
+import org.entur.netex2.model.TopographicPlace;
+import org.entur.netex2.model.VehicleScheduleFrame;
 
 /**
  * Entrypoint to the NeTEx entities index

src/main/java/org/entur/netex/index/api/NetexEntityIndex.java

@@ -1,7 +1,7 @@
 package org.entur.netex.index.api;
 
 import java.util.Collection;
-import org.rutebanken.netex.model.EntityStructure;
+import org.entur.netex2.model.EntityStructure;
 
 /**
  * A simple index of NeTEx entities of a specific type

src/main/java/org/entur/netex/index/api/VersionedNetexEntityIndex.java

@@ -2,7 +2,7 @@
 
 import java.util.Collection;
 import java.util.Map;
-import org.rutebanken.netex.model.EntityStructure;
+import org.entur.netex2.model.EntityStructure;
 
 /**
  * An index of versioned NeTEx entities

src/main/java/org/entur/netex/index/impl/NetexEntitiesIndexImpl.java

@@ -11,48 +11,48 @@
 import org.entur.netex.index.api.NetexEntitiesIndex;
 import org.entur.netex.index.api.NetexEntityIndex;
 import org.entur.netex.index.api.VersionedNetexEntityIndex;
-import org.rutebanken.netex.model.Authority;
-import org.rutebanken.netex.model.Block;
-import org.rutebanken.netex.model.Branding;
-import org.rutebanken.netex.model.CompositeFrame;
-import org.rutebanken.netex.model.DatedServiceJourney;
-import org.rutebanken.netex.model.DayType;
-import org.rutebanken.netex.model.DayTypeAssignment;
-import org.rutebanken.netex.model.DeadRun;
-import org.rutebanken.netex.model.DestinationDisplay;
-import org.rutebanken.netex.model.FareZone;
-import org.rutebanken.netex.model.FlexibleLine;
-import org.rutebanken.netex.model.FlexibleStopPlace;
-import org.rutebanken.netex.model.GroupOfLines;
-import org.rutebanken.netex.model.GroupOfStopPlaces;
-import org.rutebanken.netex.model.GroupOfTariffZones;
-import org.rutebanken.netex.model.JourneyPattern;
-import org.rutebanken.netex.model.Line;
-import org.rutebanken.netex.model.Network;
-import org.rutebanken.netex.model.Notice;
-import org.rutebanken.netex.model.NoticeAssignment;
-import org.rutebanken.netex.model.OperatingDay;
-import org.rutebanken.netex.model.OperatingPeriod;
-import org.rutebanken.netex.model.Operator;
-import org.rutebanken.netex.model.Parking;
-import org.rutebanken.netex.model.PassengerStopAssignment;
-import org.rutebanken.netex.model.Quay;
-import org.rutebanken.netex.model.ResourceFrame;
-import org.rutebanken.netex.model.Route;
-import org.rutebanken.netex.model.RoutePoint;
-import org.rutebanken.netex.model.ScheduledStopPoint;
-import org.rutebanken.netex.model.ServiceCalendarFrame;
-import org.rutebanken.netex.model.ServiceFrame;
-import org.rutebanken.netex.model.ServiceJourney;
-import org.rutebanken.netex.model.ServiceJourneyInterchange;
-import org.rutebanken.netex.model.ServiceJourneyPattern;
-import org.rutebanken.netex.model.ServiceLink;
-import org.rutebanken.netex.model.SiteFrame;
-import org.rutebanken.netex.model.StopPlace;
-import org.rutebanken.netex.model.TariffZone;
-import org.rutebanken.netex.model.TimetableFrame;
-import org.rutebanken.netex.model.TopographicPlace;
-import org.rutebanken.netex.model.VehicleScheduleFrame;
+import org.entur.netex2.model.Authority;
+import org.entur.netex2.model.Block;
+import org.entur.netex2.model.Branding;
+import org.entur.netex2.model.CompositeFrame;
+import org.entur.netex2.model.DatedServiceJourney;
+import org.entur.netex2.model.DayType;
+import org.entur.netex2.model.DayTypeAssignment;
+import org.entur.netex2.model.DeadRun;
+import org.entur.netex2.model.DestinationDisplay;
+import org.entur.netex2.model.FareZone;
+import org.entur.netex2.model.FlexibleLine;
+import org.entur.netex2.model.FlexibleStopPlace;
+import org.entur.netex2.model.GroupOfLines;
+import org.entur.netex2.model.GroupOfStopPlaces;
+import org.entur.netex2.model.GroupOfTariffZones;
+import org.entur.netex2.model.JourneyPattern;
+import org.entur.netex2.model.Line;
+import org.entur.netex2.model.Network;
+import org.entur.netex2.model.Notice;
+import org.entur.netex2.model.NoticeAssignment;
+import org.entur.netex2.model.OperatingDay;
+import org.entur.netex2.model.OperatingPeriod;
+import org.entur.netex2.model.Operator;
+import org.entur.netex2.model.Parking;
+import org.entur.netex2.model.PassengerStopAssignment;
+import org.entur.netex2.model.Quay;
+import org.entur.netex2.model.ResourceFrame;
+import org.entur.netex2.model.Route;
+import org.entur.netex2.model.RoutePoint;
+import org.entur.netex2.model.ScheduledStopPoint;
+import org.entur.netex2.model.ServiceCalendarFrame;
+import org.entur.netex2.model.ServiceFrame;
+import org.entur.netex2.model.ServiceJourney;
+import org.entur.netex2.model.ServiceJourneyInterchange;
+import org.entur.netex2.model.ServiceJourneyPattern;
+import org.entur.netex2.model.ServiceLink;
+import org.entur.netex2.model.SiteFrame;
+import org.entur.netex2.model.StopPlace;
+import org.entur.netex2.model.TariffZone;
+import org.entur.netex2.model.TimetableFrame;
+import org.entur.netex2.model.TopographicPlace;
+import org.entur.netex2.model.VehicleScheduleFrame;
 
 /**
  *

src/main/java/org/entur/netex/index/impl/NetexEntityMapByIdImpl.java

@@ -4,7 +4,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import org.entur.netex.index.api.NetexEntityIndex;
-import org.rutebanken.netex.model.EntityStructure;
+import org.entur.netex2.model.EntityStructure;
 
 public class NetexEntityMapByIdImpl<V extends EntityStructure>
   implements NetexEntityIndex<V> {

src/main/java/org/entur/netex/index/impl/VersionedNetexEntityIndexImpl.java

@@ -12,8 +12,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import org.entur.netex.index.api.VersionedNetexEntityIndex;
-import org.rutebanken.netex.model.EntityInVersionStructure;
-import org.rutebanken.netex.model.EntityStructure;
+import org.entur.netex2.model.EntityInVersionStructure;
+import org.entur.netex2.model.EntityStructure;
 
 public class VersionedNetexEntityIndexImpl<V extends EntityInVersionStructure>
   implements VersionedNetexEntityIndex<V> {

src/main/java/org/entur/netex/loader/NetexXmlParser.java

@@ -6,7 +6,7 @@
 import jakarta.xml.bind.Unmarshaller;
 import java.io.InputStream;
 import javax.xml.stream.XMLStreamReader;
-import org.rutebanken.netex.model.PublicationDeliveryStructure;
+import org.entur.netex2.model.PublicationDeliveryStructure;
 
 /** Simple wrapper to perform typesafe xml parsing and simple error handling. */
 public class NetexXmlParser {

src/main/java/org/entur/netex/loader/parser/FareFrameParser.java

@@ -3,8 +3,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import org.entur.netex.index.api.NetexEntitiesIndex;
-import org.rutebanken.netex.model.FareFrame_VersionFrameStructure;
-import org.rutebanken.netex.model.FareZone;
+import org.entur.netex2.model.FareFrame_VersionFrameStructure;
+import org.entur.netex2.model.FareZone;
 
 public class FareFrameParser
   extends NetexParser<FareFrame_VersionFrameStructure> {

src/main/java/org/entur/netex/loader/parser/NetexDocumentParser.java

@@ -4,18 +4,18 @@
 import java.util.Collection;
 import java.util.List;
 import org.entur.netex.index.api.NetexEntitiesIndex;
-import org.rutebanken.netex.model.Common_VersionFrameStructure;
-import org.rutebanken.netex.model.CompositeFrame;
-import org.rutebanken.netex.model.FareFrame;
-import org.rutebanken.netex.model.GeneralFrame;
-import org.rutebanken.netex.model.InfrastructureFrame;
-import org.rutebanken.netex.model.PublicationDeliveryStructure;
-import org.rutebanken.netex.model.ResourceFrame;
-import org.rutebanken.netex.model.ServiceCalendarFrame;
-import org.rutebanken.netex.model.ServiceFrame;
-import org.rutebanken.netex.model.SiteFrame;
-import org.rutebanken.netex.model.TimetableFrame;
-import org.rutebanken.netex.model.VehicleScheduleFrame;
+import org.entur.netex2.model.Common_VersionFrameStructure;
+import org.entur.netex2.model.CompositeFrame;
+import org.entur.netex2.model.FareFrame;
+import org.entur.netex2.model.GeneralFrame;
+import org.entur.netex2.model.InfrastructureFrame;
+import org.entur.netex2.model.PublicationDeliveryStructure;
+import org.entur.netex2.model.ResourceFrame;
+import org.entur.netex2.model.ServiceCalendarFrame;
+import org.entur.netex2.model.ServiceFrame;
+import org.entur.netex2.model.SiteFrame;
+import org.entur.netex2.model.TimetableFrame;
+import org.entur.netex2.model.VehicleScheduleFrame;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/org/entur/netex/loader/parser/NetexParser.java

@@ -2,7 +2,7 @@
 
 import java.util.Collection;
 import org.entur.netex.index.api.NetexEntitiesIndex;
-import org.rutebanken.netex.model.VersionFrame_VersionStructure;
+import org.entur.netex2.model.VersionFrame_VersionStructure;
 import org.slf4j.Logger;
 
 /**