Skip to content

Protobuf updates #38

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Apr 7, 2016
Merged

Protobuf updates #38

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
07d888d
Make javadoc generation Java8-safe
argggh Apr 7, 2016
80118f4
Make/mark protoc-bundled-plugin threadsafe
argggh Apr 7, 2016
75162cd
Add missing artifact declarations for 2.6.1 to pom
argggh Apr 7, 2016
c6c1d6d
Add 3.0.0-beta-2 protoc compiler
argggh Apr 7, 2016
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
Next Next commit
Make javadoc generation Java8-safe
  • Loading branch information
@argggh
argggh committed Apr 7, 2016
commit 07d888df0362c9a393540f2f70c586acbf6ff307
15 changes: 14 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,14 +153,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<version>2.10.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<additionalparam>${javadoc.opts}</additionalparam>
</configuration>
</execution>
</executions>
<configuration>
Expand Down Expand Up @@ -223,5 +226,15 @@
</plugins>
</build>
</profile>

<profile>
<id>doclint-java8-disable</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<properties>
<javadoc.opts>-Xdoclint:none</javadoc.opts>
</properties>
</profile>
</profiles>
</project>