Refactor move annotations into annotation package

Author: rbygrave

annotations/src/main/java/io/dinject/Bean.java renamed to annotations/src/main/java/io/dinject/annotation/Bean.java

@@ -1,4 +1,4 @@
-package io.dinject;
+package io.dinject.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

annotations/src/main/java/io/dinject/ContextModule.java renamed to annotations/src/main/java/io/dinject/annotation/ContextModule.java

@@ -1,4 +1,4 @@
-package io.dinject;
+package io.dinject.annotation;
 
 /**
  * Used to explicitly name a bean context and optionally specify if it depends on other bean contexts.

annotations/src/main/java/io/dinject/core/DependencyMeta.java renamed to annotations/src/main/java/io/dinject/annotation/DependencyMeta.java

@@ -1,4 +1,4 @@
-package io.dinject.core;
+package io.dinject.annotation;
 
 /**
  * Hold bean dependency meta data intended for internal use by code generation (Java annotation processing).

annotations/src/main/java/io/dinject/Factory.java renamed to annotations/src/main/java/io/dinject/annotation/Factory.java

@@ -1,4 +1,4 @@
-package io.dinject;
+package io.dinject.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

annotations/src/main/java/io/dinject/Primary.java renamed to annotations/src/main/java/io/dinject/annotation/Primary.java

@@ -1,4 +1,4 @@
-package io.dinject;
+package io.dinject.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

annotations/src/main/java/io/dinject/Secondary.java renamed to annotations/src/main/java/io/dinject/annotation/Secondary.java

@@ -1,4 +1,4 @@
-package io.dinject;
+package io.dinject.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

core/pom.xml

@@ -57,7 +57,7 @@
     <dependency>
       <groupId>io.dinject</groupId>
       <artifactId>dinject-generator</artifactId>
-      <version>1.19</version>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
 

core/src/main/java/io/dinject/BeanContext.java

@@ -1,5 +1,7 @@
 package io.dinject;
 
+import io.dinject.annotation.ContextModule;
+
 import java.io.Closeable;
 import java.util.List;
 

core/src/test/java/org/example/coffee/factory/Configuration.java

@@ -1,7 +1,7 @@
 package org.example.coffee.factory;
 
-import io.dinject.Bean;
-import io.dinject.Factory;
+import io.dinject.annotation.Bean;
+import io.dinject.annotation.Factory;
 import org.example.coffee.CoffeeMaker;
 
 import javax.annotation.PostConstruct;

core/src/test/java/org/example/coffee/factory/MyFactory.java

@@ -1,7 +1,7 @@
 package org.example.coffee.factory;
 
-import io.dinject.Bean;
-import io.dinject.Factory;
+import io.dinject.annotation.Bean;
+import io.dinject.annotation.Factory;
 import org.example.coffee.factory.other.Something;
 
 import javax.inject.Named;