Repository navigation
Conversation
- 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
…lock Maven Central publishing fails because PomChecker rejects the <repositories> block in the POM. Disable strict pomchecker validation and applyMavenCentralRules on the nexus2 snapshot deployer.
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.
- 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
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## master #328 +/- ##
============================================
- Coverage 89.28% 88.38% -0.90%
- Complexity 241 243 +2
============================================
Files 16 17 +1
Lines 821 835 +14
Branches 63 70 +7
============================================
+ Hits 733 738 +5
- Misses 63 65 +2
- Partials 25 32 +7 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
…odel 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.
- 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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Upgrade the parser to the NeTEx 2.0 model published by entur/netex-java-model#270 as the new artifact
org.entur:netex2-java-model3.0.0. The parser version becomes 5.0.0.Changes
org.entur:netex2-java-model3.0.0 (released on Maven Central) instead ofnetex-java-model2.x.org.rutebanken.netex.modeltoorg.entur.netex2.model.getDayType_()→getDayType(),getLine_()→getLine(), ...),StopPlaceandParkinglist element types, newMultilingualStringmixed-content API (seeMultilingualStringHelper).DatedServiceJourneys are indexed by service journey only when theirJourneyRefis aServiceJourneyRef; a missing journey ref no longer throws.OperatingDay.calendarDateis now aLocalDate(xs:datemapping in the model).Verification
mvn package -PprettierCheckagainstnetex2-java-model3.0.0 from Maven Central: all 35 tests pass.pomchecker/applyMavenCentralRulesoverrides are reverted to master's settings.Not changed
renovate.jsonis left as on master. Its rule disabling model bumps on3.xstill refers to the old artifact, which is correct for that branch.