Skip to content

Commit

Permalink
Merge pull request #106 from klockla/fix_grpc_protoc_version
Browse files Browse the repository at this point in the history
Reverted back to GRPC 1.66.0 and updated protoc to 3.25.5
  • Loading branch information
jnioche authored Sep 23, 2024
2 parents 8b395a1 + ac10bfb commit 6644448
Show file tree
Hide file tree
Showing 6 changed files with 1,198 additions and 793 deletions.
12 changes: 6 additions & 6 deletions API/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ The Java code can be (re)generated as follows; change the OS & processor values

```
osproc=linux-x86_64
wget https://github.com/protocolbuffers/protobuf/releases/download/v3.20.3/protoc-3.20.3-$osproc.zip
unzip -p protoc-3.20.3-$osproc.zip bin/protoc > protoc
rm protoc-3.20.3-$osproc.zip
wget https://github.com/protocolbuffers/protobuf/releases/download/v25.5/protoc-25.5-$osproc.zip
unzip -p protoc-25.5-$osproc.zip bin/protoc > protoc
rm protoc-25.5-$osproc.zip
chmod a+x protoc
wget https://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/1.50.2/protoc-gen-grpc-java-1.50.2-$osproc.exe
chmod a+x protoc-gen-grpc-java-1.50.2-$osproc.exe
./protoc --plugin=protoc-gen-grpc-java=./protoc-gen-grpc-java-1.50.2-$osproc.exe --proto_path=. --java_out=src/main/java --grpc-java_out=src/main/java urlfrontier.proto
wget https://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/1.66.0/protoc-gen-grpc-java-1.66.0-$osproc.exe
chmod a+x protoc-gen-grpc-java-1.66.0-$osproc.exe
./protoc --plugin=protoc-gen-grpc-java=./protoc-gen-grpc-java-1.66.0-$osproc.exe --proto_path=. --java_out=src/main/java --grpc-java_out=src/main/java urlfrontier.proto
```

Since the Java code is provided here and the corresponding JARs will be available from Maven, regenerating from the schema is not necessary.
Expand Down
12 changes: 10 additions & 2 deletions API/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
<description>URLFrontier Java API</description>

<properties>
<grpc.version>1.68.0</grpc.version>
<protoc.version>3.20.3</protoc.version>
<grpc.version>1.66.0</grpc.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -44,4 +43,13 @@
</dependency>

</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protoc.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
Loading

0 comments on commit 6644448

Please sign in to comment.