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

deps: fix dependency build #2305

Merged
merged 18 commits into from
Dec 14, 2019
Merged

deps: fix dependency build #2305

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
fa240c2
deps: fix dependency build
kolea2 Dec 10, 2019
72f6fb4
deps: fix dependency build
kolea2 Dec 10, 2019
1553968
deps: fix dependency build
kolea2 Dec 10, 2019
28cbebd
deps: fix dependency build
kolea2 Dec 10, 2019
965dc00
clean up version numbers
kolea2 Dec 10, 2019
e590047
feedback 1
kolea2 Dec 11, 2019
d91389a
feedback 2
kolea2 Dec 12, 2019
2e47270
build: fix IT tests
kolea2 Dec 12, 2019
2ed7686
fix tests
kolea2 Dec 13, 2019
1f4fdf2
fix tests
kolea2 Dec 13, 2019
4f098b4
fix tests
kolea2 Dec 13, 2019
dbecab2
fix tests
kolea2 Dec 13, 2019
03d4968
alphabetize/regroup dependencies
kolea2 Dec 13, 2019
ecc2014
feedback 3
kolea2 Dec 13, 2019
47b9fee
feedback 4
kolea2 Dec 13, 2019
a189204
feedback 5
kolea2 Dec 13, 2019
d27f733
feedback 6
kolea2 Dec 13, 2019
e9a1d14
feedback 7
kolea2 Dec 13, 2019
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
3 changes: 1 addition & 2 deletions .kokoro/dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,4 @@ echo $JOB_TYPE

export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"

mvn install -DskipTests=true -B -V
mvn -B dependency:analyze -DfailOnWarning=true
mvn -B -V clean install -DskipTests=true dependency:analyze -DfailOnWarning=true
36 changes: 31 additions & 5 deletions bigtable-client-core-parent/bigtable-client-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ limitations under the License.
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-iam-v1</artifactId>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
</dependency>

<!-- Common -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
Expand All @@ -100,10 +105,23 @@ limitations under the License.
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax</artifactId>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>
<version>1.4.0</version>
</dependency>

<!-- Auth -->
<dependency>
Expand Down Expand Up @@ -242,16 +260,17 @@ limitations under the License.
<version>2.10.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand All @@ -267,6 +286,13 @@ limitations under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<usedDependencies>commons-codec:commons-codec,io.grpc:grpc-alts</usedDependencies>
</configuration>
</plugin>
</plugins>
</build>
</project>
Expand Down
54 changes: 53 additions & 1 deletion bigtable-client-core-parent/bigtable-hbase-integration-tests-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,67 @@ limitations under the License.
</description>

<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>12.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>2.5.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons-lang.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<version>${hbase.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-testing-util</artifactId>
<artifactId>hbase-common</artifactId>
<version>${hbase.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-protocol</artifactId>
<version>${hbase.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
<version>1.4.10</version>
<classifier>tests</classifier>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>

Expand Down
9 changes: 1 addition & 8 deletions ...base-integration-tests-common/src/test/java/com/google/cloud/bigtable/hbase/TestScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import static com.google.cloud.bigtable.hbase.test_env.SharedTestEnvRule.COLUMN_FAMILY;
import static com.google.cloud.bigtable.hbase.test_env.SharedTestEnvRule.COLUMN_FAMILY2;

import com.google.protobuf.ByteString;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
Expand All @@ -32,7 +31,6 @@
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Assert;
import org.junit.Test;

Expand Down Expand Up @@ -300,12 +298,7 @@ public void testStartEndEquals() throws IOException {
Result result = resultScanner.next();
Assert.assertNotNull(result);
Cell cell = result.getColumnCells(COLUMN_FAMILY, qualifier).get(0);
Assert.assertTrue(
Bytes.equals(
value,
ByteString.copyFrom(
cell.getValueArray(), cell.getValueOffset(), cell.getValueLength())
.toByteArray()));
Assert.assertArrayEquals(value, CellUtil.cloneValue(cell));
}
}

Expand Down
65 changes: 60 additions & 5 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 @@ -64,16 +64,66 @@ limitations under the License.
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>

<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigtable</artifactId>
</dependency>

<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-bigtable-v2</artifactId>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-credentials</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax</artifactId>
<version>1.48.1</version>
</dependency>
<dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-api</artifactId>
</dependency>
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>
<version>${threeten.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>${jsr305.version}</version>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
</dependency>

<!-- TODO: remove this is direct dep, its only used for its Clock interface -->
<dependency>
<groupId>com.google.http-client</groupId>
Expand All @@ -92,7 +142,6 @@ limitations under the License.
</exclusions>
</dependency>


<!-- Test -->
<dependency>
<groupId>junit</groupId>
Expand All @@ -112,5 +161,11 @@ limitations under the License.
<version>2.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.1</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
97 changes: 0 additions & 97 deletions ...e-parent/bigtable-hbase/src/test/java/com/google/cloud/bigtable/hbase/PutAdapterPerf.java
View file
Open in desktop

This file was deleted.

Loading