Merge branch 'master' into i26

Author: timowest

.gitignore

@@ -4,6 +4,8 @@
 target
 bin
 test-output
+*.iml
+.idea
 .classpath
 .project
 .settings

src/test/java/com/mysemna/maven/apt/AddTestCompileSourceRootMojoTest.java renamed to src/test/java/com/mysema/maven/apt/AddTestCompileSourceRootMojoTest.java

@@ -1,4 +1,4 @@
-package com.mysemna.maven.apt;
+package com.mysema.maven.apt;
 
 import static org.junit.Assert.assertTrue;
 
@@ -9,8 +9,6 @@
 import org.apache.maven.project.MavenProject;
 import org.junit.Test;
 
-import com.mysema.maven.apt.AddTestCompileSourceRootMojo;
-
 public class AddTestCompileSourceRootMojoTest {
 
     @Test

src/test/java/com/mysemna/maven/apt/AnnotationProcessorMojoTest.java renamed to src/test/java/com/mysema/maven/apt/AnnotationProcessorMojoTest.java

@@ -1,4 +1,4 @@
-package com.mysemna.maven.apt;
+package com.mysema.maven.apt;
 
 import static org.junit.Assert.*;
 import static org.junit.Assert.assertTrue;
@@ -28,7 +28,6 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import com.mysema.maven.apt.AnnotationProcessorMojo;
 import com.mysema.query.apt.QuerydslAnnotationProcessor;
 import com.mysema.util.FileUtils;
 

src/test/java/com/mysemna/maven/apt/ClassPathUtils.java renamed to src/test/java/com/mysema/maven/apt/ClassPathUtils.java

@@ -1,4 +1,4 @@
-package com.mysemna.maven.apt;
+package com.mysema.maven.apt;
 
 import java.io.File;
 import java.io.IOException;

src/test/java/com/mysemna/maven/apt/TestAnnotationProcessorMojoTest.java renamed to src/test/java/com/mysema/maven/apt/TestAnnotationProcessorMojoTest.java

@@ -1,4 +1,4 @@
-package com.mysemna.maven.apt;
+package com.mysema.maven.apt;
 
 import static org.junit.Assert.assertTrue;
 
@@ -18,7 +18,6 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import com.mysema.maven.apt.TestAnnotationProcessorMojo;
 import com.mysema.query.apt.QuerydslAnnotationProcessor;