Skip to content
Permalink
Browse files
feat(deps): adopt flatten plugin and google-cloud-shared-dependencies (
  • Loading branch information
yangnuoyu committed Jun 22, 2020
1 parent ec7b3fa commit 6b0947b0c142691a16190b7d15da136936517e5a
Showing with 28 additions and 14 deletions.
  1. +2 −0 .gitignore
  2. +6 −3 google-cloud-pubsub/pom.xml
  3. +9 −0 grpc-google-cloud-pubsub-v1/pom.xml
  4. +2 −11 pom.xml
  5. +9 −0 proto-google-cloud-pubsub-v1/pom.xml
@@ -40,3 +40,5 @@ api_key
# Python utilities
*.pyc
artman-genfiles

.flattened-pom.xml
@@ -85,7 +85,6 @@
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value-annotations</artifactId>
<version>${autovalue.version}</version>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
@@ -163,11 +162,16 @@
<path>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<version>${autovalue.version}</version>
<version>${auto-value-annotation.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>

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

@@ -181,7 +185,6 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotations.version}</version>
</dependency>
</dependencies>
</profile>
@@ -53,4 +53,13 @@
</dependencies>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
13 pom.xml
@@ -63,10 +63,6 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<github.global.server>github</github.global.server>
<site.installationModule>google-cloud-pubsub-parent</site.installationModule>
<easymock.version>4.2</easymock.version>
<javax.annotations.version>1.3.2</javax.annotations.version>
<errorprone.version>2.4.0</errorprone.version>
<autovalue.version>1.7.3</autovalue.version>
</properties>

<dependencyManagement>
@@ -95,15 +91,10 @@
<version>1.107.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
</dependency>

<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotations.version}</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>${errorprone.version}</version>
<version>2.4.0</version>
</dependency>

<!-- Test dependencies -->
@@ -116,7 +107,7 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>${easymock.version}</version>
<version>4.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -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 6b0947b

Please sign in to comment.