diff options
author | cpovirk <cpovirk@google.com> | 2019-04-29 10:53:39 -0700 |
---|---|---|
committer | Ron Shapiro <shapiro.rd@gmail.com> | 2019-05-05 12:32:25 -0400 |
commit | f3fbb3b232feaf6098ed7cbff8ccaee9a38ab643 (patch) | |
tree | 02127d132e847a3d50abfbfbd7864b025b48e5e8 /service | |
parent | 4158a5fa71f1ef763e683b627f4d29bc04cfde9d (diff) | |
download | auto-f3fbb3b232feaf6098ed7cbff8ccaee9a38ab643.tar.gz |
Stop using auto-parent.
It's released separately from all its children, so any updates we make there don't take effect until we make a release and update the child projects to use that.
This requires pushing various configuration down into the child projects.
Doing so makes the recent attempted update to Truth 0.44 actually take effect.
Also, update Compile-Testing to the newly released version, which actually works with Truth 0.44.
That upgrade exposes that AutoValue was relying on a transitive dependency on Truth8, which was removed in the latest Compile-Testing, so I've added explicit deps.
https://github.com/google/compile-testing/commit/43a513ab14a5b4ab5810a13e14d8cb763546ab5d
Also, I removed an explicit version for compile-testing in the AutoValue functional tests. That explicit version may or may not have been needed before, but it shouldn't be now.
Likely it would make sense to remove more versions explicitly specified elsewhere.
(Additional possible future work: Put deps on other Auto projects (like when AutoService depends on AutoCommon) into <dependencyManagement>.)
Finally, I added some <url> values, since Maven has been generating bogus ones all along (by appending the subproject name to the parent URL, producing URLs something like "https://github.com/google/auto/auto-value").
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=245779060
Diffstat (limited to 'service')
-rw-r--r-- | service/annotations/pom.xml | 1 | ||||
-rw-r--r-- | service/pom.xml | 95 | ||||
-rw-r--r-- | service/processor/pom.xml | 1 |
3 files changed, 95 insertions, 2 deletions
diff --git a/service/annotations/pom.xml b/service/annotations/pom.xml index 4b8b40c6..dbd82d6a 100644 --- a/service/annotations/pom.xml +++ b/service/annotations/pom.xml @@ -31,6 +31,7 @@ <description> Provider-configuration files for ServiceLoader. </description> + <url>https://github.com/google/auto/tree/master/service</url> <scm> <url>http://github.com/google/auto</url> diff --git a/service/pom.xml b/service/pom.xml index c0d1f87a..a6badf3e 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -19,8 +19,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>com.google.auto</groupId> - <artifactId>auto-parent</artifactId> + <groupId>org.sonatype.oss</groupId> + <artifactId>oss-parent</artifactId> <version>7</version> </parent> @@ -32,6 +32,14 @@ Aggregator POM for @AutoService </description> <packaging>pom</packaging> + <url>https://github.com/google/auto/tree/master/service</url> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <java.version>1.8</java.version> + <guava.version>27.0.1-jre</guava.version> + <truth.version>0.44</truth.version> + </properties> <scm> <url>http://github.com/google/auto</url> @@ -40,8 +48,91 @@ <tag>HEAD</tag> </scm> + <issueManagement> + <system>GitHub Issues</system> + <url>http://github.com/google/auto/issues</url> + </issueManagement> + + <licenses> + <license> + <name>Apache 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + </license> + </licenses> + + <organization> + <name>Google LLC</name> + <url>http://www.google.com</url> + </organization> + <modules> <module>annotations</module> <module>processor</module> </modules> + + <dependencyManagement> + <dependencies> + <!-- main dependencies --> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.version}</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava-gwt</artifactId> + <version>${guava.version}</version> + </dependency> + + <!-- test dependencies --> + + <dependency> + <groupId>com.google.testing.compile</groupId> + <artifactId>compile-testing</artifactId> + <version>0.16</version> + </dependency> + <dependency> + <groupId>com.google.truth</groupId> + <artifactId>truth</artifactId> + <version>${truth.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.7.0</version> + <configuration> + <source>${java.version}</source> + <target>${java.version}</target> + <compilerArgument>-Xlint:all</compilerArgument> + <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> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>3.0.2</version> + </plugin> + </plugins> + </pluginManagement> + </build> </project> diff --git a/service/processor/pom.xml b/service/processor/pom.xml index 57fc8658..22fc20e9 100644 --- a/service/processor/pom.xml +++ b/service/processor/pom.xml @@ -31,6 +31,7 @@ <description> Provider-configuration files for ServiceLoader. </description> + <url>https://github.com/google/auto/tree/master/service</url> <scm> <url>http://github.com/google/auto</url> |