Skip to content

Commit

Permalink
feat: use shared-dependencies bom and add flatten to grpc and proto m…
Browse files Browse the repository at this point in the history 
…odules (#186)
  • Loading branch information
@stephaniewang526
stephaniewang526 committed Apr 17, 2020
1 parent 321d1df commit 532a698
Show file tree
Hide file tree
Showing 11 changed files with 89 additions and 91 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ target/
# python utilities
*.pyc
__pycache__

.flattened-pom.xml
3 changes: 0 additions & 3 deletions google-cloud-bigquerystorage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,10 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigquery</artifactId>
<version>1.110.1</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand All @@ -157,7 +155,6 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
<version>${google.core.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
Expand Down
9 changes: 9 additions & 0 deletions grpc-google-cloud-bigquerystorage-v1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>java9</id>
Expand Down
9 changes: 9 additions & 0 deletions grpc-google-cloud-bigquerystorage-v1alpha2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>java9</id>
Expand Down
9 changes: 9 additions & 0 deletions grpc-google-cloud-bigquerystorage-v1beta1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>java9</id>
Expand Down
9 changes: 9 additions & 0 deletions grpc-google-cloud-bigquerystorage-v1beta2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>java9</id>
Expand Down
103 changes: 15 additions & 88 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,7 @@
<project.protobuf-java.version>3.11.4</project.protobuf-java.version>
<github.global.server>github</github.global.server>
<site.installationModule>google-cloud-bigquerystorage-parent</site.installationModule>
<google.core.version>1.93.4</google.core.version>
<google.api-common.version>1.9.0</google.api-common.version>
<google.common-protos.version>1.17.0</google.common-protos.version>
<gax.version>1.56.0</gax.version>
<auto-value-annotations.version>1.7</auto-value-annotations.version>
<jackson-core.version>2.10.3</jackson-core.version>
<grpc.version>1.28.1</grpc.version>
<protobuf.version>3.11.4</protobuf.version>
<junit.version>4.13</junit.version>
<guava.version>29.0-android</guava.version>
<threeten.version>1.4.3</threeten.version>
<javax.annotations.version>1.3.2</javax.annotations.version>
<animal-sniffer.version>1.18</animal-sniffer.version>
<commons-lang3.version>3.5</commons-lang3.version>
</properties>

Expand All @@ -100,6 +88,18 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>0.1.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigquery</artifactId>
<version>1.110.1</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-bigquerystorage-v1alpha2</artifactId>
Expand All @@ -120,7 +120,6 @@
<artifactId>proto-google-cloud-bigquerystorage-v1</artifactId>
<version>0.94.0</version><!-- {x-version-update:proto-google-cloud-bigquerystorage-v1:current} -->
</dependency>

<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-bigquerystorage-v1alpha2</artifactId>
Expand All @@ -141,93 +140,21 @@
<artifactId>grpc-google-cloud-bigquerystorage-v1</artifactId>
<version>0.94.0</version><!-- {x-version-update:grpc-google-cloud-bigquerystorage-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value-annotations</artifactId>
<version>${auto-value-annotations.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-core.version}</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigquerystorage</artifactId>
<version>0.129.0-beta</version><!-- {x-version-update:google-cloud-bigquerystorage:current} -->
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>${grpc.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-bom</artifactId>
<version>${gax.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-bom</artifactId>
<version>${guava.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
<version>${google.api-common.version}</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
<version>${google.common-protos.version}</version>
</dependency>
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>
<version>${threeten.version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotations.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-annotations</artifactId>
<version>${animal-sniffer.version}</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-core.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-grpc</artifactId>
<version>${gax.version}</version>
<classifier>testlib</classifier>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
9 changes: 9 additions & 0 deletions proto-google-cloud-bigquerystorage-v1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,13 @@
<artifactId>proto-google-common-protos</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
9 changes: 9 additions & 0 deletions proto-google-cloud-bigquerystorage-v1alpha2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,13 @@
<artifactId>proto-google-common-protos</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
9 changes: 9 additions & 0 deletions proto-google-cloud-bigquerystorage-v1beta1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,13 @@
<artifactId>proto-google-common-protos</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
9 changes: 9 additions & 0 deletions proto-google-cloud-bigquerystorage-v1beta2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,13 @@
<artifactId>proto-google-common-protos</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>

0 comments on commit 532a698

Please sign in to comment.