Separate AutoService annotations and processor

Fixes https://github.com/google/auto/issues/632

RELNOTES=`@AutoService` now has a separate artifact (`auto-service-annotations`) separate from the annotation processor (still `auto-service`)

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219696198

21 files changed, 161 insertions, 49 deletions

diff --git a/service/annotations/pom.xml b/service/annotations/pom.xml
new file mode 100644
index 00000000..7d9fc533
--- /dev/null
+++ b/service/annotations/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (C) 2013 Google, Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.google.auto</groupId>
+    <artifactId>auto-parent</artifactId>
+    <version>6</version>
+  </parent>
+
+  <groupId>com.google.auto.service</groupId>
+  <artifactId>auto-service-annotations</artifactId>
+  <version>HEAD-SNAPSHOT</version>
+  <name>AutoService</name>
+  <description>
+    Provider-configuration files for ServiceLoader.
+  </description>
+
+  <scm>
+    <url>http://github.com/google/auto</url>
+    <connection>scm:git:git://github.com/google/auto.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/google/auto.git</developerConnection>
+    <tag>HEAD</tag>
+  </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <!-- disable processing because the definition in META-INF/services breaks javac -->
+          <compilerArgument>-proc:none</compilerArgument>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/service/src/main/java/com/google/auto/service/AutoService.java b/service/annotations/src/main/java/com/google/auto/service/AutoService.java
index 5fd44a65..5fd44a65 100644
--- a/service/src/main/java/com/google/auto/service/AutoService.java
+++ b/service/annotations/src/main/java/com/google/auto/service/AutoService.java
diff --git a/service/pom.xml b/service/pom.xml
index ed7187e0..1415ca66 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -25,12 +25,13 @@
   </parent>
 
   <groupId>com.google.auto.service</groupId>
-  <artifactId>auto-service</artifactId>
+  <artifactId>auto-service-aggregator</artifactId>
   <version>HEAD-SNAPSHOT</version>
-  <name>AutoService</name>
+  <name>AutoService Aggregator</name>
   <description>
-    Provider-configuration files for ServiceLoader.
+    Aggregator POM for @AutoService
   </description>
+  <packaging>pom</packaging>
 
   <scm>
     <url>http://github.com/google/auto</url>
@@ -39,50 +40,8 @@
     <tag>HEAD</tag>
   </scm>
 
-  <dependencies>
-    <dependency>
-      <groupId>com.google.auto</groupId>
-      <artifactId>auto-common</artifactId>
-      <version>0.10</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-    <!-- test dependencies -->
-    <dependency>
-      <groupId>com.google.testing.compile</groupId>
-      <artifactId>compile-testing</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <!-- disable processing because the definition in META-INF/services breaks javac -->
-          <compilerArgument>-proc:none</compilerArgument>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+  <modules>
+    <module>annotations</module>
+    <module>processor</module>
+  </modules>
 </project>
diff --git a/service/processor/pom.xml b/service/processor/pom.xml
new file mode 100644
index 00000000..341b2087
--- /dev/null
+++ b/service/processor/pom.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (C) 2013 Google, Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.google.auto</groupId>
+    <artifactId>auto-parent</artifactId>
+    <version>6</version>
+  </parent>
+
+  <groupId>com.google.auto.service</groupId>
+  <artifactId>auto-service</artifactId>
+  <version>HEAD-SNAPSHOT</version>
+  <name>AutoService Processor</name>
+  <description>
+    Provider-configuration files for ServiceLoader.
+  </description>
+
+  <scm>
+    <url>http://github.com/google/auto</url>
+    <connection>scm:git:git://github.com/google/auto.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/google/auto.git</developerConnection>
+    <tag>HEAD</tag>
+  </scm>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.auto.service</groupId>
+      <artifactId>auto-service-annotations</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.auto</groupId>
+      <artifactId>auto-common</artifactId>
+      <version>0.10</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>com.google.testing.compile</groupId>
+      <artifactId>compile-testing</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <!-- disable processing because the definition in META-INF/services breaks javac -->
+          <compilerArgument>-proc:none</compilerArgument>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/service/src/main/java/com/google/auto/service/processor/AutoServiceProcessor.java b/service/processor/src/main/java/com/google/auto/service/processor/AutoServiceProcessor.java
index 4bd7ceca..4bd7ceca 100644
--- a/service/src/main/java/com/google/auto/service/processor/AutoServiceProcessor.java
+++ b/service/processor/src/main/java/com/google/auto/service/processor/AutoServiceProcessor.java
diff --git a/service/src/main/java/com/google/auto/service/processor/ServicesFiles.java b/service/processor/src/main/java/com/google/auto/service/processor/ServicesFiles.java
index c43200ab..c43200ab 100644
--- a/service/src/main/java/com/google/auto/service/processor/ServicesFiles.java
+++ b/service/processor/src/main/java/com/google/auto/service/processor/ServicesFiles.java
diff --git a/service/src/main/java/com/google/auto/service/processor/package-info.java b/service/processor/src/main/java/com/google/auto/service/processor/package-info.java
index 233f37cf..233f37cf 100644
--- a/service/src/main/java/com/google/auto/service/processor/package-info.java
+++ b/service/processor/src/main/java/com/google/auto/service/processor/package-info.java
diff --git a/service/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/service/processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor
index a4406e1d..a4406e1d 100644
--- a/service/src/main/resources/META-INF/services/javax.annotation.processing.Processor
+++ b/service/processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor
diff --git a/service/src/test/java/com/google/auto/service/processor/AutoServiceProcessorTest.java b/service/processor/src/test/java/com/google/auto/service/processor/AutoServiceProcessorTest.java
index 6b5e1cfa..6b5e1cfa 100644
--- a/service/src/test/java/com/google/auto/service/processor/AutoServiceProcessorTest.java
+++ b/service/processor/src/test/java/com/google/auto/service/processor/AutoServiceProcessorTest.java
diff --git a/service/src/test/resources/META-INF/services/test.AnotherService b/service/processor/src/test/resources/META-INF/services/test.AnotherService
index 7453e4da..7453e4da 100644
--- a/service/src/test/resources/META-INF/services/test.AnotherService
+++ b/service/processor/src/test/resources/META-INF/services/test.AnotherService
diff --git a/service/src/test/resources/META-INF/services/test.AnotherServiceMulti b/service/processor/src/test/resources/META-INF/services/test.AnotherServiceMulti
index f6ef36ac..f6ef36ac 100644
--- a/service/src/test/resources/META-INF/services/test.AnotherServiceMulti
+++ b/service/processor/src/test/resources/META-INF/services/test.AnotherServiceMulti
diff --git a/service/src/test/resources/META-INF/services/test.SomeService b/service/processor/src/test/resources/META-INF/services/test.SomeService
index 1b71d9db..1b71d9db 100644
--- a/service/src/test/resources/META-INF/services/test.SomeService
+++ b/service/processor/src/test/resources/META-INF/services/test.SomeService
diff --git a/service/src/test/resources/META-INF/services/test.SomeServiceMulti b/service/processor/src/test/resources/META-INF/services/test.SomeServiceMulti
index f6ef36ac..f6ef36ac 100644
--- a/service/src/test/resources/META-INF/services/test.SomeServiceMulti
+++ b/service/processor/src/test/resources/META-INF/services/test.SomeServiceMulti
diff --git a/service/src/test/resources/test/AnotherService.java b/service/processor/src/test/resources/test/AnotherService.java
index 2cbf7a6b..2cbf7a6b 100644
--- a/service/src/test/resources/test/AnotherService.java
+++ b/service/processor/src/test/resources/test/AnotherService.java
diff --git a/service/src/test/resources/test/AnotherServiceProvider.java b/service/processor/src/test/resources/test/AnotherServiceProvider.java
index b425c0ed..b425c0ed 100644
--- a/service/src/test/resources/test/AnotherServiceProvider.java
+++ b/service/processor/src/test/resources/test/AnotherServiceProvider.java
diff --git a/service/src/test/resources/test/Enclosing.java b/service/processor/src/test/resources/test/Enclosing.java
index 5176a7ee..5176a7ee 100644
--- a/service/src/test/resources/test/Enclosing.java
+++ b/service/processor/src/test/resources/test/Enclosing.java
diff --git a/service/src/test/resources/test/MultiServiceProvider.java b/service/processor/src/test/resources/test/MultiServiceProvider.java
index 804904bf..804904bf 100644
--- a/service/src/test/resources/test/MultiServiceProvider.java
+++ b/service/processor/src/test/resources/test/MultiServiceProvider.java
diff --git a/service/src/test/resources/test/NoServices.java b/service/processor/src/test/resources/test/NoServices.java
index 3687eb55..3687eb55 100644
--- a/service/src/test/resources/test/NoServices.java
+++ b/service/processor/src/test/resources/test/NoServices.java
diff --git a/service/src/test/resources/test/SomeService.java b/service/processor/src/test/resources/test/SomeService.java
index 5a4a3888..5a4a3888 100644
--- a/service/src/test/resources/test/SomeService.java
+++ b/service/processor/src/test/resources/test/SomeService.java
diff --git a/service/src/test/resources/test/SomeServiceProvider1.java b/service/processor/src/test/resources/test/SomeServiceProvider1.java
index 1a1a5e8f..1a1a5e8f 100644
--- a/service/src/test/resources/test/SomeServiceProvider1.java
+++ b/service/processor/src/test/resources/test/SomeServiceProvider1.java
diff --git a/service/src/test/resources/test/SomeServiceProvider2.java b/service/processor/src/test/resources/test/SomeServiceProvider2.java
index fb6a1bd3..fb6a1bd3 100644
--- a/service/src/test/resources/test/SomeServiceProvider2.java
+++ b/service/processor/src/test/resources/test/SomeServiceProvider2.java