diff options
author | dpb <dpb@google.com> | 2017-12-01 08:03:45 -0800 |
---|---|---|
committer | Ron Shapiro <shapiro.rd@gmail.com> | 2017-12-04 22:07:47 -0500 |
commit | 3f4390495b11e2ffa7194117ce5762f7598f3422 (patch) | |
tree | fa6e7c67e984913e8a61d60abdfa64539eab73a0 /factory | |
parent | 3fb0da65dee3eb11e72f68c86a32795c00f75ef2 (diff) | |
download | auto-3f4390495b11e2ffa7194117ce5762f7598f3422.tar.gz |
Use dependency and plugin management from auto-parent v5. Use latest dependencies and plugins for the functional test poms (which don't use auto-parent).
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=177592315
Diffstat (limited to 'factory')
-rw-r--r-- | factory/pom.xml | 40 | ||||
-rw-r--r-- | factory/src/it/functional/pom.xml | 26 |
2 files changed, 23 insertions, 43 deletions
diff --git a/factory/pom.xml b/factory/pom.xml index f1e62c4a..825d680b 100644 --- a/factory/pom.xml +++ b/factory/pom.xml @@ -22,12 +22,12 @@ <parent> <groupId>com.google.auto</groupId> <artifactId>auto-parent</artifactId> - <version>3</version> + <version>5</version> </parent> <groupId>com.google.auto.factory</groupId> <artifactId>auto-factory</artifactId> - <version>1.0-SNAPSHOT</version> + <version>HEAD-SNAPSHOT</version> <name>AutoFactory</name> <description> JSR-330-compatible factories. @@ -44,62 +44,54 @@ <dependency> <groupId>com.google.auto</groupId> <artifactId>auto-common</artifactId> - <version>0.6</version> + <version>0.8</version> </dependency> <dependency> <groupId>com.google.auto.value</groupId> <artifactId>auto-value</artifactId> - <version>1.1</version> + <version>1.5.2</version> </dependency> <dependency> <groupId>com.google.auto.service</groupId> <artifactId>auto-service</artifactId> - <version>1.0-rc2</version> + <version>1.0-rc3</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.google.googlejavaformat</groupId> <artifactId>google-java-format</artifactId> - <version>1.1</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>19.0</version> </dependency> <dependency> <groupId>com.squareup</groupId> <artifactId>javapoet</artifactId> - <version>1.7.0</version> </dependency> <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> - <version>1</version> </dependency> <!-- test dependencies --> <dependency> <groupId>com.google.testing.compile</groupId> <artifactId>compile-testing</artifactId> - <version>0.9</version> <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> <scope>test</scope> </dependency> <dependency> <groupId>com.google.truth</groupId> <artifactId>truth</artifactId> - <version>0.28</version> <scope>test</scope> </dependency> <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> - <version>1.3.9</version> <scope>test</scope> </dependency> </dependencies> @@ -107,32 +99,12 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.6</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-invoker-plugin</artifactId> - <configuration> - <addTestClassPath>true</addTestClassPath> - <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> - <filterProperties> - <auto.version>${project.version}</auto.version> - </filterProperties> - <pomIncludes> - <pomInclude>*/pom.xml</pomInclude> - </pomIncludes> - <streamLogs>true</streamLogs> - </configuration> - <executions> - <execution> - <id>integration-test</id> - <goals> - <goal>install</goal> - <goal>run</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build> diff --git a/factory/src/it/functional/pom.xml b/factory/src/it/functional/pom.xml index b411a84d..27864811 100644 --- a/factory/src/it/functional/pom.xml +++ b/factory/src/it/functional/pom.xml @@ -26,33 +26,33 @@ <dependency> <groupId>com.google.auto.factory</groupId> <artifactId>auto-factory</artifactId> - <version>@auto.version@</version> + <version>@project.version@</version> </dependency> <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> - <version>1.3.9</version> + <version>3.0.2</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>19.0</version> + <version>23.4-jre</version> </dependency> <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> - <version>4.0</version> + <version>4.1.0</version> </dependency> <dependency> <groupId>com.google.dagger</groupId> <artifactId>dagger</artifactId> - <version>2.4</version> + <version>2.13</version> </dependency> <dependency> <groupId>com.google.dagger</groupId> <artifactId>dagger-compiler</artifactId> - <version>2.4</version> + <version>2.13</version> <optional>true</optional> </dependency> <dependency> @@ -64,7 +64,7 @@ <dependency> <groupId>com.google.truth</groupId> <artifactId>truth</artifactId> - <version>0.28</version> + <version>0.36</version> <scope>test</scope> </dependency> </dependencies> @@ -72,13 +72,14 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.6</version> + <version>3.0.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> + <version>3.7.0</version> <configuration> <source>1.6</source> <target>1.6</target> @@ -86,6 +87,13 @@ <showWarnings>true</showWarnings> <showDeprecation>true</showDeprecation> </configuration> + <dependencies> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-java</artifactId> + <version>0.9.4</version> + </dependency> + </dependencies> </plugin> </plugins> </build> |