Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(deps): import shared-dependencies bom and use maven-flatten-plugin #172

Merged
merged 4 commits into from Apr 26, 2020
Merged

feat(deps): import shared-dependencies bom and use maven-flatten-plugin #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
acdc9a0
feat(deps): import shared-dependencies bom and use maven-flatten-plugin
chingor13 Apr 22, 2020
d20db77
flatten google-cloud-spanner pom.xml
chingor13 Apr 22, 2020
f68a22f
update to v0.2.0 of shared-dependencies
chingor13 Apr 22, 2020
d098bc9
fix: add exclude for m2e to prevent build errors in Eclipse
olavloite Apr 24, 2020
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Expand Up @@ -28,3 +28,5 @@ docs/

# Python utilities
*.pyc

.flattened-pom.xml
5 changes: 5 additions & 0 deletions google-cloud-spanner/pom.xml
View file
Open in desktop
Expand Up @@ -94,6 +94,11 @@
</execution>
</executions>
</plugin>
<plugin>
<?m2e ignore?>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
<pluginManagement>
<plugins>
Expand Down
10 changes: 10 additions & 0 deletions grpc-google-cloud-spanner-admin-database-v1/pom.xml
View file
Open in desktop
Expand Up @@ -61,4 +61,14 @@
</dependencies>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<?m2e ignore?>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
10 changes: 10 additions & 0 deletions grpc-google-cloud-spanner-admin-instance-v1/pom.xml
View file
Open in desktop
Expand Up @@ -61,4 +61,14 @@
</dependencies>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<?m2e ignore?>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
10 changes: 10 additions & 0 deletions grpc-google-cloud-spanner-v1/pom.xml
View file
Open in desktop
Expand Up @@ -53,4 +53,14 @@
</dependencies>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<?m2e ignore?>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
126 changes: 3 additions & 123 deletions pom.xml
View file
Open in desktop
Expand Up @@ -63,18 +63,6 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<github.global.server>github</github.global.server>
<site.installationModule>google-cloud-spanner-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>
<grpc.version>1.29.0</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>
<opencensus.version>0.26.0</opencensus.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -115,121 +103,13 @@
<version>1.53.0</version><!-- {x-version-update:google-cloud-spanner: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>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>0.2.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-bom</artifactId>
<version>0.20.0</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.http-client</groupId>
<artifactId>google-http-client-bom</artifactId>
<version>1.34.2</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>com.google.api.grpc</groupId>
<artifactId>grpc-google-common-protos</artifactId>
<version>${google.common-protos.version}</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-iam-v1</artifactId>
<version>0.13.0</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>io.opencensus</groupId>
<artifactId>opencensus-api</artifactId>
<version>${opencensus.version}</version>
</dependency>
<dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-contrib-grpc-util</artifactId>
<version>${opencensus.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>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>1.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -307,7 +187,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/1.8.1/apidocs/</link>
</links>
</configuration>
</plugin>
Expand Down
10 changes: 10 additions & 0 deletions proto-google-cloud-spanner-admin-database-v1/pom.xml
View file
Open in desktop
Expand Up @@ -34,4 +34,14 @@
<artifactId>proto-google-iam-v1</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<?m2e ignore?>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
10 changes: 10 additions & 0 deletions proto-google-cloud-spanner-admin-instance-v1/pom.xml
View file
Open in desktop
Expand Up @@ -34,4 +34,14 @@
<artifactId>proto-google-iam-v1</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<?m2e ignore?>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
10 changes: 10 additions & 0 deletions proto-google-cloud-spanner-v1/pom.xml
View file
Open in desktop
Expand Up @@ -30,4 +30,14 @@
<artifactId>guava</artifactId>
</dependency>
</dependencies>

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