Skip to content

Java 11 compilation compatibility #109

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 1 commit into from
May 28, 2019
Merged

Java 11 compilation compatibility #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: java
jdk:
- oraclejdk8
- oraclejdk11

after_success:
- bash <(curl -s https://codecov.io/bash)
21 changes: 10 additions & 11 deletions checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,18 @@
<property name="fileExtensions" value="java"/>
</module>

<module name="SuppressionCommentFilter"/>

<module name="SuppressWithNearbyCommentFilter">
<property name="commentFormat" value="CHECKSTYLE DISABLE ([\w\|]+) FOR (-?\d+) LINES"/>
<property name="checkFormat" value="$1"/>
<property name="influenceFormat" value="$2"/>
</module>


<module name="TreeWalker">
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
<property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
<property name="checkFormat" value="$1"/>
</module>

<module name="FileContentsHolder"/>

<module name="SuppressWithNearbyCommentFilter">
<property name="commentFormat" value="CHECKSTYLE DISABLE ([\w\|]+) FOR (-?\d+) LINES"/>
<property name="checkFormat" value="$1"/>
<property name="influenceFormat" value="$2"/>
</module>

<!-- Checks for Javadoc comments. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
Expand Down
4 changes: 2 additions & 2 deletions contrib/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/MoreMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ private MoreMetadata() { }
* @param clazz the type to serialize
* @param <T>
*/
public static final <T> Metadata.AsciiMarshaller<T> JSON_MARSHALLER(Class<T> clazz) {
public static <T> Metadata.AsciiMarshaller<T> JSON_MARSHALLER(Class<T> clazz) {
return new Metadata.AsciiMarshaller<T>() {
TypeToken<T> typeToken = TypeToken.of(clazz);
private TypeToken<T> typeToken = TypeToken.of(clazz);
private Gson gson = new Gson();

@Override
Expand Down
4 changes: 2 additions & 2 deletions contrib/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/Statuses.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
* stub.someServiceOperation(...);
* } catch (Throwable t) {
* if (hasStatusCode(t, Status.Code.UNAUTHENTICATED)) {
* doWithStatus(t, (status, metadata) -> showLoginPrompt());
* doWithStatus(t, (status, metadata) → showLoginPrompt());
* } else if (hasStatus(t) {
* doWithStatus(t, (status, metadata) -> handleGrpcProblem(status));
* doWithStatus(t, (status, metadata) → handleGrpcProblem(status));
* } else {
* throw t;
* }
Expand Down
2 changes: 1 addition & 1 deletion ...pc-spring/src/main/java/com/salesforce/grpc/contrib/spring/GuavaLFReturnValueHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
* {@literal @}Controller
* public class MyController {
* {@literal @}RequestMapping(method = RequestMethod.GET, value = "/home")
* ListenableFuture<ModelAndView> home(HttpServletRequest request, Model model) {
* ListenableFuture&lt;ModelAndView&gt; home(HttpServletRequest request, Model model) {
* // work that returns a ListenableFuture...
* }
* }
Expand Down
89 changes: 55 additions & 34 deletions contrib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<assertj.version>3.6.2</assertj.version>
<commons-lang.version>2.6</commons-lang.version>
<awaitility.version>2.0.0</awaitility.version>
<mockito.version>2.7.5</mockito.version>
<mockito.version>2.27.0</mockito.version>

<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
Expand All @@ -84,6 +84,14 @@
<developerConnection>${gitRepo}</developerConnection>
</scm>

<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<!--
Expand Down Expand Up @@ -227,15 +235,23 @@
</configuration>
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M3</version>
<configuration>
<argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<version>3.0.0</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>7.1.2</version>
<version>8.21</version>
</dependency>
</dependencies>
<executions>
Expand Down Expand Up @@ -274,6 +290,42 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<author>false</author>
<breakiterator>true</breakiterator>
<doclint>accessibility,html,reference,syntax</doclint>
<keywords>true</keywords>
<version>false</version>
<source>8</source>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand All @@ -293,37 +345,6 @@
<id>public-release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
Expand Down
8 changes: 8 additions & 0 deletions demos/grpc-java-contrib-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@
<module>time-service-demo</module>
</modules>

<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions demos/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<assertj.version>3.6.2</assertj.version>
<commons-lang.version>2.6</commons-lang.version>
<awaitility.version>2.0.0</awaitility.version>
<mockito.version>2.7.5</mockito.version>
<mockito.version>2.27.0</mockito.version>

<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
Expand Down Expand Up @@ -157,12 +157,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<version>3.0.0</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>7.1.2</version>
<version>8.21</version>
</dependency>
</dependencies>
<executions>
Expand Down
89 changes: 55 additions & 34 deletions jprotoc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<assertj.version>3.6.2</assertj.version>
<commons-lang.version>2.6</commons-lang.version>
<awaitility.version>2.0.0</awaitility.version>
<mockito.version>2.7.5</mockito.version>
<mockito.version>2.27.0</mockito.version>

<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
Expand All @@ -85,6 +85,14 @@
<developerConnection>${gitRepo}</developerConnection>
</scm>

<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<!--
Expand Down Expand Up @@ -184,15 +192,23 @@
</configuration>
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M3</version>
<configuration>
<argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<version>3.0.0</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>7.1.2</version>
<version>8.21</version>
</dependency>
</dependencies>
<executions>
Expand Down Expand Up @@ -231,6 +247,42 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<author>false</author>
<breakiterator>true</breakiterator>
<doclint>accessibility,html,reference,syntax</doclint>
<keywords>true</keywords>
<version>false</version>
<source>8</source>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand All @@ -250,37 +302,6 @@
<id>public-release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
Expand Down