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): adopt flatten plugin and google-cloud-shared-dependencies #259

Merged
merged 1 commit into from Jun 22, 2020
+28 −14
Merged

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

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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Expand Up @@ -40,3 +40,5 @@ api_key
# Python utilities
*.pyc
artman-genfiles

.flattened-pom.xml
9 changes: 6 additions & 3 deletions google-cloud-pubsub/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand All @@ -181,7 +185,6 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotations.version}</version>
</dependency>
</dependencies>
</profile>
Expand Down
9 changes: 9 additions & 0 deletions grpc-google-cloud-pubsub-v1/pom.xml
View file
Open in desktop
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>
13 changes: 2 additions & 11 deletions pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down Expand Up @@ -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 -->
Expand All @@ -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>
Expand Down
9 changes: 9 additions & 0 deletions proto-google-cloud-pubsub-v1/pom.xml
View file
Open in desktop
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>