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.

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

Jump to bottom

Java 11 compatibility #3821

Merged
merged 9 commits into from
Nov 30, 2018
Merged

Java 11 compatibility #3821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
539890f
Add the javax.annotation-api as a compile scope to the google-api-grp…
chingor13 Oct 15, 2018
3d4fcfb
Upgrade maven-compiler-plugin 3.5.1->3.7.0 and maven-jar-plugin 2.6->…
chingor13 Oct 15, 2018
798dba2
Add annotation-api compile dependency to google-cloud-clients
chingor13 Oct 15, 2018
81419e5
Fix objensis version 3.1.0->2.6
chingor13 Oct 16, 2018
553d06c
Fix service option test visibility
chingor13 Oct 16, 2018
4f936f5
Temporarily using Java 7 build to test Java 11
chingor13 Oct 16, 2018
594feef
Merge branch 'master' into java11
chingor13 Nov 7, 2018
fd0410e
Merge branch 'master' into java11
chingor13 Nov 29, 2018
03c30ed
Restore the java 7 test to use the java 7 image
chingor13 Nov 29, 2018
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
10 changes: 9 additions & 1 deletion google-api-grpc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<!-- Common dependencies -->
Expand Down Expand Up @@ -751,7 +759,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<version>3.7.0</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
Expand Down
4 changes: 2 additions & 2 deletions ...le-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public long millisTime() {
}
}

private interface TestService extends Service<TestServiceOptions> {}
interface TestService extends Service<TestServiceOptions> {}

private static class TestServiceImpl extends BaseService<TestServiceOptions>
implements TestService {
Expand Down Expand Up @@ -209,7 +209,7 @@ private static class DefaultTestServiceRpc implements TestServiceRpc {
DefaultTestServiceRpc(TestServiceOptions options) {}
}

private static class TestServiceOptions
static class TestServiceOptions
extends ServiceOptions<TestService, TestServiceOptions> {
private static class Builder
extends ServiceOptions.Builder<TestService, TestServiceOptions, Builder> {
Expand Down
12 changes: 10 additions & 2 deletions google-cloud-clients/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,14 @@
<objenesis.version>2.6</objenesis.version>
</properties>
<!-- All non-test dependency versions should be added to google-cloud-bom/pom.xml -->
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -580,7 +588,7 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<version>3.1.0</version>
<configuration>
<archive>
<addMavenDescriptor>true</addMavenDescriptor>
Expand All @@ -606,7 +614,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<version>3.7.0</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<version>3.7.0</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-testing/google-cloud-appengineflexcompat/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<version>3.5.1</version>
<version>3.7.0</version>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${java.source.version}</source>
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-testing/google-cloud-appenginejava8/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<version>3.5.1</version>
<version>3.7.0</version>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${java.source.version}</source>
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-testing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<version>3.7.0</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-util/google-cloud-compat-checker/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<version>3.7.0</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
Expand Down