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

feat(deps): adopt flatten plugin and google-cloud-shared-dependencies #89

Merged
merged 1 commit into from Jun 23, 2020
Merged

feat(deps): adopt flatten plugin and google-cloud-shared-dependencies #89

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Expand Up @@ -42,4 +42,6 @@ api_key
# Python utilities
*.pyc
artman-genfiles
venv
venv

.flattened-pom.xml
70 changes: 13 additions & 57 deletions pom.xml
View file
Open in desktop
Expand Up @@ -58,64 +58,13 @@
</licenses>
<properties>
<site.installationModule>google-cloud-notification</site.installationModule>
<junit.version>4.13</junit.version>
<grpc.version>1.27.0</grpc.version>
<google.api-common.version>1.9.2</google.api-common.version>
<api-client.version>1.30.9</api-client.version>
<google.core.version>1.92.4</google.core.version>
<guava.version>29.0-android</guava.version>
<gax.version>1.53.1</gax.version>
<google.auth.version>0.20.0</google.auth.version>
<http-client-bom.version>1.35.0</http-client-bom.version>
</properties>
<dependencyManagement>
<dependencies>
<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-client</groupId>
<artifactId>google-api-client-bom</artifactId>
<version>${api-client.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.api</groupId>
<artifactId>gax-bom</artifactId>
<version>${gax.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-bom</artifactId>
<version>${http-client-bom.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>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-bom</artifactId>
<version>${guava.version}</version>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>0.8.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -145,7 +94,6 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-iam-v1</artifactId>
<version>0.13.0</version>
</dependency>
<dependency>
<groupId>com.google.apis</groupId>
Expand All @@ -155,7 +103,6 @@
<dependency>
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
<version>${google.api-common.version}</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
Expand All @@ -171,7 +118,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<version>${junit.version}</version>
<version>4.13</version>
</dependency>
</dependencies>
<reporting>
Expand Down Expand Up @@ -237,10 +184,19 @@
<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>
</plugins>
</reporting>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
3 changes: 0 additions & 3 deletions samples/install-without-bom/pom.xml
View file
Open in desktop
Expand Up @@ -25,13 +25,11 @@


<dependencies>
<!-- [START notification_install_without_bom] -->
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-notification</artifactId>
<version>0.120.2-beta</version>
</dependency>
<!-- [END notification_install_without_bom] -->

<dependency>
<groupId>junit</groupId>
Expand All @@ -47,7 +45,6 @@
</dependency>
</dependencies>

<!-- compile and run all snippet tests -->
<build>
<plugins>
<plugin>
Expand Down
7 changes: 3 additions & 4 deletions samples/snapshot/pom.xml
View file
Open in desktop
Expand Up @@ -23,13 +23,14 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<!-- {x-version-update-start::current} -->
<dependencies>
<!-- {x-version-update-start:google-cloud-notification:current} -->
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-notification</artifactId>
<version></version>
<version>0.120.3-beta-SNAPSHOT</version>
</dependency>
<!-- {x-version-update-end} -->

<dependency>
<groupId>junit</groupId>
Expand All @@ -44,9 +45,7 @@
<scope>test</scope>
</dependency>
</dependencies>
<!-- {x-version-update-end} -->

<!-- compile and run all snippet tests -->
<build>
<plugins>
<plugin>
Expand Down
7 changes: 3 additions & 4 deletions samples/snippets/pom.xml
View file
Open in desktop
Expand Up @@ -23,14 +23,12 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>


<!-- [START notification_install_with_bom] -->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version></version>
<version>7.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -41,8 +39,9 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-notification</artifactId>
<!-- TODO: REMOVE VERSION SPECIFIED BELOW WHEN THE CLIENT GOES GA-->
<version>0.120.3-beta-SNAPSHOT</version>
</dependency>
<!-- [END notification_install_with_bom] -->

<dependency>
<groupId>junit</groupId>
Expand Down