Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade from [6-year-old](https://repo1.maven.org/maven2/com/google/protobuf/protobuf-lite/3.0.1/) protobuf-lite to its modern equivalent, protobuf-javalite. #1039

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions extensions/liteproto/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-lite</artifactId>
<!-- protobuf-lite is not compatible with protobuf-java, so we mark it optional. -->
<artifactId>protobuf-javalite</artifactId>
<!-- protobuf-javalite is not compatible with protobuf-java, so we mark it optional. -->
<optional>true</optional>
</dependency>
</dependencies>
Expand All @@ -60,11 +60,13 @@
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<configuration>
<protocArtifact>com.google.protobuf:protoc:${protobuf-lite.protoc.version}:exe:${os.detected.classifier}</protocArtifact>
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
<includes>
<param>test_message_lite2.proto</param>
<param>test_message_lite3.proto</param>
</includes>
<!-- TODO(cpovirk): After https://github.com/xolstice/protobuf-maven-plugin/commit/3ae165e5f6b33f8a6221ece11cc79a7df5eeb8df is in a release (so that javaOptions works below), restore this compilation step, remove the copy-proto-generated-code step below, and delete the pre-generated-test-sources directory. Then *hopefully* this will Just Work. -->
<skip>true</skip>
</configuration>
<executions>
<execution>
Expand All @@ -73,6 +75,27 @@
<goals>
<goal>test-compile</goal>
</goals>
<configuration>
<javaOptions>lite</javaOptions>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>copy-proto-generated-code</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>pre-generated-test-sources</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading