Skip to content

Commit

Permalink
Clean up POMs by using dependency management.
Browse files Browse the repository at this point in the history 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=134069328
  • Loading branch information
@netdpb @ronshapiro
netdpb authored and ronshapiro committed Sep 26, 2016
1 parent 3d228a0 commit d1e3431
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 63 deletions.
12 changes: 3 additions & 9 deletions compiler/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,13 @@
<dependency>
<groupId>com.google.auto.service</groupId>
<artifactId>auto-service</artifactId>
<scope>provided</scope> <!-- to leave out of the all-deps jar -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<scope>provided</scope> <!-- to leave out of the all-deps jar -->
<scope>provided</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -81,9 +80,9 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dagger</artifactId>
<classifier>tests</classifier>
<version>${project.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>com.google.testing.compile</groupId>
Expand All @@ -98,7 +97,6 @@
<dependency>
<groupId>com.squareup</groupId>
<artifactId>javapoet</artifactId>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Expand Down Expand Up @@ -158,10 +156,6 @@
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
<localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
<filterProperties>
<dagger.version>${project.version}</dagger.version>
<dagger.groupId>${project.groupId}</dagger.groupId>
</filterProperties>
<streamLogs>true</streamLogs>
</configuration>
<executions>
Expand Down
6 changes: 2 additions & 4 deletions compiler/src/it/functional-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,12 @@ limitations under the License.
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<version>${auto.value.version}</version>
<scope>provided</scope> <!-- to leave out of the all-deps jar -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.auto.factory</groupId>
<artifactId>auto-factory</artifactId>
<version>${auto.factory.version}</version>
<scope>provided</scope> <!-- to leave out of the all-deps jar -->
<scope>provided</scope>
</dependency>

<dependency>
Expand Down
6 changes: 2 additions & 4 deletions compiler/src/it/guava-functional-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,12 @@ limitations under the License.
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<version>${auto.value.version}</version>
<scope>provided</scope> <!-- to leave out of the all-deps jar -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.auto.factory</groupId>
<artifactId>auto-factory</artifactId>
<version>${auto.factory.version}</version>
<scope>provided</scope> <!-- to leave out of the all-deps jar -->
<scope>provided</scope>
</dependency>

<dependency>
Expand Down
3 changes: 1 addition & 2 deletions compiler/src/it/producers-functional-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ limitations under the License.
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<version>${auto.value.version}</version>
<scope>provided</scope> <!-- to leave out of the all-deps jar -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
3 changes: 0 additions & 3 deletions examples/android-activity-graphs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,10 @@
<dependency>
<groupId>com.google.dagger</groupId>
<artifactId>dagger</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.dagger</groupId>
<artifactId>dagger-compiler</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>

Expand Down
3 changes: 0 additions & 3 deletions examples/android-simple/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,10 @@
<dependency>
<groupId>com.google.dagger</groupId>
<artifactId>dagger</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.dagger</groupId>
<artifactId>dagger-compiler</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>

Expand Down
10 changes: 10 additions & 0 deletions examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@
<artifactId>support-v4</artifactId>
<version>r7</version>
</dependency>
<dependency>
<groupId>com.google.dagger</groupId>
<artifactId>dagger</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.dagger</groupId>
<artifactId>dagger-compiler</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
2 changes: 0 additions & 2 deletions examples/simple/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,10 @@
<dependency>
<groupId>com.google.dagger</groupId>
<artifactId>dagger</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.dagger</groupId>
<artifactId>dagger-compiler</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions gwt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@

<dependencies>
<dependency>
<groupId>com.google.dagger</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>dagger</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.dagger</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>dagger</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
<version>${project.version}</version>
</dependency>
</dependencies>

Expand Down
58 changes: 25 additions & 33 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,6 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- Compilation -->
<javax.inject.version>1</javax.inject.version>
<javax.annotation.version>3.0.1</javax.annotation.version>
<auto.common.version>0.7</auto.common.version>
<auto.factory.version>1.0-beta3</auto.factory.version>
<auto.service.version>1.0-rc2</auto.service.version>
<auto.value.version>1.3</auto.value.version>
<errorprone.version>2.0.12</errorprone.version>
<guava.version>19.0</guava.version>
<google.java.format.version>1.0</google.java.format.version>


<!-- Test Dependencies -->
<compile-testing.version>0.9</compile-testing.version>
<junit.version>4.11</junit.version>
<mockito.version>1.9.5</mockito.version>
<truth.version>0.30</truth.version>
</properties>

<scm>
Expand Down Expand Up @@ -91,72 +73,82 @@
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>${javax.inject.version}</version>
<version>1</version>
</dependency>
<dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject-tck</artifactId>
<version>${javax.inject.version}</version>
<version>1</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>${javax.annotation.version}</version>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
<version>19.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
<version>${guava.version}</version>
<version>19.0</version>
</dependency>
<dependency>
<groupId>com.google.googlejavaformat</groupId>
<artifactId>google-java-format</artifactId>
<version>${google.java.format.version}</version>
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.google.auto</groupId>
<artifactId>auto-common</artifactId>
<version>${auto.common.version}</version>
<version>0.7</version>
</dependency>
<dependency>
<groupId>com.google.auto.factory</groupId>
<artifactId>auto-factory</artifactId>
<version>1.0-beta3</version>
</dependency>
<dependency>
<groupId>com.google.auto.service</groupId>
<artifactId>auto-service</artifactId>
<version>${auto.service.version}</version>
<version>1.0-rc2</version>
</dependency>
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<version>${auto.value.version}</version>
<version>1.3</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>${errorprone.version}</version>
<version>2.0.12</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<version>4.11</version>
</dependency>
<dependency>
<groupId>com.google.testing.compile</groupId>
<artifactId>compile-testing</artifactId>
<version>${compile-testing.version}</version>
<version>0.9</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<version>1.9.5</version>
</dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>${truth.version}</version>
<version>0.30</version>
</dependency>
<dependency>
<groupId>com.squareup</groupId>
<artifactId>javapoet</artifactId>
<version>1.7.0</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down

0 comments on commit d1e3431

Please sign in to comment.