Skip to content
This repository has been archived by the owner on Oct 14, 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 
…#220)
  • Loading branch information
@yangnuoyu
yangnuoyu committed Jun 19, 2020
1 parent d1f4972 commit e2af685
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 103 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Expand Up @@ -13,3 +13,5 @@ target/
# python utilities
*.pyc
__pycache__

.flattened-pom.xml
9 changes: 9 additions & 0 deletions google-cloud-translate/pom.xml
View file
Expand Up @@ -145,4 +145,13 @@
</dependencies>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
9 changes: 9 additions & 0 deletions grpc-google-cloud-translate-v3/pom.xml
View file
Expand Up @@ -57,4 +57,13 @@
</dependencies>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
9 changes: 9 additions & 0 deletions grpc-google-cloud-translate-v3beta1/pom.xml
View file
Expand Up @@ -57,4 +57,13 @@
</dependencies>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
109 changes: 6 additions & 103 deletions pom.xml
View file
Expand Up @@ -63,21 +63,6 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<github.global.server>github</github.global.server>
<site.installationModule>google-cloud-translate-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.18.0</google.common-protos.version>
<google.auth.version>0.20.0</google.auth.version>
<google.http-client.version>1.35.0</google.http-client.version>
<gax.version>1.56.0</gax.version>
<grpc.version>1.30.0</grpc.version>
<protobuf.version>3.12.2</protobuf.version>
<junit.version>4.13</junit.version>
<easymock.version>3.6</easymock.version>
<guava.version>29.0-android</guava.version>
<threeten.version>1.4.4</threeten.version>
<javax.annotations.version>1.3.2</javax.annotations.version>
<animal-sniffer.version>1.18</animal-sniffer.version>
<translate-http-client.version>v2-rev20170525-1.30.9</translate-http-client.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -108,111 +93,29 @@
<version>1.94.6-SNAPSHOT</version><!-- {x-version-update:google-cloud-translate: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.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.http-client</groupId>
<artifactId>google-http-client-bom</artifactId>
<version>${google.http-client.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
<version>${protobuf.version}</version>
<type>pom</type>
<scope>import</scope>
</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>
</dependency>
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-translate</artifactId>
<version>${translate-http-client.version}</version>
<version>v2-rev20170525-1.30.9</version>
</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>
<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>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
<type>test-jar</type>
<version>${google.core.version}</version>
<version>3.6</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -304,7 +207,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
9 changes: 9 additions & 0 deletions proto-google-cloud-translate-v3/pom.xml
View file
Expand Up @@ -30,4 +30,13 @@
<artifactId>guava</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-translate-v3beta1/pom.xml
View file
Expand Up @@ -30,4 +30,13 @@
<artifactId>guava</artifactId>
</dependency>
</dependencies>

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

0 comments on commit e2af685

Please sign in to comment.