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 
…#78)
  • Loading branch information
@yangnuoyu
yangnuoyu committed Jun 23, 2020
1 parent dc69b60 commit 06deac6
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 79 deletions.
4 changes: 3 additions & 1 deletion .gitignore
View file
Expand Up @@ -12,4 +12,6 @@ target/

# python utilities
*.pyc
__pycache__
__pycache__

.flattened-pom.xml
9 changes: 9 additions & 0 deletions google-cloud-securitycenter-settings/pom.xml
View file
Expand Up @@ -98,4 +98,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-securitycenter-settings-v1beta1/pom.xml
View file
Expand Up @@ -53,4 +53,13 @@
</dependencies>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
73 changes: 5 additions & 68 deletions pom.xml
View file
Expand Up @@ -63,17 +63,6 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<github.global.server>github</github.global.server>
<site.installationModule>google-cloud-securitycenter-settings-parent</site.installationModule>
<google.core.version>1.91.1</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>
<gax.version>1.57.0</gax.version>
<grpc.version>1.30.0</grpc.version>
<protobuf.version>3.12.2</protobuf.version>
<junit.version>4.13</junit.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>
</properties>

<dependencyManagement>
Expand All @@ -95,69 +84,17 @@
</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>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>0.8.1</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>
</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>
<version>4.13</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -247,7 +184,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-securitycenter-settings-v1beta1/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>
3 changes: 0 additions & 3 deletions samples/install-without-bom/pom.xml
View file
Expand Up @@ -25,13 +25,11 @@


<dependencies>
<!-- [START securitycenter-settings_install_without_bom] -->
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-securitycenter-settings</artifactId>
<version>0.2.0</version>
</dependency>
<!-- [END securitycenter-settings_install_with_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
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::current} -->
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-securitycenter-settings</artifactId>
<version>0.2.0</version>
<version>0.2.1-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
5 changes: 2 additions & 3 deletions samples/snippets/pom.xml
View file
Expand Up @@ -23,8 +23,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>


<!-- [START securitycenter-settings_install_with_bom] -->
<dependencyManagement>
<dependencies>
<dependency>
Expand All @@ -41,8 +39,9 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-securitycenter-settings</artifactId>
<!-- TODO: REMOVE VERSION SPECIFIED BELOW WHEN THE CLIENT GOES GA-->
<version>0.2.0</version>
</dependency>
<!-- [END securitycenter-settings_install_with_bom] -->

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

0 comments on commit 06deac6

Please sign in to comment.