Skip to content

Commit

Permalink
feat: add flatten plugin to client and proto modules (#108)
Browse files Browse the repository at this point in the history
  • Loading branch information
stephaniewang526 authored Apr 24, 2020
1 parent df23adf commit fb3566d
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ target/
*.iml
__pycache__/

.flattened-pom.xml
9 changes: 9 additions & 0 deletions google-cloud-datastore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,13 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
6 changes: 0 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -253,17 +253,11 @@
<artifactId>google-oauth-client</artifactId>
<version>1.30.6</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>junit</groupId>
Expand Down
11 changes: 11 additions & 0 deletions proto-google-cloud-datastore-v1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@
<scope>compile</scope>
</dependency>
</dependencies>

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

<profiles>
<profile>
<id>java9</id>
Expand All @@ -34,6 +44,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotations.version}</version>
</dependency>
</dependencies>
</profile>
Expand Down

0 comments on commit fb3566d

Please sign in to comment.