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

feat!: migrate to java 8 #3189

Merged
merged 1 commit into from
Aug 18, 2021
Merged

feat!: migrate to java 8 #3189

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
6 changes: 6 additions & 0 deletions bigtable-client-core-parent/bigtable-hbase/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,12 @@ limitations under the License.
<artifactId>truth</artifactId>
<version>1.1.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
10 changes: 1 addition & 9 deletions bigtable-dataflow-parent/bigtable-beam-import/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ limitations under the License.
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -279,14 +279,6 @@ limitations under the License.
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>

<plugin>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
18 changes: 1 addition & 17 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>30.1.1-android</version>
<version>30.1.1-jre</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -119,22 +119,6 @@
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${compileSource.1.8}</source>
<target>${compileSource.1.8}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${compileSource.1.8}</source>
<target>${compileSource.1.8}</target>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
6 changes: 6 additions & 0 deletions bigtable-hbase-1.x-parent/bigtable-hbase-1.x/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,12 @@ limitations under the License.
<artifactId>truth</artifactId>
<version>1.1.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
Expand Down
11 changes: 0 additions & 11 deletions bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,17 +153,6 @@ limitations under the License.
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>${compileSource.1.8}</source>
<target>${compileSource.1.8}</target>
<showWarnings>true</showWarnings>
<showDeprecation>false</showDeprecation>
<compilerArgument>-Xlint:-options</compilerArgument>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand Down
10 changes: 0 additions & 10 deletions bigtable-hbase-2.x-parent/bigtable-hbase-2.x-integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,16 +372,6 @@ limitations under the License.
</plugins>
</pluginManagement>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${compileSource.1.8}</source>
<target>${compileSource.1.8}</target>
<showWarnings>true</showWarnings>
<showDeprecation>false</showDeprecation>
<compilerArgument>-Xlint:-options</compilerArgument>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
11 changes: 0 additions & 11 deletions bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,6 @@ limitations under the License.

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>${compileSource.1.8}</source>
<target>${compileSource.1.8}</target>
<showWarnings>true</showWarnings>
<showDeprecation>false</showDeprecation>
<compilerArgument>-Xlint:-options</compilerArgument>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand Down
11 changes: 0 additions & 11 deletions bigtable-hbase-2.x-parent/bigtable-hbase-2.x/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,17 +176,6 @@ limitations under the License.
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>${compileSource.1.8}</source>
<target>${compileSource.1.8}</target>
<showWarnings>true</showWarnings>
<showDeprecation>false</showDeprecation>
<compilerArgument>-Xlint:-options</compilerArgument>
</configuration>
</plugin>
<plugin>
<!-- skip for bigtable-hbase to allow for upcoming refactoring-->
<groupId>org.codehaus.mojo</groupId>
Expand Down
11 changes: 0 additions & 11 deletions bigtable-test/bigtable-build-helper/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,17 +99,6 @@
<version>3.6.0</version>
</plugin>

<!-- Configure java version -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>

<!-- Start Skip publishing -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
4 changes: 2 additions & 2 deletions bigtable-test/bigtable-emulator-maven-plugin/src/it/simple-it/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ limitations under the License.
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
Expand Down
19 changes: 3 additions & 16 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ limitations under the License.
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>0.11.2</version>
<version>1.0.0</version>
</parent>

<licenses>
Expand All @@ -52,11 +52,9 @@ limitations under the License.

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<compileSource>1.7</compileSource>
<compileSource.1.8>1.8</compileSource.1.8>

<!-- core dependency versions -->
<bigtable.version>1.27.3</bigtable.version>
<bigtable.version>2.0.1</bigtable.version>
<bigtable-client-core.version>1.23.0</bigtable-client-core.version>
<grpc-conscrypt.version>2.5.1</grpc-conscrypt.version>
<!-- keeping at this version to align with hbase-->
Expand All @@ -78,7 +76,7 @@ limitations under the License.
<!-- TODO: check if commons-codec was transitively updated to 1.13 and okhttp was updated to 2.7.5 when upgrading-->
<beam.version>2.28.0</beam.version>
<!-- referred from bigtable-beam-import and bigtable-emulator -->
<guava.version>30.1-android</guava.version>
<guava.version>30.1.1-jre</guava.version>
<gcs-guava.version>29.0-jre</gcs-guava.version>
<beam-slf4j.version>1.7.30</beam-slf4j.version>

Expand Down Expand Up @@ -134,17 +132,6 @@ limitations under the License.
</configuration>
</plugin>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>${compileSource}</source>
<target>${compileSource}</target>
<showWarnings>true</showWarnings>
<showDeprecation>false</showDeprecation>
<compilerArgument>-Xlint:-options</compilerArgument>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down