third_party/protobuf/java/core/pom.xml - Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/java/core/pom.xml

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)

Patch Set: Make chrome settings proto generated file a component Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/java/compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test/WireFormatTest.java ('k') | third_party/protobuf/java/core/src/main/java/com/google/protobuf/AbstractMessage.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/java/core/pom.xml

diff --git a/third_party/protobuf/java/core/pom.xml b/third_party/protobuf/java/core/pom.xml

index 0d4c5c75d07b4076e9fba5d076c047d560f17b31..cced344edf1da572f311de07779cd43f8eaab4d6 100644

--- a/third_party/protobuf/java/core/pom.xml

+++ b/third_party/protobuf/java/core/pom.xml

@@ -6,7 +6,7 @@

<groupId>com.google.protobuf</groupId>

<artifactId>protobuf-parent</artifactId>

- <version>3.0.0-beta-3</version>

+ <version>3.1.0</version>

</parent>

<artifactId>protobuf-java</artifactId>

@@ -92,11 +92,34 @@

- <artifactId>maven-compiler-plugin</artifactId>

- <configuration>

- <generatedSourcesDirectory>${generated.sources.dir}</generatedSourcesDirectory>

- <generatedTestSourcesDirectory>${generated.testsources.dir}</generatedTestSourcesDirectory>

- </configuration>

+ <groupId>org.codehaus.mojo</groupId>

+ <artifactId>build-helper-maven-plugin</artifactId>

+ <executions>

+ <execution>

+ <id>add-generated-sources</id>

+ <phase>generate-sources</phase>

+ <goals>

+ <goal>add-source</goal>

+ </goals>

+ <configuration>

+ <sources>

+ <source>${generated.sources.dir}</source>

+ </sources>

+ </configuration>

+ </execution>

+ <execution>

+ <id>add-generated-test-sources</id>

+ <phase>generate-test-sources</phase>

+ <goals>

+ <goal>add-test-source</goal>

+ </goals>

+ <configuration>

+ <sources>

+ <source>${generated.testsources.dir}</source>

+ </sources>

+ </configuration>

+ </execution>

+ </executions>

</plugin>