Skip to content
This repository has been archived by the owner on Sep 16, 2023. It is now read-only.

Commit

Permalink
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (
Browse files Browse the repository at this point in the history
  • Loading branch information
yangnuoyu committed Jun 18, 2020
1 parent ce5ff2e commit 3fb794a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 56 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Expand Up @@ -42,4 +42,6 @@ api_key
# Python utilities
*.pyc
artman-genfiles
venv
venv

.flattened-pom.xml
68 changes: 13 additions & 55 deletions pom.xml
Expand Up @@ -63,67 +63,21 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<github.global.server>github</github.global.server>
<site.installationModule>google-cloud-dns-parent</site.installationModule>
<google.core.version>1.93.5</google.core.version>
<google.api-common.version>1.9.2</google.api-common.version>
<google.common-protos.version>1.17.0</google.common-protos.version>
<google.auth.version>0.20.0</google.auth.version>
<gax.version>1.56.0</gax.version>
<junit.version>4.13</junit.version>
<guava.version>29.0-android</guava.version>
<threeten.version>1.4.4</threeten.version>
<animal-sniffer.version>1.18</animal-sniffer.version>
<easymock.version>3.6</easymock.version>
<errorprone.version>2.3.4</errorprone.version>
</properties>

<dependencyManagement>
<dependencies>
<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.http-client</groupId>
<artifactId>google-http-client-bom</artifactId>
<version>1.35.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client-bom</artifactId>
<version>1.30.9</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core-bom</artifactId>
<version>${google.core.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-bom</artifactId>
<version>${google.auth.version}</version>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>0.8.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>${errorprone.version}</version>
<version>2.3.4</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down Expand Up @@ -169,31 +123,28 @@
<dependency>
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
<version>${google.api-common.version}</version>
</dependency>
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>
<version>${threeten.version}</version>
</dependency>

<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
<version>${google.core.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<version>4.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>${easymock.version}</version>
<version>3.6</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -210,6 +161,13 @@
</plugin>
</plugins>
</pluginManagement>

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

<reporting>
Expand Down Expand Up @@ -275,7 +233,7 @@
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
<link>https://googleapis.dev/java/gax/latest/</link>
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
<link>https://googleapis.github.io/api-common-java/</link>
</links>
</configuration>
</plugin>
Expand Down

0 comments on commit 3fb794a

Please sign in to comment.