From f19edb16aaf56fba3f60725d045f2d441b169852 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 6 Mar 2026 09:09:31 +0100 Subject: [PATCH 1/6] Update netex-java-model to 3.0.0-SNAPSHOT and adapt code - Bump project version to 5.0.0-SNAPSHOT - Update netex-java-model dependency to 3.0.0-SNAPSHOT - Add Maven Central snapshot repository for SNAPSHOT resolution - Adapt parsers for renamed methods (e.g. getXxx_() -> getXxx_Dummy()) - Handle StopPlace list type change (JAXBElement -> direct StopPlace) - Handle Parking list type change (direct Parking -> JAXBElement) - Handle DatedServiceJourney.getJourneyRef() change from List to single - Add MultilingualStringHelper for new MultilingualString content API - Configure CI for 5.x branch with snapshot publishing - Remove unused Artifactory credentials from push workflow --- .github/workflows/pr.yml | 1 + .github/workflows/push.yml | 11 +++---- pom.xml | 16 ++++++++-- .../netex/loader/parser/NoticeParser.java | 2 +- .../loader/parser/ResourceFrameParser.java | 2 +- .../parser/ServiceCalendarFrameParser.java | 4 +-- .../loader/parser/ServiceFrameParser.java | 6 ++-- .../netex/loader/parser/SiteFrameParser.java | 23 ++++++------- .../loader/parser/TimeTableFrameParser.java | 14 +++++--- .../support/MultilingualStringHelper.java | 32 +++++++++++++++++++ .../org/entur/netex/TestStopPlacesExport.java | 22 +++++++++---- 11 files changed, 96 insertions(+), 37 deletions(-) create mode 100644 src/main/java/org/entur/netex/support/MultilingualStringHelper.java diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 6d778625..cb4f5c19 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -4,6 +4,7 @@ on: branches: - master - 3.x + - 5.x jobs: maven-package: if: "!contains(github.event.head_commit.message, 'ci skip')" diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 7e57f8f1..c7398059 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -4,9 +4,8 @@ on: branches: - master - 3.x + - 5.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 }} @@ -65,15 +64,15 @@ jobs: uses: entur/gha-maven-central/.github/workflows/maven-publish.yml@v1.3.1 secrets: inherit with: - push_to_repo: true - snapshot: false + push_to_repo: ${{ github.ref != 'refs/heads/5.x' }} + snapshot: ${{ github.ref == 'refs/heads/5.x' }} # Check out the branch tip rather than the triggering commit: a run queued # behind another publish must see that run's next-SNAPSHOT bump, or its own # version bump conflicts with it on pull --rebase. git_ref: ${{ github.ref_name }} tag-release: needs: publish-release - if: github.repository_owner == 'entur' && github.event_name == 'push' + if: github.repository_owner == 'entur' && github.event_name == 'push' && github.ref != 'refs/heads/5.x' name: Tag release on GitHub runs-on: ubuntu-24.04 permissions: @@ -103,4 +102,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" \ No newline at end of file + echo "Tagged ${tag} at ${sha}" >> "$GITHUB_STEP_SUMMARY" diff --git a/pom.xml b/pom.xml index c2659576..24ec589d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.entur netex-parser-java - 4.0.19-SNAPSHOT + 5.0.0-SNAPSHOT netex-java-parser Library for parsing NeTEx files and looking up entities in an index. @@ -52,7 +52,7 @@ UTF-8 17 - 2.0.16.2 + 3.0.0-SNAPSHOT 32.1.3-jre 1.6.13 @@ -335,6 +335,18 @@ + + + maven-snapshots + https://central.sonatype.com/repository/maven-snapshots + + false + + + true + + + sonar diff --git a/src/main/java/org/entur/netex/loader/parser/NoticeParser.java b/src/main/java/org/entur/netex/loader/parser/NoticeParser.java index 3b598219..73d6a927 100644 --- a/src/main/java/org/entur/netex/loader/parser/NoticeParser.java +++ b/src/main/java/org/entur/netex/loader/parser/NoticeParser.java @@ -33,7 +33,7 @@ void parseNotices(NoticesInFrame_RelStructure notices) { void parseNoticeAssignments(NoticeAssignmentsInFrame_RelStructure na) { if (na == null) return; - for (JAXBElement it : na.getNoticeAssignment_()) { + for (JAXBElement it : na.getNoticeAssignment_Dummy()) { NoticeAssignment noticeAssignment = (NoticeAssignment) it.getValue(); boolean error = false; diff --git a/src/main/java/org/entur/netex/loader/parser/ResourceFrameParser.java b/src/main/java/org/entur/netex/loader/parser/ResourceFrameParser.java index 51686f04..a4b9109c 100644 --- a/src/main/java/org/entur/netex/loader/parser/ResourceFrameParser.java +++ b/src/main/java/org/entur/netex/loader/parser/ResourceFrameParser.java @@ -66,7 +66,7 @@ void setResultOnIndex(NetexEntitiesIndex netexIndex) { private void parseOrganisations(OrganisationsInFrame_RelStructure elements) { if (elements != null) { - for (JAXBElement e : elements.getOrganisation_()) { + for (JAXBElement e : elements.getOrganisation_Dummy()) { parseOrganisation((Organisation_VersionStructure) e.getValue()); } } diff --git a/src/main/java/org/entur/netex/loader/parser/ServiceCalendarFrameParser.java b/src/main/java/org/entur/netex/loader/parser/ServiceCalendarFrameParser.java index 64c88fc6..f78c85e0 100644 --- a/src/main/java/org/entur/netex/loader/parser/ServiceCalendarFrameParser.java +++ b/src/main/java/org/entur/netex/loader/parser/ServiceCalendarFrameParser.java @@ -67,14 +67,14 @@ private void parseServiceCalendar(ServiceCalendar serviceCalendar) { //List> private void parseDayTypes(DayTypesInFrame_RelStructure element) { if (element == null) return; - for (JAXBElement dt : element.getDayType_()) { + for (JAXBElement dt : element.getDayType_Dummy()) { parseDayType(dt); } } private void parseDayTypes(DayTypes_RelStructure dayTypes) { if (dayTypes == null) return; - for (JAXBElement dt : dayTypes.getDayTypeRefOrDayType_()) { + for (JAXBElement dt : dayTypes.getDayTypeRefOrDayType_Dummy()) { parseDayType(dt); } } diff --git a/src/main/java/org/entur/netex/loader/parser/ServiceFrameParser.java b/src/main/java/org/entur/netex/loader/parser/ServiceFrameParser.java index ac1ddbf0..db01184c 100644 --- a/src/main/java/org/entur/netex/loader/parser/ServiceFrameParser.java +++ b/src/main/java/org/entur/netex/loader/parser/ServiceFrameParser.java @@ -238,7 +238,7 @@ private void parseStopAssignments( private void parseRoutes(RoutesInFrame_RelStructure routes) { if (routes == null) return; - for (JAXBElement element : routes.getRoute_()) { + for (JAXBElement element : routes.getRoute_Dummy()) { if (element.getValue() instanceof Route route) { this.routes.add(route); } @@ -283,7 +283,7 @@ private void parseGroupOfLines( private void parseLines(LinesInFrame_RelStructure lines) { if (lines == null) return; - for (JAXBElement element : lines.getLine_()) { + for (JAXBElement element : lines.getLine_Dummy()) { if (element.getValue() instanceof Line) { this.lines.add((Line) element.getValue()); } else if (element.getValue() instanceof FlexibleLine) { @@ -299,7 +299,7 @@ private void parseJourneyPatterns( ) { if (journeyPatterns == null) return; - for (JAXBElement pattern : journeyPatterns.getJourneyPattern_OrJourneyPatternView()) { + for (JAXBElement pattern : journeyPatterns.getJourneyPattern_Dummy()) { if (pattern.getValue() instanceof JourneyPattern) { this.journeyPatterns.add((JourneyPattern) pattern.getValue()); } else if (pattern.getValue() instanceof ServiceJourneyPattern) { diff --git a/src/main/java/org/entur/netex/loader/parser/SiteFrameParser.java b/src/main/java/org/entur/netex/loader/parser/SiteFrameParser.java index 897b9654..6dbf364c 100644 --- a/src/main/java/org/entur/netex/loader/parser/SiteFrameParser.java +++ b/src/main/java/org/entur/netex/loader/parser/SiteFrameParser.java @@ -46,7 +46,7 @@ class SiteFrameParser extends NetexParser { @Override public void parse(Site_VersionFrameStructure frame) { if (frame.getStopPlaces() != null) { - parseStopPlaces(frame.getStopPlaces().getStopPlace_()); + parseStopPlaces(frame.getStopPlaces().getStopPlace()); } if (frame.getGroupsOfStopPlaces() != null) { @@ -72,7 +72,7 @@ public void parse(Site_VersionFrameStructure frame) { } if (frame.getParkings() != null) { - parseParkings(frame.getParkings().getParking()); + parseParkings(frame.getParkings().getParking_Dummy()); } if (frame.getGroupsOfTariffZones() != null) { @@ -134,11 +134,8 @@ private void parseGroupsOfStopPlaces( groupsOfStopPlaces.addAll(groupsOfStopPlacesList); } - private void parseStopPlaces( - List> stopPlaceList - ) { - for (JAXBElement jaxbStopPlace : stopPlaceList) { - StopPlace stopPlace = (StopPlace) jaxbStopPlace.getValue(); + private void parseStopPlaces(List stopPlaceList) { + for (StopPlace stopPlace : stopPlaceList) { stopPlaces.add(stopPlace); if (!isMultiModalStopPlace(stopPlace)) { parseQuays(stopPlace.getQuays(), stopPlace.getId()); @@ -162,10 +159,14 @@ private void parseTopographicPlaces( topographicPlaces.addAll(topographicPlaceList); } - private void parseParkings(Collection parkingList) { - for (Parking parking : parkingList) { - parkings.add(parking); - parkingsByStopPlaceId.put(parking.getParentSiteRef().getRef(), parking); + private void parseParkings( + List> parkingList + ) { + for (JAXBElement jaxbParking : parkingList) { + if (jaxbParking.getValue() instanceof Parking parking) { + parkings.add(parking); + parkingsByStopPlaceId.put(parking.getParentSiteRef().getRef(), parking); + } } } diff --git a/src/main/java/org/entur/netex/loader/parser/TimeTableFrameParser.java b/src/main/java/org/entur/netex/loader/parser/TimeTableFrameParser.java index 16b52b3f..8c3bc44b 100644 --- a/src/main/java/org/entur/netex/loader/parser/TimeTableFrameParser.java +++ b/src/main/java/org/entur/netex/loader/parser/TimeTableFrameParser.java @@ -116,10 +116,16 @@ private void parseJourneys(JourneysInFrame_RelStructure element) { serviceJourneys.add(serviceJourney); } else if (it instanceof DatedServiceJourney datedServiceJourney) { datedServiceJourneys.add(datedServiceJourney); - datedServiceJourneyByServiceJourneyId.put( - datedServiceJourney.getJourneyRef().getValue().getRef(), - datedServiceJourney - ); + var journeyRef = datedServiceJourney.getJourneyRef(); + if ( + journeyRef != null && + journeyRef.getValue() instanceof ServiceJourneyRefStructure + ) { + datedServiceJourneyByServiceJourneyId.put( + journeyRef.getValue().getRef(), + datedServiceJourney + ); + } } else if (it instanceof DeadRun deadRun) { deadRuns.add(deadRun); } else { diff --git a/src/main/java/org/entur/netex/support/MultilingualStringHelper.java b/src/main/java/org/entur/netex/support/MultilingualStringHelper.java new file mode 100644 index 00000000..fb92fb8d --- /dev/null +++ b/src/main/java/org/entur/netex/support/MultilingualStringHelper.java @@ -0,0 +1,32 @@ +package org.entur.netex.support; + +import java.io.Serializable; +import java.util.List; +import org.rutebanken.netex.model.MultilingualString; + +/** + * Helper for extracting string values from {@link MultilingualString}. + * In netex-java-model 3.x, MultilingualString uses a mixed content model + * where the text is stored in {@code getContent()} as a list of serializable objects. + */ +public final class MultilingualStringHelper { + + private MultilingualStringHelper() {} + + public static String getStringValue(MultilingualString multilingualString) { + if (multilingualString == null) { + return null; + } + List content = multilingualString.getContent(); + if (content == null || content.isEmpty()) { + return null; + } + StringBuilder sb = new StringBuilder(); + for (Serializable item : content) { + if (item instanceof String s) { + sb.append(s); + } + } + return sb.isEmpty() ? null : sb.toString(); + } +} diff --git a/src/test/java/org/entur/netex/TestStopPlacesExport.java b/src/test/java/org/entur/netex/TestStopPlacesExport.java index 800adc4f..65719180 100644 --- a/src/test/java/org/entur/netex/TestStopPlacesExport.java +++ b/src/test/java/org/entur/netex/TestStopPlacesExport.java @@ -1,5 +1,7 @@ package org.entur.netex; +import static org.entur.netex.support.MultilingualStringHelper.getStringValue; + import java.time.LocalDateTime; import java.util.Collection; import org.entur.netex.index.api.NetexEntitiesIndex; @@ -44,7 +46,7 @@ void testGetStopPlace() { StopPlace stopPlace = index .getStopPlaceIndex() .getLatestVersion("NSR:StopPlace:337"); - Assertions.assertEquals("Oslo S", stopPlace.getName().getValue()); + Assertions.assertEquals("Oslo S", getStringValue(stopPlace.getName())); Assertions.assertEquals( "NSR:StopPlace:59872", stopPlace.getParentSiteRef().getRef() @@ -70,7 +72,10 @@ void testGetGroupOfStopPlaces() { GroupOfStopPlaces groupOfStopPlaces = index .getGroupOfStopPlacesIndex() .get("NSR:GroupOfStopPlaces:1"); - Assertions.assertEquals("Oslo", groupOfStopPlaces.getName().getValue()); + Assertions.assertEquals( + "Oslo", + getStringValue(groupOfStopPlaces.getName()) + ); } @Test @@ -78,7 +83,7 @@ void testGetTariffZone() { TariffZone tariffZone = index .getTariffZoneIndex() .getLatestVersion("MOR:TariffZone:108"); - Assertions.assertEquals("Standal", tariffZone.getName().getValue()); + Assertions.assertEquals("Standal", getStringValue(tariffZone.getName())); } @Test @@ -88,7 +93,7 @@ void testGetTopographicPlace() { .getLatestVersion("KVE:TopographicPlace:50"); Assertions.assertEquals( "Trøndelag", - topographicPlace.getDescriptor().getName().getValue() + getStringValue(topographicPlace.getDescriptor().getName()) ); Assertions.assertEquals( "no", @@ -99,7 +104,7 @@ void testGetTopographicPlace() { @Test void testGetParking() { Parking parking = index.getParkingIndex().getLatestVersion("NSR:Parking:1"); - Assertions.assertEquals("Drammen", parking.getName().getValue()); + Assertions.assertEquals("Drammen", getStringValue(parking.getName())); } @Test @@ -107,7 +112,10 @@ void testGetScheduledStopPoint() { ScheduledStopPoint scheduledStopPoint = index .getScheduledStopPointIndex() .getLatestVersion("NSR:ScheduledStopPoint:S5"); - Assertions.assertEquals("Gudå", scheduledStopPoint.getName().getValue()); + Assertions.assertEquals( + "Gudå", + getStringValue(scheduledStopPoint.getName()) + ); } @Test @@ -127,7 +135,7 @@ void testGetFareZone() { FareZone fareZone = index .getFareZoneIndex() .getLatestVersion("AKT:FareZone:27"); - Assertions.assertEquals("Kviteseid", fareZone.getName().getValue()); + Assertions.assertEquals("Kviteseid", getStringValue(fareZone.getName())); } @Test From b41330743b7a5819e007cde47144ac1f08ee440e Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 6 Mar 2026 09:26:12 +0100 Subject: [PATCH 2/6] fix: Disable strict POM checking in jreleaser to allow repositories block Maven Central publishing fails because PomChecker rejects the block in the POM. Disable strict pomchecker validation and applyMavenCentralRules on the nexus2 snapshot deployer. --- pom.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 24ec589d..4320ae7c 100644 --- a/pom.xml +++ b/pom.xml @@ -255,6 +255,9 @@ + + false + RELEASE @@ -267,7 +270,7 @@ SNAPSHOT https://ossrh-staging-api.central.sonatype.com/service/local https://central.sonatype.com/repository/maven-snapshots - true + false true true true From e881382584cc35fdc4ae7dbb8453684eea21c850 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 6 Mar 2026 09:36:25 +0100 Subject: [PATCH 3/6] Require Java 21 to match netex-java-model 3.0.0 netex-java-model 3.0.0-SNAPSHOT is compiled with Java 21 (class version 65.0), so the project and CI must use Java 21 as well. --- .github/workflows/pr.yml | 2 +- .github/workflows/push.yml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index cb4f5c19..66c447f7 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -15,7 +15,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 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index c7398059..31282573 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -24,7 +24,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 diff --git a/pom.xml b/pom.xml index 4320ae7c..ba2cbfee 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ UTF-8 - 17 + 21 3.0.0-SNAPSHOT 32.1.3-jre @@ -358,7 +358,7 @@ - 17 + 21 From 15ca647a12b0c6c83aba368817aaa44055e58f73 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Tue, 13 Oct 2026 14:13:25 +0200 Subject: [PATCH 4/6] Adapt to netex2-java-model (netex-java-model PR #270) - Depend on org.entur:netex2-java-model 3.0.0-SNAPSHOT instead of netex-java-model - Move imports from org.rutebanken.netex.model to org.entur.netex2.model - OperatingDay.calendarDate is now a LocalDate (xs:date mapping) - Add missing ServiceJourneyRefStructure import in TimeTableFrameParser - Document the new artifact and the Java 21 baseline in CLAUDE.md --- CLAUDE.md | 6 +- pom.xml | 6 +- .../java/org/entur/netex/NetexParser.java | 2 +- .../netex/index/api/NetexEntitiesIndex.java | 84 +++++++++---------- .../netex/index/api/NetexEntityIndex.java | 2 +- .../index/api/VersionedNetexEntityIndex.java | 2 +- .../index/impl/NetexEntitiesIndexImpl.java | 84 +++++++++---------- .../index/impl/NetexEntityMapByIdImpl.java | 2 +- .../impl/VersionedNetexEntityIndexImpl.java | 4 +- .../entur/netex/loader/NetexXmlParser.java | 2 +- .../netex/loader/parser/FareFrameParser.java | 4 +- .../loader/parser/NetexDocumentParser.java | 24 +++--- .../netex/loader/parser/NetexParser.java | 2 +- .../netex/loader/parser/NoticeParser.java | 10 +-- .../loader/parser/ResourceFrameParser.java | 14 ++-- .../parser/ServiceCalendarFrameParser.java | 2 +- .../loader/parser/ServiceFrameParser.java | 50 +++++------ .../netex/loader/parser/SiteFrameParser.java | 2 +- .../loader/parser/TimeTableFrameParser.java | 19 +++-- .../parser/VehicleScheduleFrameParser.java | 10 +-- .../support/MultilingualStringHelper.java | 2 +- .../netex/support/NetexVersionHelper.java | 2 +- .../java/org/entur/netex/TestDeadRuns.java | 2 +- .../org/entur/netex/TestDelfiLineExport.java | 8 +- .../entur/netex/TestGroupOfTariffZones.java | 2 +- .../java/org/entur/netex/TestLineExport.java | 4 +- .../java/org/entur/netex/TestMovedQuay.java | 2 +- .../netex/TestMultipleVersionsStopPlaces.java | 2 +- .../entur/netex/TestReferenceDataExport.java | 2 +- .../org/entur/netex/TestStopPlacesExport.java | 18 ++-- .../org/entur/netex/TestUpdateStopPlaces.java | 2 +- .../entur/netex/VehicleScheduleFrameTest.java | 8 +- .../ServiceCalendarFrameParserTest.java | 13 +-- .../netex/support/NetexVersionHelperTest.java | 2 +- 34 files changed, 202 insertions(+), 198 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index 73489f0b..9fead781 100644 --- a/CLAUDE.md +++ b/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` 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 diff --git a/pom.xml b/pom.xml index ba2cbfee..e366f6c9 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ UTF-8 21 - 3.0.0-SNAPSHOT + 3.0.0-SNAPSHOT 32.1.3-jre 1.6.13 @@ -92,8 +92,8 @@ org.entur - netex-java-model - ${netex-java-model.version} + netex2-java-model + ${netex2-java-model.version} com.google.guava diff --git a/src/main/java/org/entur/netex/NetexParser.java b/src/main/java/org/entur/netex/NetexParser.java index 5941cf5f..31dc7c11 100644 --- a/src/main/java/org/entur/netex/NetexParser.java +++ b/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 diff --git a/src/main/java/org/entur/netex/index/api/NetexEntitiesIndex.java b/src/main/java/org/entur/netex/index/api/NetexEntitiesIndex.java index 373b73b4..66972a2e 100644 --- a/src/main/java/org/entur/netex/index/api/NetexEntitiesIndex.java +++ b/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 diff --git a/src/main/java/org/entur/netex/index/api/NetexEntityIndex.java b/src/main/java/org/entur/netex/index/api/NetexEntityIndex.java index c81a9baa..ce81564b 100644 --- a/src/main/java/org/entur/netex/index/api/NetexEntityIndex.java +++ b/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 diff --git a/src/main/java/org/entur/netex/index/api/VersionedNetexEntityIndex.java b/src/main/java/org/entur/netex/index/api/VersionedNetexEntityIndex.java index 41b3e1c7..50e4e851 100644 --- a/src/main/java/org/entur/netex/index/api/VersionedNetexEntityIndex.java +++ b/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 diff --git a/src/main/java/org/entur/netex/index/impl/NetexEntitiesIndexImpl.java b/src/main/java/org/entur/netex/index/impl/NetexEntitiesIndexImpl.java index 3718d5a5..dfff3e82 100644 --- a/src/main/java/org/entur/netex/index/impl/NetexEntitiesIndexImpl.java +++ b/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; /** * diff --git a/src/main/java/org/entur/netex/index/impl/NetexEntityMapByIdImpl.java b/src/main/java/org/entur/netex/index/impl/NetexEntityMapByIdImpl.java index 4cfd219b..b3453ba2 100644 --- a/src/main/java/org/entur/netex/index/impl/NetexEntityMapByIdImpl.java +++ b/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 implements NetexEntityIndex { diff --git a/src/main/java/org/entur/netex/index/impl/VersionedNetexEntityIndexImpl.java b/src/main/java/org/entur/netex/index/impl/VersionedNetexEntityIndexImpl.java index 32087a6f..669a076e 100644 --- a/src/main/java/org/entur/netex/index/impl/VersionedNetexEntityIndexImpl.java +++ b/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 implements VersionedNetexEntityIndex { diff --git a/src/main/java/org/entur/netex/loader/NetexXmlParser.java b/src/main/java/org/entur/netex/loader/NetexXmlParser.java index 5495dcbb..017b2519 100644 --- a/src/main/java/org/entur/netex/loader/NetexXmlParser.java +++ b/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 { diff --git a/src/main/java/org/entur/netex/loader/parser/FareFrameParser.java b/src/main/java/org/entur/netex/loader/parser/FareFrameParser.java index 318408d3..f7d27ab0 100644 --- a/src/main/java/org/entur/netex/loader/parser/FareFrameParser.java +++ b/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 { diff --git a/src/main/java/org/entur/netex/loader/parser/NetexDocumentParser.java b/src/main/java/org/entur/netex/loader/parser/NetexDocumentParser.java index 812eafdc..9a1c0caa 100644 --- a/src/main/java/org/entur/netex/loader/parser/NetexDocumentParser.java +++ b/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; diff --git a/src/main/java/org/entur/netex/loader/parser/NetexParser.java b/src/main/java/org/entur/netex/loader/parser/NetexParser.java index 00b2f801..9bf7a945 100644 --- a/src/main/java/org/entur/netex/loader/parser/NetexParser.java +++ b/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; /** diff --git a/src/main/java/org/entur/netex/loader/parser/NoticeParser.java b/src/main/java/org/entur/netex/loader/parser/NoticeParser.java index 73d6a927..86aba5ef 100644 --- a/src/main/java/org/entur/netex/loader/parser/NoticeParser.java +++ b/src/main/java/org/entur/netex/loader/parser/NoticeParser.java @@ -4,11 +4,11 @@ import java.util.ArrayList; import java.util.Collection; import org.entur.netex.index.api.NetexEntitiesIndex; -import org.rutebanken.netex.model.DataManagedObjectStructure; -import org.rutebanken.netex.model.Notice; -import org.rutebanken.netex.model.NoticeAssignment; -import org.rutebanken.netex.model.NoticeAssignmentsInFrame_RelStructure; -import org.rutebanken.netex.model.NoticesInFrame_RelStructure; +import org.entur.netex2.model.DataManagedObjectStructure; +import org.entur.netex2.model.Notice; +import org.entur.netex2.model.NoticeAssignment; +import org.entur.netex2.model.NoticeAssignmentsInFrame_RelStructure; +import org.entur.netex2.model.NoticesInFrame_RelStructure; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/entur/netex/loader/parser/ResourceFrameParser.java b/src/main/java/org/entur/netex/loader/parser/ResourceFrameParser.java index a4b9109c..8aa2d438 100644 --- a/src/main/java/org/entur/netex/loader/parser/ResourceFrameParser.java +++ b/src/main/java/org/entur/netex/loader/parser/ResourceFrameParser.java @@ -4,13 +4,13 @@ import java.util.ArrayList; import java.util.Collection; import org.entur.netex.index.api.NetexEntitiesIndex; -import org.rutebanken.netex.model.Authority; -import org.rutebanken.netex.model.Branding; -import org.rutebanken.netex.model.Operator; -import org.rutebanken.netex.model.Organisation_VersionStructure; -import org.rutebanken.netex.model.OrganisationsInFrame_RelStructure; -import org.rutebanken.netex.model.ResourceFrame_VersionFrameStructure; -import org.rutebanken.netex.model.TypesOfValueInFrame_RelStructure; +import org.entur.netex2.model.Authority; +import org.entur.netex2.model.Branding; +import org.entur.netex2.model.Operator; +import org.entur.netex2.model.Organisation_VersionStructure; +import org.entur.netex2.model.OrganisationsInFrame_RelStructure; +import org.entur.netex2.model.ResourceFrame_VersionFrameStructure; +import org.entur.netex2.model.TypesOfValueInFrame_RelStructure; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/entur/netex/loader/parser/ServiceCalendarFrameParser.java b/src/main/java/org/entur/netex/loader/parser/ServiceCalendarFrameParser.java index f78c85e0..e671b8f0 100644 --- a/src/main/java/org/entur/netex/loader/parser/ServiceCalendarFrameParser.java +++ b/src/main/java/org/entur/netex/loader/parser/ServiceCalendarFrameParser.java @@ -7,7 +7,7 @@ import java.util.Collection; import java.util.List; import org.entur.netex.index.api.NetexEntitiesIndex; -import org.rutebanken.netex.model.*; +import org.entur.netex2.model.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/entur/netex/loader/parser/ServiceFrameParser.java b/src/main/java/org/entur/netex/loader/parser/ServiceFrameParser.java index db01184c..90a05122 100644 --- a/src/main/java/org/entur/netex/loader/parser/ServiceFrameParser.java +++ b/src/main/java/org/entur/netex/loader/parser/ServiceFrameParser.java @@ -9,31 +9,31 @@ import java.util.Map; import org.entur.netex.index.api.NetexEntitiesIndex; import org.entur.netex.index.api.NetexEntityIndex; -import org.rutebanken.netex.model.DestinationDisplay; -import org.rutebanken.netex.model.DestinationDisplaysInFrame_RelStructure; -import org.rutebanken.netex.model.FlexibleLine; -import org.rutebanken.netex.model.FlexibleStopAssignment; -import org.rutebanken.netex.model.FlexibleStopPlace; -import org.rutebanken.netex.model.GroupOfLines; -import org.rutebanken.netex.model.GroupsOfLinesInFrame_RelStructure; -import org.rutebanken.netex.model.JourneyPattern; -import org.rutebanken.netex.model.JourneyPatternsInFrame_RelStructure; -import org.rutebanken.netex.model.Line; -import org.rutebanken.netex.model.LinesInFrame_RelStructure; -import org.rutebanken.netex.model.Network; -import org.rutebanken.netex.model.NetworksInFrame_RelStructure; -import org.rutebanken.netex.model.PassengerStopAssignment; -import org.rutebanken.netex.model.Route; -import org.rutebanken.netex.model.RoutePoint; -import org.rutebanken.netex.model.RoutePointsInFrame_RelStructure; -import org.rutebanken.netex.model.RoutesInFrame_RelStructure; -import org.rutebanken.netex.model.ScheduledStopPoint; -import org.rutebanken.netex.model.ScheduledStopPointsInFrame_RelStructure; -import org.rutebanken.netex.model.ServiceJourneyPattern; -import org.rutebanken.netex.model.ServiceLink; -import org.rutebanken.netex.model.ServiceLinksInFrame_RelStructure; -import org.rutebanken.netex.model.Service_VersionFrameStructure; -import org.rutebanken.netex.model.StopAssignmentsInFrame_RelStructure; +import org.entur.netex2.model.DestinationDisplay; +import org.entur.netex2.model.DestinationDisplaysInFrame_RelStructure; +import org.entur.netex2.model.FlexibleLine; +import org.entur.netex2.model.FlexibleStopAssignment; +import org.entur.netex2.model.FlexibleStopPlace; +import org.entur.netex2.model.GroupOfLines; +import org.entur.netex2.model.GroupsOfLinesInFrame_RelStructure; +import org.entur.netex2.model.JourneyPattern; +import org.entur.netex2.model.JourneyPatternsInFrame_RelStructure; +import org.entur.netex2.model.Line; +import org.entur.netex2.model.LinesInFrame_RelStructure; +import org.entur.netex2.model.Network; +import org.entur.netex2.model.NetworksInFrame_RelStructure; +import org.entur.netex2.model.PassengerStopAssignment; +import org.entur.netex2.model.Route; +import org.entur.netex2.model.RoutePoint; +import org.entur.netex2.model.RoutePointsInFrame_RelStructure; +import org.entur.netex2.model.RoutesInFrame_RelStructure; +import org.entur.netex2.model.ScheduledStopPoint; +import org.entur.netex2.model.ScheduledStopPointsInFrame_RelStructure; +import org.entur.netex2.model.ServiceJourneyPattern; +import org.entur.netex2.model.ServiceLink; +import org.entur.netex2.model.ServiceLinksInFrame_RelStructure; +import org.entur.netex2.model.Service_VersionFrameStructure; +import org.entur.netex2.model.StopAssignmentsInFrame_RelStructure; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/entur/netex/loader/parser/SiteFrameParser.java b/src/main/java/org/entur/netex/loader/parser/SiteFrameParser.java index 6dbf364c..b120c8b0 100644 --- a/src/main/java/org/entur/netex/loader/parser/SiteFrameParser.java +++ b/src/main/java/org/entur/netex/loader/parser/SiteFrameParser.java @@ -10,7 +10,7 @@ import java.util.Map; import org.entur.netex.index.api.NetexEntitiesIndex; import org.entur.netex.support.NetexVersionHelper; -import org.rutebanken.netex.model.*; +import org.entur.netex2.model.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/entur/netex/loader/parser/TimeTableFrameParser.java b/src/main/java/org/entur/netex/loader/parser/TimeTableFrameParser.java index 8c3bc44b..94059640 100644 --- a/src/main/java/org/entur/netex/loader/parser/TimeTableFrameParser.java +++ b/src/main/java/org/entur/netex/loader/parser/TimeTableFrameParser.java @@ -5,15 +5,16 @@ import java.util.ArrayList; import java.util.List; import org.entur.netex.index.api.NetexEntitiesIndex; -import org.rutebanken.netex.model.DatedServiceJourney; -import org.rutebanken.netex.model.DeadRun; -import org.rutebanken.netex.model.Interchange_VersionStructure; -import org.rutebanken.netex.model.JourneyInterchangesInFrame_RelStructure; -import org.rutebanken.netex.model.Journey_VersionStructure; -import org.rutebanken.netex.model.JourneysInFrame_RelStructure; -import org.rutebanken.netex.model.ServiceJourney; -import org.rutebanken.netex.model.ServiceJourneyInterchange; -import org.rutebanken.netex.model.Timetable_VersionFrameStructure; +import org.entur.netex2.model.DatedServiceJourney; +import org.entur.netex2.model.DeadRun; +import org.entur.netex2.model.Interchange_VersionStructure; +import org.entur.netex2.model.JourneyInterchangesInFrame_RelStructure; +import org.entur.netex2.model.Journey_VersionStructure; +import org.entur.netex2.model.JourneysInFrame_RelStructure; +import org.entur.netex2.model.ServiceJourney; +import org.entur.netex2.model.ServiceJourneyInterchange; +import org.entur.netex2.model.ServiceJourneyRefStructure; +import org.entur.netex2.model.Timetable_VersionFrameStructure; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/entur/netex/loader/parser/VehicleScheduleFrameParser.java b/src/main/java/org/entur/netex/loader/parser/VehicleScheduleFrameParser.java index 683a3329..e6af9ec9 100644 --- a/src/main/java/org/entur/netex/loader/parser/VehicleScheduleFrameParser.java +++ b/src/main/java/org/entur/netex/loader/parser/VehicleScheduleFrameParser.java @@ -3,11 +3,11 @@ import java.util.ArrayList; import java.util.Collection; import org.entur.netex.index.api.NetexEntitiesIndex; -import org.rutebanken.netex.model.Block; -import org.rutebanken.netex.model.Block_VersionStructure; -import org.rutebanken.netex.model.BlocksInFrame_RelStructure; -import org.rutebanken.netex.model.DataManagedObjectStructure; -import org.rutebanken.netex.model.VehicleSchedule_VersionFrameStructure; +import org.entur.netex2.model.Block; +import org.entur.netex2.model.Block_VersionStructure; +import org.entur.netex2.model.BlocksInFrame_RelStructure; +import org.entur.netex2.model.DataManagedObjectStructure; +import org.entur.netex2.model.VehicleSchedule_VersionFrameStructure; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/entur/netex/support/MultilingualStringHelper.java b/src/main/java/org/entur/netex/support/MultilingualStringHelper.java index fb92fb8d..9834150a 100644 --- a/src/main/java/org/entur/netex/support/MultilingualStringHelper.java +++ b/src/main/java/org/entur/netex/support/MultilingualStringHelper.java @@ -2,7 +2,7 @@ import java.io.Serializable; import java.util.List; -import org.rutebanken.netex.model.MultilingualString; +import org.entur.netex2.model.MultilingualString; /** * Helper for extracting string values from {@link MultilingualString}. diff --git a/src/main/java/org/entur/netex/support/NetexVersionHelper.java b/src/main/java/org/entur/netex/support/NetexVersionHelper.java index c0960d23..a861e781 100644 --- a/src/main/java/org/entur/netex/support/NetexVersionHelper.java +++ b/src/main/java/org/entur/netex/support/NetexVersionHelper.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.Comparator; -import org.rutebanken.netex.model.EntityInVersionStructure; +import org.entur.netex2.model.EntityInVersionStructure; /** * Utility class to help working with versioned NeTEx element. diff --git a/src/test/java/org/entur/netex/TestDeadRuns.java b/src/test/java/org/entur/netex/TestDeadRuns.java index 09f6ca0a..d9d7f08c 100644 --- a/src/test/java/org/entur/netex/TestDeadRuns.java +++ b/src/test/java/org/entur/netex/TestDeadRuns.java @@ -2,10 +2,10 @@ import java.util.Collection; import org.entur.netex.index.api.NetexEntitiesIndex; +import org.entur.netex2.model.DeadRun; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.rutebanken.netex.model.DeadRun; class TestDeadRuns { diff --git a/src/test/java/org/entur/netex/TestDelfiLineExport.java b/src/test/java/org/entur/netex/TestDelfiLineExport.java index 99e2f5f2..b79f6e71 100644 --- a/src/test/java/org/entur/netex/TestDelfiLineExport.java +++ b/src/test/java/org/entur/netex/TestDelfiLineExport.java @@ -2,13 +2,13 @@ import java.util.Collection; import org.entur.netex.index.api.NetexEntitiesIndex; +import org.entur.netex2.model.DatedServiceJourney; +import org.entur.netex2.model.ServiceJourney; +import org.entur.netex2.model.ServiceJourneyInterchange; +import org.entur.netex2.model.ServiceJourneyPattern; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.rutebanken.netex.model.DatedServiceJourney; -import org.rutebanken.netex.model.ServiceJourney; -import org.rutebanken.netex.model.ServiceJourneyInterchange; -import org.rutebanken.netex.model.ServiceJourneyPattern; class TestDelfiLineExport { diff --git a/src/test/java/org/entur/netex/TestGroupOfTariffZones.java b/src/test/java/org/entur/netex/TestGroupOfTariffZones.java index 9535a863..e1ff62f0 100644 --- a/src/test/java/org/entur/netex/TestGroupOfTariffZones.java +++ b/src/test/java/org/entur/netex/TestGroupOfTariffZones.java @@ -4,10 +4,10 @@ import java.nio.file.Files; import java.util.Collection; import org.entur.netex.index.api.NetexEntitiesIndex; +import org.entur.netex2.model.GroupOfTariffZones; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.rutebanken.netex.model.GroupOfTariffZones; class TestGroupOfTariffZones { diff --git a/src/test/java/org/entur/netex/TestLineExport.java b/src/test/java/org/entur/netex/TestLineExport.java index da074f22..363e6498 100644 --- a/src/test/java/org/entur/netex/TestLineExport.java +++ b/src/test/java/org/entur/netex/TestLineExport.java @@ -2,11 +2,11 @@ import java.util.Collection; import org.entur.netex.index.api.NetexEntitiesIndex; +import org.entur.netex2.model.DatedServiceJourney; +import org.entur.netex2.model.ServiceJourneyInterchange; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.rutebanken.netex.model.DatedServiceJourney; -import org.rutebanken.netex.model.ServiceJourneyInterchange; class TestLineExport { diff --git a/src/test/java/org/entur/netex/TestMovedQuay.java b/src/test/java/org/entur/netex/TestMovedQuay.java index 4fd9654e..8a1ebbf5 100644 --- a/src/test/java/org/entur/netex/TestMovedQuay.java +++ b/src/test/java/org/entur/netex/TestMovedQuay.java @@ -4,10 +4,10 @@ import java.nio.file.Files; import java.util.Collection; import org.entur.netex.index.api.NetexEntitiesIndex; +import org.entur.netex2.model.StopPlace; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.rutebanken.netex.model.StopPlace; class TestMovedQuay { diff --git a/src/test/java/org/entur/netex/TestMultipleVersionsStopPlaces.java b/src/test/java/org/entur/netex/TestMultipleVersionsStopPlaces.java index 6b818463..7c594599 100644 --- a/src/test/java/org/entur/netex/TestMultipleVersionsStopPlaces.java +++ b/src/test/java/org/entur/netex/TestMultipleVersionsStopPlaces.java @@ -5,10 +5,10 @@ import java.util.Collection; import java.util.Map; import org.entur.netex.index.api.NetexEntitiesIndex; +import org.entur.netex2.model.StopPlace; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.rutebanken.netex.model.StopPlace; class TestMultipleVersionsStopPlaces { diff --git a/src/test/java/org/entur/netex/TestReferenceDataExport.java b/src/test/java/org/entur/netex/TestReferenceDataExport.java index 2436245a..d9db7990 100644 --- a/src/test/java/org/entur/netex/TestReferenceDataExport.java +++ b/src/test/java/org/entur/netex/TestReferenceDataExport.java @@ -1,10 +1,10 @@ package org.entur.netex; import org.entur.netex.index.api.NetexEntitiesIndex; +import org.entur.netex2.model.RoutePoint; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.rutebanken.netex.model.RoutePoint; class TestReferenceDataExport { diff --git a/src/test/java/org/entur/netex/TestStopPlacesExport.java b/src/test/java/org/entur/netex/TestStopPlacesExport.java index 65719180..906e572c 100644 --- a/src/test/java/org/entur/netex/TestStopPlacesExport.java +++ b/src/test/java/org/entur/netex/TestStopPlacesExport.java @@ -5,18 +5,18 @@ import java.time.LocalDateTime; import java.util.Collection; import org.entur.netex.index.api.NetexEntitiesIndex; +import org.entur.netex2.model.FareZone; +import org.entur.netex2.model.GroupOfStopPlaces; +import org.entur.netex2.model.Parking; +import org.entur.netex2.model.PassengerStopAssignment; +import org.entur.netex2.model.Quay; +import org.entur.netex2.model.ScheduledStopPoint; +import org.entur.netex2.model.StopPlace; +import org.entur.netex2.model.TariffZone; +import org.entur.netex2.model.TopographicPlace; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.rutebanken.netex.model.FareZone; -import org.rutebanken.netex.model.GroupOfStopPlaces; -import org.rutebanken.netex.model.Parking; -import org.rutebanken.netex.model.PassengerStopAssignment; -import org.rutebanken.netex.model.Quay; -import org.rutebanken.netex.model.ScheduledStopPoint; -import org.rutebanken.netex.model.StopPlace; -import org.rutebanken.netex.model.TariffZone; -import org.rutebanken.netex.model.TopographicPlace; class TestStopPlacesExport { diff --git a/src/test/java/org/entur/netex/TestUpdateStopPlaces.java b/src/test/java/org/entur/netex/TestUpdateStopPlaces.java index 646307d5..b8b45c1e 100644 --- a/src/test/java/org/entur/netex/TestUpdateStopPlaces.java +++ b/src/test/java/org/entur/netex/TestUpdateStopPlaces.java @@ -5,10 +5,10 @@ import java.nio.file.Files; import java.util.Collection; import org.entur.netex.index.api.NetexEntitiesIndex; +import org.entur.netex2.model.StopPlace; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.rutebanken.netex.model.StopPlace; class TestUpdateStopPlaces { diff --git a/src/test/java/org/entur/netex/VehicleScheduleFrameTest.java b/src/test/java/org/entur/netex/VehicleScheduleFrameTest.java index 2ec0b96a..7d3aaa57 100644 --- a/src/test/java/org/entur/netex/VehicleScheduleFrameTest.java +++ b/src/test/java/org/entur/netex/VehicleScheduleFrameTest.java @@ -5,13 +5,13 @@ import java.util.Collection; import java.util.List; import org.entur.netex.index.api.NetexEntitiesIndex; +import org.entur.netex2.model.Block; +import org.entur.netex2.model.DayTypeRefStructure; +import org.entur.netex2.model.JourneyRefs_RelStructure; +import org.entur.netex2.model.VehicleScheduleFrame; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.rutebanken.netex.model.Block; -import org.rutebanken.netex.model.DayTypeRefStructure; -import org.rutebanken.netex.model.JourneyRefs_RelStructure; -import org.rutebanken.netex.model.VehicleScheduleFrame; class VehicleScheduleFrameTest { diff --git a/src/test/java/org/entur/netex/loader/parser/ServiceCalendarFrameParserTest.java b/src/test/java/org/entur/netex/loader/parser/ServiceCalendarFrameParserTest.java index 435eb7ef..ce214783 100644 --- a/src/test/java/org/entur/netex/loader/parser/ServiceCalendarFrameParserTest.java +++ b/src/test/java/org/entur/netex/loader/parser/ServiceCalendarFrameParserTest.java @@ -3,14 +3,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import jakarta.xml.bind.JAXBElement; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; import javax.annotation.Nonnull; import javax.xml.namespace.QName; import org.entur.netex.index.impl.NetexEntitiesIndexImpl; +import org.entur.netex2.model.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.rutebanken.netex.model.*; class ServiceCalendarFrameParserTest { @@ -109,10 +110,12 @@ void testParseOperatingDaysInServiceCalendarFrame() { .withServiceCalendar( new ServiceCalendar() .withId("ServiceCalendarId1") - .withOperatingDays(mockOperatingDaysRelStructure("1", january1st)) + .withOperatingDays( + mockOperatingDaysRelStructure("1", january1st.toLocalDate()) + ) ) .withOperatingDays( - mockOperatingDaysInFrameRelStructure("2", january2nd) + mockOperatingDaysInFrameRelStructure("2", january2nd.toLocalDate()) ) ); parser.setResultOnIndex(index); @@ -121,7 +124,7 @@ void testParseOperatingDaysInServiceCalendarFrame() { private OperatingDays_RelStructure mockOperatingDaysRelStructure( String id, - LocalDateTime date + LocalDate date ) { return new OperatingDays_RelStructure() .withId(id) @@ -132,7 +135,7 @@ private OperatingDays_RelStructure mockOperatingDaysRelStructure( private OperatingDaysInFrame_RelStructure mockOperatingDaysInFrameRelStructure( String id, - LocalDateTime date + LocalDate date ) { return new OperatingDaysInFrame_RelStructure() .withId(id) diff --git a/src/test/java/org/entur/netex/support/NetexVersionHelperTest.java b/src/test/java/org/entur/netex/support/NetexVersionHelperTest.java index bcb3c607..6cc1856d 100644 --- a/src/test/java/org/entur/netex/support/NetexVersionHelperTest.java +++ b/src/test/java/org/entur/netex/support/NetexVersionHelperTest.java @@ -2,9 +2,9 @@ import java.util.ArrayList; import java.util.Collection; +import org.entur.netex2.model.EntityInVersionStructure; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.rutebanken.netex.model.EntityInVersionStructure; class NetexVersionHelperTest { From d8654c19a816d5a8bdcdb6b1066f05017ecb9e72 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Thu, 15 Oct 2026 10:11:29 +0200 Subject: [PATCH 5/6] Adapt to the unsuffixed substitution-group accessors of netex2-java-model netex-java-model PR #270 now hides the _Dummy suffix that xjc generated for the NeTEx 2.0 substitution-group heads, so getDayType_Dummy(), getRoute_Dummy(), getLine_Dummy(), ... are now getDayType(), getRoute(), getLine(), ... Verified against the 3.0.0-20261014.093720-1 snapshot. --- .../java/org/entur/netex/loader/parser/NoticeParser.java | 2 +- .../org/entur/netex/loader/parser/ResourceFrameParser.java | 2 +- .../netex/loader/parser/ServiceCalendarFrameParser.java | 4 ++-- .../org/entur/netex/loader/parser/ServiceFrameParser.java | 6 +++--- .../java/org/entur/netex/loader/parser/SiteFrameParser.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/entur/netex/loader/parser/NoticeParser.java b/src/main/java/org/entur/netex/loader/parser/NoticeParser.java index 86aba5ef..5c80dbb4 100644 --- a/src/main/java/org/entur/netex/loader/parser/NoticeParser.java +++ b/src/main/java/org/entur/netex/loader/parser/NoticeParser.java @@ -33,7 +33,7 @@ void parseNotices(NoticesInFrame_RelStructure notices) { void parseNoticeAssignments(NoticeAssignmentsInFrame_RelStructure na) { if (na == null) return; - for (JAXBElement it : na.getNoticeAssignment_Dummy()) { + for (JAXBElement it : na.getNoticeAssignment()) { NoticeAssignment noticeAssignment = (NoticeAssignment) it.getValue(); boolean error = false; diff --git a/src/main/java/org/entur/netex/loader/parser/ResourceFrameParser.java b/src/main/java/org/entur/netex/loader/parser/ResourceFrameParser.java index 8aa2d438..87f328f1 100644 --- a/src/main/java/org/entur/netex/loader/parser/ResourceFrameParser.java +++ b/src/main/java/org/entur/netex/loader/parser/ResourceFrameParser.java @@ -66,7 +66,7 @@ void setResultOnIndex(NetexEntitiesIndex netexIndex) { private void parseOrganisations(OrganisationsInFrame_RelStructure elements) { if (elements != null) { - for (JAXBElement e : elements.getOrganisation_Dummy()) { + for (JAXBElement e : elements.getOrganisation()) { parseOrganisation((Organisation_VersionStructure) e.getValue()); } } diff --git a/src/main/java/org/entur/netex/loader/parser/ServiceCalendarFrameParser.java b/src/main/java/org/entur/netex/loader/parser/ServiceCalendarFrameParser.java index e671b8f0..04ebf0d7 100644 --- a/src/main/java/org/entur/netex/loader/parser/ServiceCalendarFrameParser.java +++ b/src/main/java/org/entur/netex/loader/parser/ServiceCalendarFrameParser.java @@ -67,14 +67,14 @@ private void parseServiceCalendar(ServiceCalendar serviceCalendar) { //List> private void parseDayTypes(DayTypesInFrame_RelStructure element) { if (element == null) return; - for (JAXBElement dt : element.getDayType_Dummy()) { + for (JAXBElement dt : element.getDayType()) { parseDayType(dt); } } private void parseDayTypes(DayTypes_RelStructure dayTypes) { if (dayTypes == null) return; - for (JAXBElement dt : dayTypes.getDayTypeRefOrDayType_Dummy()) { + for (JAXBElement dt : dayTypes.getDayTypeRefOrDayType()) { parseDayType(dt); } } diff --git a/src/main/java/org/entur/netex/loader/parser/ServiceFrameParser.java b/src/main/java/org/entur/netex/loader/parser/ServiceFrameParser.java index 90a05122..d89c7e12 100644 --- a/src/main/java/org/entur/netex/loader/parser/ServiceFrameParser.java +++ b/src/main/java/org/entur/netex/loader/parser/ServiceFrameParser.java @@ -238,7 +238,7 @@ private void parseStopAssignments( private void parseRoutes(RoutesInFrame_RelStructure routes) { if (routes == null) return; - for (JAXBElement element : routes.getRoute_Dummy()) { + for (JAXBElement element : routes.getRoute()) { if (element.getValue() instanceof Route route) { this.routes.add(route); } @@ -283,7 +283,7 @@ private void parseGroupOfLines( private void parseLines(LinesInFrame_RelStructure lines) { if (lines == null) return; - for (JAXBElement element : lines.getLine_Dummy()) { + for (JAXBElement element : lines.getLine()) { if (element.getValue() instanceof Line) { this.lines.add((Line) element.getValue()); } else if (element.getValue() instanceof FlexibleLine) { @@ -299,7 +299,7 @@ private void parseJourneyPatterns( ) { if (journeyPatterns == null) return; - for (JAXBElement pattern : journeyPatterns.getJourneyPattern_Dummy()) { + for (JAXBElement pattern : journeyPatterns.getJourneyPattern()) { if (pattern.getValue() instanceof JourneyPattern) { this.journeyPatterns.add((JourneyPattern) pattern.getValue()); } else if (pattern.getValue() instanceof ServiceJourneyPattern) { diff --git a/src/main/java/org/entur/netex/loader/parser/SiteFrameParser.java b/src/main/java/org/entur/netex/loader/parser/SiteFrameParser.java index b120c8b0..b4b3b9f8 100644 --- a/src/main/java/org/entur/netex/loader/parser/SiteFrameParser.java +++ b/src/main/java/org/entur/netex/loader/parser/SiteFrameParser.java @@ -72,7 +72,7 @@ public void parse(Site_VersionFrameStructure frame) { } if (frame.getParkings() != null) { - parseParkings(frame.getParkings().getParking_Dummy()); + parseParkings(frame.getParkings().getParking()); } if (frame.getGroupsOfTariffZones() != null) { From 0029e678b62727cc984e4f5a07ffd024368d471c Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 16 Oct 2026 11:20:55 +0200 Subject: [PATCH 6/6] Depend on the released netex2-java-model 3.0.0 - Update netex2-java-model from 3.0.0-SNAPSHOT to 3.0.0 - Remove the Maven Central snapshot repository from the POM - Restore strict jreleaser PomChecker and Maven Central rules, which were only relaxed to allow the snapshot repository - Remove the 5.x-specific CI branch triggers and snapshot publishing - Refer to netex2-java-model in the MultilingualStringHelper Javadoc --- .github/workflows/pr.yml | 1 - .github/workflows/push.yml | 7 +++---- pom.xml | 19 ++----------------- .../support/MultilingualStringHelper.java | 2 +- 4 files changed, 6 insertions(+), 23 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 66c447f7..61e55985 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -4,7 +4,6 @@ on: branches: - master - 3.x - - 5.x jobs: maven-package: if: "!contains(github.event.head_commit.message, 'ci skip')" diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 31282573..7b1f16f8 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -4,7 +4,6 @@ on: branches: - master - 3.x - - 5.x env: SONATYPE_GPG_KEY_BASE64: ${{ secrets.SONATYPE_GPG_KEY_BASE64 }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} @@ -64,15 +63,15 @@ jobs: uses: entur/gha-maven-central/.github/workflows/maven-publish.yml@v1.3.1 secrets: inherit with: - push_to_repo: ${{ github.ref != 'refs/heads/5.x' }} - snapshot: ${{ github.ref == 'refs/heads/5.x' }} + push_to_repo: true + snapshot: false # Check out the branch tip rather than the triggering commit: a run queued # behind another publish must see that run's next-SNAPSHOT bump, or its own # version bump conflicts with it on pull --rebase. git_ref: ${{ github.ref_name }} tag-release: needs: publish-release - if: github.repository_owner == 'entur' && github.event_name == 'push' && github.ref != 'refs/heads/5.x' + if: github.repository_owner == 'entur' && github.event_name == 'push' name: Tag release on GitHub runs-on: ubuntu-24.04 permissions: diff --git a/pom.xml b/pom.xml index e366f6c9..466b8ee2 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ UTF-8 21 - 3.0.0-SNAPSHOT + 3.0.0 32.1.3-jre 1.6.13 @@ -255,9 +255,6 @@ - - false - RELEASE @@ -270,7 +267,7 @@ SNAPSHOT https://ossrh-staging-api.central.sonatype.com/service/local https://central.sonatype.com/repository/maven-snapshots - false + true true true true @@ -338,18 +335,6 @@ - - - maven-snapshots - https://central.sonatype.com/repository/maven-snapshots - - false - - - true - - - sonar diff --git a/src/main/java/org/entur/netex/support/MultilingualStringHelper.java b/src/main/java/org/entur/netex/support/MultilingualStringHelper.java index 9834150a..adbad138 100644 --- a/src/main/java/org/entur/netex/support/MultilingualStringHelper.java +++ b/src/main/java/org/entur/netex/support/MultilingualStringHelper.java @@ -6,7 +6,7 @@ /** * Helper for extracting string values from {@link MultilingualString}. - * In netex-java-model 3.x, MultilingualString uses a mixed content model + * In netex2-java-model, MultilingualString uses a mixed content model * where the text is stored in {@code getContent()} as a list of serializable objects. */ public final class MultilingualStringHelper {