diff --git a/factory/annotations/pom.xml b/factory/annotations/pom.xml
new file mode 100644
index 0000000000..a396a0d6fe
--- /dev/null
+++ b/factory/annotations/pom.xml
@@ -0,0 +1,112 @@
+
+
+
+ 4.0.0
+
+
+ org.sonatype.oss
+ oss-parent
+ 7
+
+
+ com.google.auto.factory
+ auto-factory-annotations
+ HEAD-SNAPSHOT
+ AutoFactory Annotations
+
+ JSR-330-compatible factories annotations.
+
+ https://github.com/google/auto/tree/master/factory
+
+
+ UTF-8
+ 1.8
+
+
+
+ http://github.com/google/auto
+ scm:git:git://github.com/google/auto.git
+ scm:git:ssh://git@github.com/google/auto.git
+ HEAD
+
+
+
+ GitHub Issues
+ http://github.com/google/auto/issues
+
+
+
+
+ Apache 2.0
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+
+
+
+
+ Google LLC
+ http://www.google.com
+
+
+
+
+
+
+
+
+ maven-compiler-plugin
+ 3.7.0
+
+
+ ${java.version}
+ -Xlint:all
+ true
+ true
+
+
+
+ org.codehaus.plexus
+ plexus-java
+ 0.9.4
+
+
+
+
+ maven-jar-plugin
+ 3.0.2
+
+
+ maven-invoker-plugin
+ 3.0.1
+
+ true
+ ${project.build.directory}/it
+
+ */pom.xml
+
+ true
+
+
+
+ org.immutables.tools
+ maven-shade-plugin
+ 4
+
+
+
+
diff --git a/factory/src/main/java/com/google/auto/factory/AutoFactory.java b/factory/annotations/src/main/java/com/google/auto/factory/AutoFactory.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/AutoFactory.java
rename to factory/annotations/src/main/java/com/google/auto/factory/AutoFactory.java
diff --git a/factory/src/main/java/com/google/auto/factory/Provided.java b/factory/annotations/src/main/java/com/google/auto/factory/Provided.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/Provided.java
rename to factory/annotations/src/main/java/com/google/auto/factory/Provided.java
diff --git a/factory/pom.xml b/factory/pom.xml
index 5eaf3318c2..5d0a42d212 100644
--- a/factory/pom.xml
+++ b/factory/pom.xml
@@ -26,13 +26,14 @@
com.google.auto.factory
- auto-factory
+ auto-factory-aggregator
HEAD-SNAPSHOT
- AutoFactory
+ AutoFactory Aggregator
- JSR-330-compatible factories.
+ Aggregator POM for @AutoFactory.
https://github.com/google/auto/tree/master/factory
+ pom
UTF-8
@@ -65,149 +66,9 @@
http://www.google.com
-
-
- com.google.auto
- auto-common
- 0.10
-
-
- com.google.auto.value
- auto-value-annotations
- 1.7
-
-
- com.google.auto.value
- auto-value
- 1.7
- provided
-
-
- com.google.auto.service
- auto-service
- 1.0-rc6
- provided
-
-
- net.ltgt.gradle.incap
- incap
- 0.2
- provided
-
-
- net.ltgt.gradle.incap
- incap-processor
- 0.2
- provided
-
-
- com.google.googlejavaformat
- google-java-format
- 1.7
-
-
- com.google.guava
- guava
- ${guava.version}
-
-
- com.squareup
- javapoet
- 1.12.1
-
-
- javax.inject
- javax.inject
- 1
-
-
-
- com.google.testing.compile
- compile-testing
- 0.18
- test
-
-
- junit
- junit
- 4.13
- test
-
-
- com.google.truth
- truth
- ${truth.version}
- test
-
-
- com.google.code.findbugs
- jsr305
- 3.0.2
- test
-
-
- org.checkerframework
- checker-compat-qual
- 2.5.5
- test
-
-
- org.eclipse.jdt
- org.eclipse.jdt.annotation
- 2.2.600
-
-
+
+ annotations
+ processor
+
-
-
-
- maven-compiler-plugin
- 3.7.0
-
-
- ${java.version}
- -Xlint:all
- true
- true
-
-
-
- org.codehaus.plexus
- plexus-java
- 0.9.4
-
-
-
-
- maven-jar-plugin
- 3.0.2
-
-
- maven-invoker-plugin
- 3.0.1
-
- true
- ${project.build.directory}/it
-
- */pom.xml
-
- true
-
-
-
- integration-test
-
- install
- run
-
-
-
-
-
- org.immutables.tools
- maven-shade-plugin
- 4
-
-
-
diff --git a/factory/processor/pom.xml b/factory/processor/pom.xml
new file mode 100644
index 0000000000..1d9358fe2b
--- /dev/null
+++ b/factory/processor/pom.xml
@@ -0,0 +1,218 @@
+
+
+
+ 4.0.0
+
+
+ org.sonatype.oss
+ oss-parent
+ 7
+
+
+ com.google.auto.factory
+ auto-factory
+ HEAD-SNAPSHOT
+ AutoFactory
+
+ JSR-330-compatible factories.
+
+ https://github.com/google/auto/tree/master/factory
+
+
+ UTF-8
+ 1.8
+ 28.2-jre
+ 1.0.1
+
+
+
+ http://github.com/google/auto
+ scm:git:git://github.com/google/auto.git
+ scm:git:ssh://git@github.com/google/auto.git
+ HEAD
+
+
+
+ GitHub Issues
+ http://github.com/google/auto/issues
+
+
+
+
+ Apache 2.0
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+
+
+
+
+ Google LLC
+ http://www.google.com
+
+
+
+
+ com.google.auto
+ auto-common
+ 0.10
+
+
+ com.google.auto.value
+ auto-value-annotations
+ 1.7
+
+
+ com.google.auto.value
+ auto-value
+ 1.7
+ provided
+
+
+ com.google.auto.service
+ auto-service
+ 1.0-rc6
+ provided
+
+
+ com.google.auto.factory
+ auto-factory-annotations
+ ${project.version}
+
+
+ net.ltgt.gradle.incap
+ incap
+ 0.2
+ provided
+
+
+ net.ltgt.gradle.incap
+ incap-processor
+ 0.2
+ provided
+
+
+ com.google.googlejavaformat
+ google-java-format
+ 1.7
+
+
+ com.google.guava
+ guava
+ ${guava.version}
+
+
+ com.squareup
+ javapoet
+ 1.12.1
+
+
+ javax.inject
+ javax.inject
+ 1
+
+
+
+ com.google.testing.compile
+ compile-testing
+ 0.18
+ test
+
+
+ junit
+ junit
+ 4.13
+ test
+
+
+ com.google.truth
+ truth
+ ${truth.version}
+ test
+
+
+ com.google.code.findbugs
+ jsr305
+ 3.0.2
+ test
+
+
+ org.checkerframework
+ checker-compat-qual
+ 2.5.5
+ test
+
+
+ org.eclipse.jdt
+ org.eclipse.jdt.annotation
+ 2.2.600
+
+
+
+
+
+
+ maven-compiler-plugin
+ 3.7.0
+
+
+ ${java.version}
+ -Xlint:all
+ true
+ true
+
+
+
+ org.codehaus.plexus
+ plexus-java
+ 0.9.4
+
+
+
+
+ maven-jar-plugin
+ 3.0.2
+
+
+ maven-invoker-plugin
+ 3.0.1
+
+ true
+ ${project.build.directory}/it
+
+ */pom.xml
+
+ true
+
+
+
+ integration-test
+
+ install
+ run
+
+
+
+
+
+ org.immutables.tools
+ maven-shade-plugin
+ 4
+
+
+
+
diff --git a/factory/src/it/functional/pom.xml b/factory/processor/src/it/functional/pom.xml
similarity index 100%
rename from factory/src/it/functional/pom.xml
rename to factory/processor/src/it/functional/pom.xml
diff --git a/factory/src/it/functional/src/main/java/com/google/auto/factory/DaggerModule.java b/factory/processor/src/it/functional/src/main/java/com/google/auto/factory/DaggerModule.java
similarity index 100%
rename from factory/src/it/functional/src/main/java/com/google/auto/factory/DaggerModule.java
rename to factory/processor/src/it/functional/src/main/java/com/google/auto/factory/DaggerModule.java
diff --git a/factory/src/it/functional/src/main/java/com/google/auto/factory/Dependency.java b/factory/processor/src/it/functional/src/main/java/com/google/auto/factory/Dependency.java
similarity index 100%
rename from factory/src/it/functional/src/main/java/com/google/auto/factory/Dependency.java
rename to factory/processor/src/it/functional/src/main/java/com/google/auto/factory/Dependency.java
diff --git a/factory/src/it/functional/src/main/java/com/google/auto/factory/DependencyImpl.java b/factory/processor/src/it/functional/src/main/java/com/google/auto/factory/DependencyImpl.java
similarity index 100%
rename from factory/src/it/functional/src/main/java/com/google/auto/factory/DependencyImpl.java
rename to factory/processor/src/it/functional/src/main/java/com/google/auto/factory/DependencyImpl.java
diff --git a/factory/src/it/functional/src/main/java/com/google/auto/factory/FactoryComponent.java b/factory/processor/src/it/functional/src/main/java/com/google/auto/factory/FactoryComponent.java
similarity index 100%
rename from factory/src/it/functional/src/main/java/com/google/auto/factory/FactoryComponent.java
rename to factory/processor/src/it/functional/src/main/java/com/google/auto/factory/FactoryComponent.java
diff --git a/factory/src/it/functional/src/main/java/com/google/auto/factory/FactoryInterface.java b/factory/processor/src/it/functional/src/main/java/com/google/auto/factory/FactoryInterface.java
similarity index 100%
rename from factory/src/it/functional/src/main/java/com/google/auto/factory/FactoryInterface.java
rename to factory/processor/src/it/functional/src/main/java/com/google/auto/factory/FactoryInterface.java
diff --git a/factory/src/it/functional/src/main/java/com/google/auto/factory/Foo.java b/factory/processor/src/it/functional/src/main/java/com/google/auto/factory/Foo.java
similarity index 100%
rename from factory/src/it/functional/src/main/java/com/google/auto/factory/Foo.java
rename to factory/processor/src/it/functional/src/main/java/com/google/auto/factory/Foo.java
diff --git a/factory/src/it/functional/src/main/java/com/google/auto/factory/GenericFoo.java b/factory/processor/src/it/functional/src/main/java/com/google/auto/factory/GenericFoo.java
similarity index 100%
rename from factory/src/it/functional/src/main/java/com/google/auto/factory/GenericFoo.java
rename to factory/processor/src/it/functional/src/main/java/com/google/auto/factory/GenericFoo.java
diff --git a/factory/src/it/functional/src/main/java/com/google/auto/factory/GuiceModule.java b/factory/processor/src/it/functional/src/main/java/com/google/auto/factory/GuiceModule.java
similarity index 100%
rename from factory/src/it/functional/src/main/java/com/google/auto/factory/GuiceModule.java
rename to factory/processor/src/it/functional/src/main/java/com/google/auto/factory/GuiceModule.java
diff --git a/factory/src/it/functional/src/main/java/com/google/auto/factory/QualifiedDependencyImpl.java b/factory/processor/src/it/functional/src/main/java/com/google/auto/factory/QualifiedDependencyImpl.java
similarity index 100%
rename from factory/src/it/functional/src/main/java/com/google/auto/factory/QualifiedDependencyImpl.java
rename to factory/processor/src/it/functional/src/main/java/com/google/auto/factory/QualifiedDependencyImpl.java
diff --git a/factory/src/it/functional/src/main/java/com/google/auto/factory/Qualifier.java b/factory/processor/src/it/functional/src/main/java/com/google/auto/factory/Qualifier.java
similarity index 100%
rename from factory/src/it/functional/src/main/java/com/google/auto/factory/Qualifier.java
rename to factory/processor/src/it/functional/src/main/java/com/google/auto/factory/Qualifier.java
diff --git a/factory/src/it/functional/src/main/java/com/google/auto/factory/ReferencePackage.java b/factory/processor/src/it/functional/src/main/java/com/google/auto/factory/ReferencePackage.java
old mode 100755
new mode 100644
similarity index 100%
rename from factory/src/it/functional/src/main/java/com/google/auto/factory/ReferencePackage.java
rename to factory/processor/src/it/functional/src/main/java/com/google/auto/factory/ReferencePackage.java
diff --git a/factory/src/it/functional/src/main/java/com/google/auto/factory/otherpackage/OtherPackage.java b/factory/processor/src/it/functional/src/main/java/com/google/auto/factory/otherpackage/OtherPackage.java
old mode 100755
new mode 100644
similarity index 100%
rename from factory/src/it/functional/src/main/java/com/google/auto/factory/otherpackage/OtherPackage.java
rename to factory/processor/src/it/functional/src/main/java/com/google/auto/factory/otherpackage/OtherPackage.java
diff --git a/factory/src/it/functional/src/test/java/com/google/auto/factory/DependencyInjectionIntegrationTest.java b/factory/processor/src/it/functional/src/test/java/com/google/auto/factory/DependencyInjectionIntegrationTest.java
similarity index 100%
rename from factory/src/it/functional/src/test/java/com/google/auto/factory/DependencyInjectionIntegrationTest.java
rename to factory/processor/src/it/functional/src/test/java/com/google/auto/factory/DependencyInjectionIntegrationTest.java
diff --git a/factory/src/main/java/com/google/auto/factory/processor/AnnotationValues.java b/factory/processor/src/main/java/com/google/auto/factory/processor/AnnotationValues.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/processor/AnnotationValues.java
rename to factory/processor/src/main/java/com/google/auto/factory/processor/AnnotationValues.java
diff --git a/factory/src/main/java/com/google/auto/factory/processor/AutoFactoryDeclaration.java b/factory/processor/src/main/java/com/google/auto/factory/processor/AutoFactoryDeclaration.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/processor/AutoFactoryDeclaration.java
rename to factory/processor/src/main/java/com/google/auto/factory/processor/AutoFactoryDeclaration.java
diff --git a/factory/src/main/java/com/google/auto/factory/processor/AutoFactoryProcessor.java b/factory/processor/src/main/java/com/google/auto/factory/processor/AutoFactoryProcessor.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/processor/AutoFactoryProcessor.java
rename to factory/processor/src/main/java/com/google/auto/factory/processor/AutoFactoryProcessor.java
diff --git a/factory/src/main/java/com/google/auto/factory/processor/Elements2.java b/factory/processor/src/main/java/com/google/auto/factory/processor/Elements2.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/processor/Elements2.java
rename to factory/processor/src/main/java/com/google/auto/factory/processor/Elements2.java
diff --git a/factory/src/main/java/com/google/auto/factory/processor/FactoryDescriptor.java b/factory/processor/src/main/java/com/google/auto/factory/processor/FactoryDescriptor.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/processor/FactoryDescriptor.java
rename to factory/processor/src/main/java/com/google/auto/factory/processor/FactoryDescriptor.java
diff --git a/factory/src/main/java/com/google/auto/factory/processor/FactoryDescriptorGenerator.java b/factory/processor/src/main/java/com/google/auto/factory/processor/FactoryDescriptorGenerator.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/processor/FactoryDescriptorGenerator.java
rename to factory/processor/src/main/java/com/google/auto/factory/processor/FactoryDescriptorGenerator.java
diff --git a/factory/src/main/java/com/google/auto/factory/processor/FactoryMethodDescriptor.java b/factory/processor/src/main/java/com/google/auto/factory/processor/FactoryMethodDescriptor.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/processor/FactoryMethodDescriptor.java
rename to factory/processor/src/main/java/com/google/auto/factory/processor/FactoryMethodDescriptor.java
diff --git a/factory/src/main/java/com/google/auto/factory/processor/FactoryWriter.java b/factory/processor/src/main/java/com/google/auto/factory/processor/FactoryWriter.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/processor/FactoryWriter.java
rename to factory/processor/src/main/java/com/google/auto/factory/processor/FactoryWriter.java
diff --git a/factory/src/main/java/com/google/auto/factory/processor/ImplementationMethodDescriptor.java b/factory/processor/src/main/java/com/google/auto/factory/processor/ImplementationMethodDescriptor.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/processor/ImplementationMethodDescriptor.java
rename to factory/processor/src/main/java/com/google/auto/factory/processor/ImplementationMethodDescriptor.java
diff --git a/factory/src/main/java/com/google/auto/factory/processor/Key.java b/factory/processor/src/main/java/com/google/auto/factory/processor/Key.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/processor/Key.java
rename to factory/processor/src/main/java/com/google/auto/factory/processor/Key.java
diff --git a/factory/src/main/java/com/google/auto/factory/processor/Mirrors.java b/factory/processor/src/main/java/com/google/auto/factory/processor/Mirrors.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/processor/Mirrors.java
rename to factory/processor/src/main/java/com/google/auto/factory/processor/Mirrors.java
diff --git a/factory/src/main/java/com/google/auto/factory/processor/NullAnnotation.java b/factory/processor/src/main/java/com/google/auto/factory/processor/NullAnnotation.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/processor/NullAnnotation.java
rename to factory/processor/src/main/java/com/google/auto/factory/processor/NullAnnotation.java
diff --git a/factory/src/main/java/com/google/auto/factory/processor/PackageAndClass.java b/factory/processor/src/main/java/com/google/auto/factory/processor/PackageAndClass.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/processor/PackageAndClass.java
rename to factory/processor/src/main/java/com/google/auto/factory/processor/PackageAndClass.java
diff --git a/factory/src/main/java/com/google/auto/factory/processor/Parameter.java b/factory/processor/src/main/java/com/google/auto/factory/processor/Parameter.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/processor/Parameter.java
rename to factory/processor/src/main/java/com/google/auto/factory/processor/Parameter.java
diff --git a/factory/src/main/java/com/google/auto/factory/processor/ProvidedChecker.java b/factory/processor/src/main/java/com/google/auto/factory/processor/ProvidedChecker.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/processor/ProvidedChecker.java
rename to factory/processor/src/main/java/com/google/auto/factory/processor/ProvidedChecker.java
diff --git a/factory/src/main/java/com/google/auto/factory/processor/ProviderField.java b/factory/processor/src/main/java/com/google/auto/factory/processor/ProviderField.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/processor/ProviderField.java
rename to factory/processor/src/main/java/com/google/auto/factory/processor/ProviderField.java
diff --git a/factory/src/main/java/com/google/auto/factory/processor/TypeVariables.java b/factory/processor/src/main/java/com/google/auto/factory/processor/TypeVariables.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/processor/TypeVariables.java
rename to factory/processor/src/main/java/com/google/auto/factory/processor/TypeVariables.java
diff --git a/factory/src/main/java/com/google/auto/factory/processor/package-info.java b/factory/processor/src/main/java/com/google/auto/factory/processor/package-info.java
similarity index 100%
rename from factory/src/main/java/com/google/auto/factory/processor/package-info.java
rename to factory/processor/src/main/java/com/google/auto/factory/processor/package-info.java
diff --git a/factory/src/test/java/com/google/auto/factory/processor/AutoFactoryDeclarationTest.java b/factory/processor/src/test/java/com/google/auto/factory/processor/AutoFactoryDeclarationTest.java
similarity index 100%
rename from factory/src/test/java/com/google/auto/factory/processor/AutoFactoryDeclarationTest.java
rename to factory/processor/src/test/java/com/google/auto/factory/processor/AutoFactoryDeclarationTest.java
diff --git a/factory/src/test/java/com/google/auto/factory/processor/AutoFactoryProcessorTest.java b/factory/processor/src/test/java/com/google/auto/factory/processor/AutoFactoryProcessorTest.java
similarity index 100%
rename from factory/src/test/java/com/google/auto/factory/processor/AutoFactoryProcessorTest.java
rename to factory/processor/src/test/java/com/google/auto/factory/processor/AutoFactoryProcessorTest.java
diff --git a/factory/src/test/resources/bad/EnumSupertype.java b/factory/processor/src/test/resources/bad/EnumSupertype.java
similarity index 100%
rename from factory/src/test/resources/bad/EnumSupertype.java
rename to factory/processor/src/test/resources/bad/EnumSupertype.java
diff --git a/factory/src/test/resources/bad/FinalSupertype.java b/factory/processor/src/test/resources/bad/FinalSupertype.java
similarity index 100%
rename from factory/src/test/resources/bad/FinalSupertype.java
rename to factory/processor/src/test/resources/bad/FinalSupertype.java
diff --git a/factory/src/test/resources/bad/InterfaceSupertype.java b/factory/processor/src/test/resources/bad/InterfaceSupertype.java
similarity index 100%
rename from factory/src/test/resources/bad/InterfaceSupertype.java
rename to factory/processor/src/test/resources/bad/InterfaceSupertype.java
diff --git a/factory/src/test/resources/bad/InvalidCustomName.java b/factory/processor/src/test/resources/bad/InvalidCustomName.java
similarity index 100%
rename from factory/src/test/resources/bad/InvalidCustomName.java
rename to factory/processor/src/test/resources/bad/InvalidCustomName.java
diff --git a/factory/src/test/resources/bad/MixedFinals.java b/factory/processor/src/test/resources/bad/MixedFinals.java
similarity index 100%
rename from factory/src/test/resources/bad/MixedFinals.java
rename to factory/processor/src/test/resources/bad/MixedFinals.java
diff --git a/factory/src/test/resources/bad/ProvidedButNoAutoFactory.java b/factory/processor/src/test/resources/bad/ProvidedButNoAutoFactory.java
similarity index 100%
rename from factory/src/test/resources/bad/ProvidedButNoAutoFactory.java
rename to factory/processor/src/test/resources/bad/ProvidedButNoAutoFactory.java
diff --git a/factory/src/test/resources/bad/ProvidedOnMethodParameter.java b/factory/processor/src/test/resources/bad/ProvidedOnMethodParameter.java
similarity index 100%
rename from factory/src/test/resources/bad/ProvidedOnMethodParameter.java
rename to factory/processor/src/test/resources/bad/ProvidedOnMethodParameter.java
diff --git a/factory/src/test/resources/expected/CheckerFrameworkNullableFactory.java b/factory/processor/src/test/resources/expected/CheckerFrameworkNullableFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/CheckerFrameworkNullableFactory.java
rename to factory/processor/src/test/resources/expected/CheckerFrameworkNullableFactory.java
diff --git a/factory/src/test/resources/expected/ClassUsingQualifierWithArgsFactory.java b/factory/processor/src/test/resources/expected/ClassUsingQualifierWithArgsFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/ClassUsingQualifierWithArgsFactory.java
rename to factory/processor/src/test/resources/expected/ClassUsingQualifierWithArgsFactory.java
diff --git a/factory/src/test/resources/expected/ConstructorAnnotatedFactory.java b/factory/processor/src/test/resources/expected/ConstructorAnnotatedFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/ConstructorAnnotatedFactory.java
rename to factory/processor/src/test/resources/expected/ConstructorAnnotatedFactory.java
diff --git a/factory/src/test/resources/expected/ConstructorAnnotatedNonFinalFactory.java b/factory/processor/src/test/resources/expected/ConstructorAnnotatedNonFinalFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/ConstructorAnnotatedNonFinalFactory.java
rename to factory/processor/src/test/resources/expected/ConstructorAnnotatedNonFinalFactory.java
diff --git a/factory/src/test/resources/expected/CustomNamedFactory.java b/factory/processor/src/test/resources/expected/CustomNamedFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/CustomNamedFactory.java
rename to factory/processor/src/test/resources/expected/CustomNamedFactory.java
diff --git a/factory/src/test/resources/expected/CustomNullableFactory.java b/factory/processor/src/test/resources/expected/CustomNullableFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/CustomNullableFactory.java
rename to factory/processor/src/test/resources/expected/CustomNullableFactory.java
diff --git a/factory/src/test/resources/expected/DefaultPackageFactory.java b/factory/processor/src/test/resources/expected/DefaultPackageFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/DefaultPackageFactory.java
rename to factory/processor/src/test/resources/expected/DefaultPackageFactory.java
diff --git a/factory/src/test/resources/expected/FactoryExtendingAbstractClassFactory.java b/factory/processor/src/test/resources/expected/FactoryExtendingAbstractClassFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/FactoryExtendingAbstractClassFactory.java
rename to factory/processor/src/test/resources/expected/FactoryExtendingAbstractClassFactory.java
diff --git a/factory/src/test/resources/expected/FactoryImplementingCreateMethod_ConcreteClassFactory.java b/factory/processor/src/test/resources/expected/FactoryImplementingCreateMethod_ConcreteClassFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/FactoryImplementingCreateMethod_ConcreteClassFactory.java
rename to factory/processor/src/test/resources/expected/FactoryImplementingCreateMethod_ConcreteClassFactory.java
diff --git a/factory/src/test/resources/expected/FactoryImplementingGenericInterfaceExtensionFactory.java b/factory/processor/src/test/resources/expected/FactoryImplementingGenericInterfaceExtensionFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/FactoryImplementingGenericInterfaceExtensionFactory.java
rename to factory/processor/src/test/resources/expected/FactoryImplementingGenericInterfaceExtensionFactory.java
diff --git a/factory/src/test/resources/expected/MixedDepsImplementingInterfacesFactory.java b/factory/processor/src/test/resources/expected/MixedDepsImplementingInterfacesFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/MixedDepsImplementingInterfacesFactory.java
rename to factory/processor/src/test/resources/expected/MixedDepsImplementingInterfacesFactory.java
diff --git a/factory/src/test/resources/expected/MultipleFactoriesConflictingParameterNamesFactory.java b/factory/processor/src/test/resources/expected/MultipleFactoriesConflictingParameterNamesFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/MultipleFactoriesConflictingParameterNamesFactory.java
rename to factory/processor/src/test/resources/expected/MultipleFactoriesConflictingParameterNamesFactory.java
diff --git a/factory/src/test/resources/expected/MultipleFactoriesImplementingInterface_ClassAFactory.java b/factory/processor/src/test/resources/expected/MultipleFactoriesImplementingInterface_ClassAFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/MultipleFactoriesImplementingInterface_ClassAFactory.java
rename to factory/processor/src/test/resources/expected/MultipleFactoriesImplementingInterface_ClassAFactory.java
diff --git a/factory/src/test/resources/expected/MultipleFactoriesImplementingInterface_ClassBFactory.java b/factory/processor/src/test/resources/expected/MultipleFactoriesImplementingInterface_ClassBFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/MultipleFactoriesImplementingInterface_ClassBFactory.java
rename to factory/processor/src/test/resources/expected/MultipleFactoriesImplementingInterface_ClassBFactory.java
diff --git a/factory/src/test/resources/expected/MultipleProvidedParamsSameKeyFactory.java b/factory/processor/src/test/resources/expected/MultipleProvidedParamsSameKeyFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/MultipleProvidedParamsSameKeyFactory.java
rename to factory/processor/src/test/resources/expected/MultipleProvidedParamsSameKeyFactory.java
diff --git a/factory/src/test/resources/expected/NestedClassCustomNamedFactory.java b/factory/processor/src/test/resources/expected/NestedClassCustomNamedFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/NestedClassCustomNamedFactory.java
rename to factory/processor/src/test/resources/expected/NestedClassCustomNamedFactory.java
diff --git a/factory/src/test/resources/expected/NestedClasses_SimpleNestedClassFactory.java b/factory/processor/src/test/resources/expected/NestedClasses_SimpleNestedClassFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/NestedClasses_SimpleNestedClassFactory.java
rename to factory/processor/src/test/resources/expected/NestedClasses_SimpleNestedClassFactory.java
diff --git a/factory/src/test/resources/expected/NullAnnotationJdtFactory.java b/factory/processor/src/test/resources/expected/NullAnnotationJdtFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/NullAnnotationJdtFactory.java
rename to factory/processor/src/test/resources/expected/NullAnnotationJdtFactory.java
diff --git a/factory/src/test/resources/expected/OnlyPrimitivesFactory.java b/factory/processor/src/test/resources/expected/OnlyPrimitivesFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/OnlyPrimitivesFactory.java
rename to factory/processor/src/test/resources/expected/OnlyPrimitivesFactory.java
diff --git a/factory/src/test/resources/expected/ProviderArgumentToCreateMethodFactory.java b/factory/processor/src/test/resources/expected/ProviderArgumentToCreateMethodFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/ProviderArgumentToCreateMethodFactory.java
rename to factory/processor/src/test/resources/expected/ProviderArgumentToCreateMethodFactory.java
diff --git a/factory/src/test/resources/expected/PublicClassFactory.java b/factory/processor/src/test/resources/expected/PublicClassFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/PublicClassFactory.java
rename to factory/processor/src/test/resources/expected/PublicClassFactory.java
diff --git a/factory/src/test/resources/expected/SimpleClassFactory.java b/factory/processor/src/test/resources/expected/SimpleClassFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/SimpleClassFactory.java
rename to factory/processor/src/test/resources/expected/SimpleClassFactory.java
diff --git a/factory/src/test/resources/expected/SimpleClassImplementingMarkerFactory.java b/factory/processor/src/test/resources/expected/SimpleClassImplementingMarkerFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/SimpleClassImplementingMarkerFactory.java
rename to factory/processor/src/test/resources/expected/SimpleClassImplementingMarkerFactory.java
diff --git a/factory/src/test/resources/expected/SimpleClassImplementingSimpleInterfaceFactory.java b/factory/processor/src/test/resources/expected/SimpleClassImplementingSimpleInterfaceFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/SimpleClassImplementingSimpleInterfaceFactory.java
rename to factory/processor/src/test/resources/expected/SimpleClassImplementingSimpleInterfaceFactory.java
diff --git a/factory/src/test/resources/expected/SimpleClassMixedDepsFactory.java b/factory/processor/src/test/resources/expected/SimpleClassMixedDepsFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/SimpleClassMixedDepsFactory.java
rename to factory/processor/src/test/resources/expected/SimpleClassMixedDepsFactory.java
diff --git a/factory/src/test/resources/expected/SimpleClassNonFinalFactory.java b/factory/processor/src/test/resources/expected/SimpleClassNonFinalFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/SimpleClassNonFinalFactory.java
rename to factory/processor/src/test/resources/expected/SimpleClassNonFinalFactory.java
diff --git a/factory/src/test/resources/expected/SimpleClassNullableParametersFactory.java b/factory/processor/src/test/resources/expected/SimpleClassNullableParametersFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/SimpleClassNullableParametersFactory.java
rename to factory/processor/src/test/resources/expected/SimpleClassNullableParametersFactory.java
diff --git a/factory/src/test/resources/expected/SimpleClassPassedDepsFactory.java b/factory/processor/src/test/resources/expected/SimpleClassPassedDepsFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/SimpleClassPassedDepsFactory.java
rename to factory/processor/src/test/resources/expected/SimpleClassPassedDepsFactory.java
diff --git a/factory/src/test/resources/expected/SimpleClassProvidedDepsFactory.java b/factory/processor/src/test/resources/expected/SimpleClassProvidedDepsFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/SimpleClassProvidedDepsFactory.java
rename to factory/processor/src/test/resources/expected/SimpleClassProvidedDepsFactory.java
diff --git a/factory/src/test/resources/expected/SimpleClassProvidedProviderDepsFactory.java b/factory/processor/src/test/resources/expected/SimpleClassProvidedProviderDepsFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/SimpleClassProvidedProviderDepsFactory.java
rename to factory/processor/src/test/resources/expected/SimpleClassProvidedProviderDepsFactory.java
diff --git a/factory/src/test/resources/expected/SimpleClassVarargsFactory.java b/factory/processor/src/test/resources/expected/SimpleClassVarargsFactory.java
similarity index 100%
rename from factory/src/test/resources/expected/SimpleClassVarargsFactory.java
rename to factory/processor/src/test/resources/expected/SimpleClassVarargsFactory.java
diff --git a/factory/src/test/resources/good/CheckerFrameworkNullable.java b/factory/processor/src/test/resources/good/CheckerFrameworkNullable.java
similarity index 100%
rename from factory/src/test/resources/good/CheckerFrameworkNullable.java
rename to factory/processor/src/test/resources/good/CheckerFrameworkNullable.java
diff --git a/factory/src/test/resources/good/ClassUsingQualifierWithArgs.java b/factory/processor/src/test/resources/good/ClassUsingQualifierWithArgs.java
similarity index 100%
rename from factory/src/test/resources/good/ClassUsingQualifierWithArgs.java
rename to factory/processor/src/test/resources/good/ClassUsingQualifierWithArgs.java
diff --git a/factory/src/test/resources/good/ConstructorAnnotated.java b/factory/processor/src/test/resources/good/ConstructorAnnotated.java
similarity index 100%
rename from factory/src/test/resources/good/ConstructorAnnotated.java
rename to factory/processor/src/test/resources/good/ConstructorAnnotated.java
diff --git a/factory/src/test/resources/good/ConstructorAnnotatedNonFinal.java b/factory/processor/src/test/resources/good/ConstructorAnnotatedNonFinal.java
similarity index 100%
rename from factory/src/test/resources/good/ConstructorAnnotatedNonFinal.java
rename to factory/processor/src/test/resources/good/ConstructorAnnotatedNonFinal.java
diff --git a/factory/src/test/resources/good/CustomNullable.java b/factory/processor/src/test/resources/good/CustomNullable.java
similarity index 100%
rename from factory/src/test/resources/good/CustomNullable.java
rename to factory/processor/src/test/resources/good/CustomNullable.java
diff --git a/factory/src/test/resources/good/DefaultPackage.java b/factory/processor/src/test/resources/good/DefaultPackage.java
similarity index 100%
rename from factory/src/test/resources/good/DefaultPackage.java
rename to factory/processor/src/test/resources/good/DefaultPackage.java
diff --git a/factory/src/test/resources/good/FactoryExtendingAbstractClass.java b/factory/processor/src/test/resources/good/FactoryExtendingAbstractClass.java
similarity index 100%
rename from factory/src/test/resources/good/FactoryExtendingAbstractClass.java
rename to factory/processor/src/test/resources/good/FactoryExtendingAbstractClass.java
diff --git a/factory/src/test/resources/good/FactoryExtendingAbstractClassWithConstructorParams.java b/factory/processor/src/test/resources/good/FactoryExtendingAbstractClassWithConstructorParams.java
similarity index 100%
rename from factory/src/test/resources/good/FactoryExtendingAbstractClassWithConstructorParams.java
rename to factory/processor/src/test/resources/good/FactoryExtendingAbstractClassWithConstructorParams.java
diff --git a/factory/src/test/resources/good/FactoryExtendingAbstractClassWithMultipleConstructors.java b/factory/processor/src/test/resources/good/FactoryExtendingAbstractClassWithMultipleConstructors.java
similarity index 100%
rename from factory/src/test/resources/good/FactoryExtendingAbstractClassWithMultipleConstructors.java
rename to factory/processor/src/test/resources/good/FactoryExtendingAbstractClassWithMultipleConstructors.java
diff --git a/factory/src/test/resources/good/FactoryImplementingCreateMethod.java b/factory/processor/src/test/resources/good/FactoryImplementingCreateMethod.java
similarity index 100%
rename from factory/src/test/resources/good/FactoryImplementingCreateMethod.java
rename to factory/processor/src/test/resources/good/FactoryImplementingCreateMethod.java
diff --git a/factory/src/test/resources/good/FactoryImplementingGenericInterfaceExtension.java b/factory/processor/src/test/resources/good/FactoryImplementingGenericInterfaceExtension.java
similarity index 100%
rename from factory/src/test/resources/good/FactoryImplementingGenericInterfaceExtension.java
rename to factory/processor/src/test/resources/good/FactoryImplementingGenericInterfaceExtension.java
diff --git a/factory/src/test/resources/good/MixedDepsImplementingInterfaces.java b/factory/processor/src/test/resources/good/MixedDepsImplementingInterfaces.java
similarity index 100%
rename from factory/src/test/resources/good/MixedDepsImplementingInterfaces.java
rename to factory/processor/src/test/resources/good/MixedDepsImplementingInterfaces.java
diff --git a/factory/src/test/resources/good/MultipleFactoriesConflictingParameterNames.java b/factory/processor/src/test/resources/good/MultipleFactoriesConflictingParameterNames.java
similarity index 100%
rename from factory/src/test/resources/good/MultipleFactoriesConflictingParameterNames.java
rename to factory/processor/src/test/resources/good/MultipleFactoriesConflictingParameterNames.java
diff --git a/factory/src/test/resources/good/MultipleFactoriesImplementingInterface.java b/factory/processor/src/test/resources/good/MultipleFactoriesImplementingInterface.java
similarity index 100%
rename from factory/src/test/resources/good/MultipleFactoriesImplementingInterface.java
rename to factory/processor/src/test/resources/good/MultipleFactoriesImplementingInterface.java
diff --git a/factory/src/test/resources/good/MultipleProvidedParamsSameKey.java b/factory/processor/src/test/resources/good/MultipleProvidedParamsSameKey.java
similarity index 100%
rename from factory/src/test/resources/good/MultipleProvidedParamsSameKey.java
rename to factory/processor/src/test/resources/good/MultipleProvidedParamsSameKey.java
diff --git a/factory/src/test/resources/good/NestedClasses.java b/factory/processor/src/test/resources/good/NestedClasses.java
similarity index 100%
rename from factory/src/test/resources/good/NestedClasses.java
rename to factory/processor/src/test/resources/good/NestedClasses.java
diff --git a/factory/src/test/resources/good/NullAnnotationJdt.java b/factory/processor/src/test/resources/good/NullAnnotationJdt.java
similarity index 100%
rename from factory/src/test/resources/good/NullAnnotationJdt.java
rename to factory/processor/src/test/resources/good/NullAnnotationJdt.java
diff --git a/factory/src/test/resources/good/OnlyPrimitives.java b/factory/processor/src/test/resources/good/OnlyPrimitives.java
similarity index 100%
rename from factory/src/test/resources/good/OnlyPrimitives.java
rename to factory/processor/src/test/resources/good/OnlyPrimitives.java
diff --git a/factory/src/test/resources/good/ProviderArgumentToCreateMethod.java b/factory/processor/src/test/resources/good/ProviderArgumentToCreateMethod.java
similarity index 100%
rename from factory/src/test/resources/good/ProviderArgumentToCreateMethod.java
rename to factory/processor/src/test/resources/good/ProviderArgumentToCreateMethod.java
diff --git a/factory/src/test/resources/good/PublicClass.java b/factory/processor/src/test/resources/good/PublicClass.java
similarity index 100%
rename from factory/src/test/resources/good/PublicClass.java
rename to factory/processor/src/test/resources/good/PublicClass.java
diff --git a/factory/src/test/resources/good/SimpleClass.java b/factory/processor/src/test/resources/good/SimpleClass.java
similarity index 100%
rename from factory/src/test/resources/good/SimpleClass.java
rename to factory/processor/src/test/resources/good/SimpleClass.java
diff --git a/factory/src/test/resources/good/SimpleClassCustomName.java b/factory/processor/src/test/resources/good/SimpleClassCustomName.java
similarity index 100%
rename from factory/src/test/resources/good/SimpleClassCustomName.java
rename to factory/processor/src/test/resources/good/SimpleClassCustomName.java
diff --git a/factory/src/test/resources/good/SimpleClassImplementingMarker.java b/factory/processor/src/test/resources/good/SimpleClassImplementingMarker.java
similarity index 100%
rename from factory/src/test/resources/good/SimpleClassImplementingMarker.java
rename to factory/processor/src/test/resources/good/SimpleClassImplementingMarker.java
diff --git a/factory/src/test/resources/good/SimpleClassImplementingSimpleInterface.java b/factory/processor/src/test/resources/good/SimpleClassImplementingSimpleInterface.java
similarity index 100%
rename from factory/src/test/resources/good/SimpleClassImplementingSimpleInterface.java
rename to factory/processor/src/test/resources/good/SimpleClassImplementingSimpleInterface.java
diff --git a/factory/src/test/resources/good/SimpleClassMixedDeps.java b/factory/processor/src/test/resources/good/SimpleClassMixedDeps.java
similarity index 100%
rename from factory/src/test/resources/good/SimpleClassMixedDeps.java
rename to factory/processor/src/test/resources/good/SimpleClassMixedDeps.java
diff --git a/factory/src/test/resources/good/SimpleClassNonFinal.java b/factory/processor/src/test/resources/good/SimpleClassNonFinal.java
similarity index 100%
rename from factory/src/test/resources/good/SimpleClassNonFinal.java
rename to factory/processor/src/test/resources/good/SimpleClassNonFinal.java
diff --git a/factory/src/test/resources/good/SimpleClassNullableParameters.java b/factory/processor/src/test/resources/good/SimpleClassNullableParameters.java
similarity index 100%
rename from factory/src/test/resources/good/SimpleClassNullableParameters.java
rename to factory/processor/src/test/resources/good/SimpleClassNullableParameters.java
diff --git a/factory/src/test/resources/good/SimpleClassPassedDeps.java b/factory/processor/src/test/resources/good/SimpleClassPassedDeps.java
similarity index 100%
rename from factory/src/test/resources/good/SimpleClassPassedDeps.java
rename to factory/processor/src/test/resources/good/SimpleClassPassedDeps.java
diff --git a/factory/src/test/resources/good/SimpleClassProvidedDeps.java b/factory/processor/src/test/resources/good/SimpleClassProvidedDeps.java
similarity index 100%
rename from factory/src/test/resources/good/SimpleClassProvidedDeps.java
rename to factory/processor/src/test/resources/good/SimpleClassProvidedDeps.java
diff --git a/factory/src/test/resources/good/SimpleClassProvidedProviderDeps.java b/factory/processor/src/test/resources/good/SimpleClassProvidedProviderDeps.java
similarity index 100%
rename from factory/src/test/resources/good/SimpleClassProvidedProviderDeps.java
rename to factory/processor/src/test/resources/good/SimpleClassProvidedProviderDeps.java
diff --git a/factory/src/test/resources/good/SimpleClassVarargs.java b/factory/processor/src/test/resources/good/SimpleClassVarargs.java
similarity index 100%
rename from factory/src/test/resources/good/SimpleClassVarargs.java
rename to factory/processor/src/test/resources/good/SimpleClassVarargs.java
diff --git a/factory/src/test/resources/support/AQualifier.java b/factory/processor/src/test/resources/support/AQualifier.java
similarity index 100%
rename from factory/src/test/resources/support/AQualifier.java
rename to factory/processor/src/test/resources/support/AQualifier.java
diff --git a/factory/src/test/resources/support/BQualifier.java b/factory/processor/src/test/resources/support/BQualifier.java
similarity index 100%
rename from factory/src/test/resources/support/BQualifier.java
rename to factory/processor/src/test/resources/support/BQualifier.java
diff --git a/factory/src/test/resources/support/QualifierWithArgs.java b/factory/processor/src/test/resources/support/QualifierWithArgs.java
similarity index 100%
rename from factory/src/test/resources/support/QualifierWithArgs.java
rename to factory/processor/src/test/resources/support/QualifierWithArgs.java