Merge pull request #6342 from leonardehrenfried/upgrade-protobuf

Update protobuf, OSM parser and Google cloud tools
opentripplanner · Jan 9, 2025 · 0b8b82b · 0b8b82b
2 parents be21661 + f53245f
commit 0b8b82b
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 20 deletions.
diff --git a/application/pom.xml b/application/pom.xml
@@ -312,9 +312,9 @@
         </dependency>
         <!-- OpenStreetMap protobuf (PBF) definitions and parser -->
         <dependency>
-            <groupId>org.openstreetmap.osmosis</groupId>
-            <artifactId>osmosis-osm-binary</artifactId>
-            <version>0.48.3</version>
+            <groupId>org.openstreetmap.pbf</groupId>
+            <artifactId>osmpbf</artifactId>
+            <version>1.6.0</version>
         </dependency>
         <!-- Command line parameter parsing -->
         <dependency>

diff --git a/application/src/main/java/org/opentripplanner/osm/OsmParser.java b/application/src/main/java/org/opentripplanner/osm/OsmParser.java
@@ -1,11 +1,11 @@
 package org.opentripplanner.osm;
 
+import crosby.binary.BinaryParser;
+import crosby.binary.Osmformat;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import org.openstreetmap.osmosis.osmbinary.BinaryParser;
-import org.openstreetmap.osmosis.osmbinary.Osmformat;
 import org.opentripplanner.graph_builder.module.osm.OsmDatabase;
 import org.opentripplanner.osm.model.OsmMemberType;
 import org.opentripplanner.osm.model.OsmNode;

diff --git a/application/src/main/java/org/opentripplanner/osm/OsmProvider.java b/application/src/main/java/org/opentripplanner/osm/OsmProvider.java
@@ -1,11 +1,11 @@
 package org.opentripplanner.osm;
 
+import crosby.binary.file.BlockInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.ZoneId;
-import org.openstreetmap.osmosis.osmbinary.file.BlockInputStream;
 import org.opentripplanner.datastore.api.DataSource;
 import org.opentripplanner.datastore.api.FileType;
 import org.opentripplanner.datastore.file.FileDataSource;

diff --git a/application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java b/application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java
@@ -62,7 +62,7 @@ protected void runPolling() throws InterruptedException, ExecutionException {
     final FeedMessage feed = otpHttpClient.getAndMap(
       URI.create(url),
       this.headers.asMap(),
-      FeedMessage.PARSER::parseFrom
+      FeedMessage::parseFrom
     );
 
     long feedTimestamp = feed.getHeader().getTimestamp();

diff --git a/application/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java b/application/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java
@@ -138,7 +138,7 @@ public void messageArrived(String topic, MqttMessage message) {
       UpdateIncrementality updateIncrementality = FULL_DATASET;
       try {
         // Decode message
-        GtfsRealtime.FeedMessage feedMessage = GtfsRealtime.FeedMessage.PARSER.parseFrom(
+        GtfsRealtime.FeedMessage feedMessage = GtfsRealtime.FeedMessage.parseFrom(
           message.getPayload()
         );
         List<GtfsRealtime.FeedEntity> feedEntityList = feedMessage.getEntityList();

diff --git a/application/src/test/java/org/opentripplanner/GtfsTest.java b/application/src/test/java/org/opentripplanner/GtfsTest.java
@@ -221,7 +221,7 @@ protected void setUp() throws Exception {
 
     try {
       InputStream inputStream = new FileInputStream(gtfsRealTime);
-      FeedMessage feedMessage = FeedMessage.PARSER.parseFrom(inputStream);
+      FeedMessage feedMessage = FeedMessage.parseFrom(inputStream);
       List<FeedEntity> feedEntityList = feedMessage.getEntityList();
       List<TripUpdate> updates = new ArrayList<>(feedEntityList.size());
       for (FeedEntity feedEntity : feedEntityList) {

diff --git a/gtfs-realtime-protobuf/pom.xml b/gtfs-realtime-protobuf/pom.xml
@@ -11,6 +11,7 @@
     <artifactId>gtfs-realtime-protobuf</artifactId>
     <name>OpenTripPlanner - GTFS Realtime (protobuf)</name>
 
+
     <dependencies>
         <dependency>
             <groupId>com.google.protobuf</groupId>
@@ -46,7 +47,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.22.0:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/pom.xml b/pom.xml
@@ -59,20 +59,24 @@
 
     <properties>
         <otp.serialization.version.id>176</otp.serialization.version.id>
+
         <!-- Lib versions - keep list sorted on property name -->
         <geotools.version>32.1</geotools.version>
         <google.dagger.version>2.53</google.dagger.version>
         <jackson.version>2.18.2</jackson.version>
+        <jaxb-runtime.version>4.0.5</jaxb-runtime.version>
         <jersey.version>3.1.9</jersey.version>
         <junit.version>5.11.4</junit.version>
-        <micrometer.version>1.14.2</micrometer.version>
+        <micrometer.version>1.14.1</micrometer.version>
         <netcdf4.version>5.6.0</netcdf4.version>
         <logback.version>1.5.12</logback.version>
         <lucene.version>10.1.0</lucene.version>
-        <slf4j.version>2.0.16</slf4j.version>
+        <micrometer.version>1.14.1</micrometer.version>
         <netex-java-model.version>2.0.15</netex-java-model.version>
+        <netcdf4.version>5.6.0</netcdf4.version>
+        <protobuf.version>4.28.3</protobuf.version>
         <siri-java-model.version>1.28</siri-java-model.version>
-        <jaxb-runtime.version>4.0.5</jaxb-runtime.version>
+        <slf4j.version>2.0.16</slf4j.version>
         <!-- Other properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <GITHUB_REPOSITORY>opentripplanner/OpenTripPlanner</GITHUB_REPOSITORY>
@@ -389,14 +393,26 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <!-- This make sure all google libraries are using compatible versions. -->
+                <!-- This makes sure all google libraries are using compatible versions. -->
                 <groupId>com.google.cloud</groupId>
                 <artifactId>libraries-bom</artifactId>
-                <version>26.48.0</version>
+                <version>26.51.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
 
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java</artifactId>
+                <version>${protobuf.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>33.4.0-jre</version>
+            </dependency>
+
             <!-- Logging API -->
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -419,11 +435,6 @@
                 <artifactId>trove4j</artifactId>
                 <version>3.0.3</version>
             </dependency>
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>33.4.0-jre</version>
-            </dependency>
 
             <!-- GEOTOOLS AND JTS TOPOLOGY: geometry, rasters and projections. -->
             <!-- GEOTOOLS includes JTS as a transitive dependency. -->