Skip to content

Commit

Permalink
Merge pull request #13 from mishmash-io/publish-internal-code
Browse files Browse the repository at this point in the history
Upgrade protobuf dep
  • Loading branch information
arusevm authored Oct 29, 2024
2 parents 3877469 + 32f0b16 commit cec23d1
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 5 deletions.
80 changes: 75 additions & 5 deletions hadoop/hadoop-common-stable/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,6 @@
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.apache.hadoop.thirdparty</groupId>
<artifactId>hadoop-shaded-protobuf_3_25</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
Expand Down Expand Up @@ -504,7 +500,8 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<scope>${common.protobuf2.scope}</scope>
<version>${protobuf.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand Down Expand Up @@ -657,6 +654,14 @@
</dependencies>

<build>
<extensions>
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
<version>1.7.1</version>
</extension>
</extensions>

<plugins>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
Expand Down Expand Up @@ -725,6 +730,18 @@
</sources>
</configuration>
</execution>
<execution>
<id>add-protobuf-sources</id>
<phase>process-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources/protobuf/java</source>
</sources>
</configuration>
</execution>
<execution>
<id>add-test-sources</id>
<phase>process-test-sources</phase>
Expand All @@ -737,6 +754,59 @@
</sources>
</configuration>
</execution>
<execution>
<id>add-test-protobuf-sources</id>
<phase>process-test-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-test-sources/protobuf/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.6.1</version>
<configuration>
<protocArtifact>
com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
</protocArtifact>
<!--pluginId>grpc-java</pluginId-->
</configuration>
<executions>
<execution>
<id>compile-protobuf</id>
<phase>generate-sources</phase>
<configuration>
<protoSourceRoot>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-common/src/main/proto</protoSourceRoot>
<excludes>
<exclude>ProtobufRpcEngine.proto</exclude>
</excludes>
<outputDirectory>${project.build.directory}/generated-sources/protobuf/java</outputDirectory>
</configuration>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>compile-protobuf-tests</id>
<phase>generate-test-sources</phase>
<configuration>
<protoSourceRoot>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-common/src/main/proto</protoSourceRoot>
<excludes>
<exclude>*legacy.proto</exclude>
</excludes>
<outputDirectory>${project.build.directory}/generated-test-sources/protobuf/java</outputDirectory>
</configuration>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
<jakarta-servlet.version>6.0.0</jakarta-servlet.version>
<netty.version>4.1.113.Final</netty.version>
<kerby.version>2.1.0</kerby.version>
<protobuf.version>4.28.3</protobuf.version>
<slf4j.version>2.0.16</slf4j.version>
<snappy.version>1.1.10.7</snappy.version>
<spotbugsannotations.version>4.8.6</spotbugsannotations.version>
Expand Down

0 comments on commit cec23d1

Please sign in to comment.