OC-194: rename classes to org.openclover

pom.xml

@@ -58,7 +58,7 @@ under the License.
     </prerequisites>
     <properties>
         <!-- Clover Core version -->
-        <cloverVersion>4.5.2</cloverVersion>
+        <cloverVersion>4.6.0-SNAPSHOT</cloverVersion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <gpg.skip>true</gpg.skip>
     </properties>

src/it/allSrcExcluded/src/main/java/com/atlassian/maven/plugin/clover/samples/allsrcexcluded/Simple.java → src/it/allSrcExcluded/src/main/java/Simple.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.atlassian.maven.plugin.clover.samples.allsrcexcluded;
 
 public class Simple
 {

src/it/allSrcExcluded/src/test/java/com/atlassian/maven/plugin/clover/samples/allsrcexcluded/SimpleTest.java → src/it/allSrcExcluded/src/test/java/SimpleTest.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.atlassian.maven.plugin.clover.samples.allsrcexcluded;
 
 import junit.framework.TestCase;
 

src/it/contexts/src/main/java/com/atlassian/maven/plugin/clover/samples/contexts/Simple.java → src/it/contexts/src/main/java/Simple.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.atlassian.maven.plugin.clover.samples.contexts;
 
 public class Simple {
     public void someMethod1() {

src/it/contexts/src/test/java/com/atlassian/maven/plugin/clover/samples/contexts/SimpleTest.java → src/it/contexts/src/test/java/SimpleTest.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.atlassian.maven.plugin.clover.samples.contexts;
 
 import org.junit.Test;
 

src/it/contexts/src/test/verifier/verifications.xml

@@ -25,15 +25,15 @@ under the License.
             <contains>57.1%</contains>
         </file>
         <file>
-            <location>target/site/clover/com/atlassian/maven/plugin/clover/samples/contexts/SimpleTest.html</location>
+            <location>target/site/clover/SimpleTest.html</location>
             <contains>Filtered by: simple</contains>
         </file>
         <file>
-            <location>target/site/clover/com/atlassian/maven/plugin/clover/samples/contexts/SimpleTest.html</location>
+            <location>target/site/clover/SimpleTest.html</location>
             <contains>Filtered by: aggregated</contains>
         </file>
         <file>
-            <location>target/site/clover/com/atlassian/maven/plugin/clover/samples/contexts/SimpleTest.html</location>
+            <location>target/site/clover/SimpleTest.html</location>
             <contains>Filtered by: any</contains>
         </file>
     </files>

src/it/custom-test-pattern/src/main/java/com/atlassian/maven/plugin/clover/samples/testsources/Simple.java → src/it/custom-test-pattern/src/main/java/org/openclover/maven/samples/Simple.java

@@ -1,4 +1,4 @@
-package com.atlassian.maven.plugin.clover.samples.testsources;
+package org.openclover.maven.samples;
 
 public class Simple {
     public static void main(String[] argv) {

src/it/custom-test-pattern/src/test/java/com/atlassian/maven/plugin/clover/samples/testsources/ExampleOne.java → src/it/custom-test-pattern/src/test/java/org/openclover/maven/samples/ExampleOne.java

@@ -1,4 +1,4 @@
-package com.atlassian.maven.plugin.clover.samples.testsources;
+package org.openclover.maven.samples;
 
 import org.junit.Test;
 

src/it/custom-test-pattern/src/test/java/com/atlassian/maven/plugin/clover/samples/testsources/ExampleTwoIT.java → src/it/custom-test-pattern/src/test/java/org/openclover/maven/samples/ExampleTwoIT.java

@@ -1,4 +1,4 @@
-package com.atlassian.maven.plugin.clover.samples.testsources;
+package org.openclover.maven.samples;
 
 import static org.junit.Assert.assertTrue;
 

src/it/custom-test-pattern/src/test/java/com/atlassian/maven/plugin/clover/samples/testsources/NoTestSuiteSoNotOne.java → src/it/custom-test-pattern/src/test/java/org/openclover/maven/samples/NoTestSuiteSoNotOne.java

@@ -1,4 +1,4 @@
-package com.atlassian.maven.plugin.clover.samples.testsources;
+package org.openclover.maven.samples;
 
 import org.junit.Test;
 

src/it/custom-test-pattern/src/test/java/com/atlassian/maven/plugin/clover/samples/testsources/NotExampleThree.java → src/it/custom-test-pattern/src/test/java/org/openclover/maven/samples/NotExampleThree.java

@@ -1,4 +1,4 @@
-package com.atlassian.maven.plugin.clover.samples.testsources;
+package org.openclover.maven.samples;
 
 import static org.junit.Assert.assertTrue;
 

src/it/custom-test-pattern/src/test/java/com/atlassian/maven/plugin/clover/samples/testsources/TestSuite.java → src/it/custom-test-pattern/src/test/java/org/openclover/maven/samples/TestSuite.java

@@ -1,4 +1,4 @@
-package com.atlassian.maven.plugin.clover.samples.testsources;
+package org.openclover.maven.samples;
 
 /**
  * A marker to test if OpenClover recognizes annotations.

src/it/custom-test-pattern/src/test/java/com/atlassian/maven/plugin/clover/samples/testsources/WebTest.java → src/it/custom-test-pattern/src/test/java/org/openclover/maven/samples/WebTest.java

@@ -1,4 +1,4 @@
-package com.atlassian.maven.plugin.clover.samples.testsources;
+package org.openclover.maven.samples;
 
 /**
  * Simulate a base class for tests.

src/it/custom-test-pattern/src/test/java/com/atlassian/maven/plugin/clover/samples/testsources/classic/ExampleThree.java → src/it/custom-test-pattern/src/test/java/org/openclover/maven/samples/classic/ExampleThree.java

@@ -1,4 +1,4 @@
-package com.atlassian.maven.plugin.clover.samples.testsources.classic;
+package org.openclover.maven.samples.classic;
 
 import static org.junit.Assert.assertTrue;
 

src/it/custom-test-pattern/src/test/java/com/atlassian/maven/plugin/clover/samples/testsources/excluded/ExcludedOne.java → src/it/custom-test-pattern/src/test/java/org/openclover/maven/samples/excluded/ExcludedOne.java

@@ -1,11 +1,11 @@
-package com.atlassian.maven.plugin.clover.samples.testsources.excluded;
+package org.openclover.maven.samples.excluded;
 
-import com.atlassian.maven.plugin.clover.samples.testsources.ExampleOne;
-import com.atlassian.maven.plugin.clover.samples.testsources.ExampleTwoIT;
-import com.atlassian.maven.plugin.clover.samples.testsources.NoTestSuiteSoNotOne;
-import com.atlassian.maven.plugin.clover.samples.testsources.NotExampleThree;
-import com.atlassian.maven.plugin.clover.samples.testsources.TestSuite;
-import com.atlassian.maven.plugin.clover.samples.testsources.classic.ExampleThree;
+import org.openclover.maven.samples.ExampleOne;
+import org.openclover.maven.samples.ExampleTwoIT;
+import org.openclover.maven.samples.NoTestSuiteSoNotOne;
+import org.openclover.maven.samples.NotExampleThree;
+import org.openclover.maven.samples.TestSuite;
+import org.openclover.maven.samples.classic.ExampleThree;
 import org.junit.Before;
 import org.junit.Test;
 

src/it/custom-test-pattern/src/test/verifier/verifications.xml

@@ -22,34 +22,34 @@ under the License.
     <files>
         <!--com.atlassian.maven.plugin.clover.samples.testsources.classic.ExampleThree-->
         <file>
-            <location>target/site/clover/com/atlassian/maven/plugin/clover/samples/testsources/classic/ExampleThree.html</location>
+            <location>target/site/clover/org/openclover/maven/samples/testsources/classic/ExampleThree.html</location>
             <contains>ExampleThree\.testExampleThree</contains>
         </file>
         <file>
-            <location>target/site/clover/com/atlassian/maven/plugin/clover/samples/testsources/classic/ExampleThree.html</location>
+            <location>target/site/clover/org/openclover/maven/samples/testsources/classic/ExampleThree.html</location>
             <contains>(?!ExampleThree\.testNotExampleThree)</contains>
         </file>
         <!--com.atlassian.maven.plugin.clover.samples.testsources.excluded.ExcludedOne-->
         <file>
-            <location>target/site/clover/com/atlassian/maven/plugin/clover/samples/testsources/excluded/ExcludedOne.html</location>
+            <location>target/site/clover/org/openclover/maven/samples/testsources/excluded/ExcludedOne.html</location>
             <contains>No tests hitting this source file were found</contains>
         </file>
         <!--com.atlassian.maven.plugin.clover.samples.testsources.ExampleOne-->
         <file>
-            <location>target/site/clover/com/atlassian/maven/plugin/clover/samples/testsources/ExampleOne.html</location>
+            <location>target/site/clover/org/openclover/maven/samples/testsources/ExampleOne.html</location>
             <contains>ExampleOne\.testExampleOne</contains>
         </file>
         <file>
-            <location>target/site/clover/com/atlassian/maven/plugin/clover/samples/testsources/ExampleOne.html</location>
+            <location>target/site/clover/org/openclover/maven/samples/testsources/ExampleOne.html</location>
             <contains>(?!ExampleOne\.notTestExampleOne)</contains>
         </file>
         <!--com.atlassian.maven.plugin.clover.samples.testsources.ExampleTwoIT-->
         <file>
-            <location>target/site/clover/com/atlassian/maven/plugin/clover/samples/testsources/ExampleTwoIT.html</location>
+            <location>target/site/clover/org/openclover/maven/samples/testsources/ExampleTwoIT.html</location>
             <contains>ExampleTwoIT\.getRequest</contains>
         </file>
         <file>
-            <location>target/site/clover/com/atlassian/maven/plugin/clover/samples/testsources/ExampleTwoIT.html</location>
+            <location>target/site/clover/org/openclover/maven/samples/testsources/ExampleTwoIT.html</location>
             <contains>ExampleTwoIT\.postRequest</contains>
         </file>
         <!-- TODO uncomment when OC-96 is implemented -->
@@ -59,12 +59,12 @@ under the License.
         </file>-->
         <!--com.atlassian.maven.plugin.clover.samples.testsources.NoTestSuiteSoNotOne-->
         <file>
-            <location>target/site/clover/com/atlassian/maven/plugin/clover/samples/testsources/NoTestSuiteSoNotOne.html</location>
+            <location>target/site/clover/org/openclover/maven/samples/testsources/NoTestSuiteSoNotOne.html</location>
             <contains>No tests hitting this source file were found</contains>
         </file>
         <!--com.atlassian.maven.plugin.clover.samples.testsources.NotExampleThree-->
         <file>
-            <location>target/site/clover/com/atlassian/maven/plugin/clover/samples/testsources/NotExampleThree.html</location>
+            <location>target/site/clover/org/openclover/maven/samples/testsources/NotExampleThree.html</location>
             <contains>No tests hitting this source file were found</contains>
         </file>
     </files>

src/it/fork-maven-plugin/src/main/java/com/atlassian/maven/plugins/sample/AddClassifierMojo.java → src/it/fork-maven-plugin/src/main/java/org/openclover/maven/samples/AddClassifierMojo.java

@@ -1,33 +1,33 @@
-package com.atlassian.maven.plugins.sample;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.repository.RepositorySystem;
-
-/**
- * Change artifact classifier to 'fork'.
- */
-@Mojo(name = "add-classifier")
-public class AddClassifierMojo extends AbstractMojo {
-
-    @Parameter(defaultValue = "${project}", required = true)
-    private MavenProject project;
-
-    @Component
-    private RepositorySystem repositorySystem;
-
-    public void execute() {
-        final Artifact oldArtifact = project.getArtifact();
-        final Artifact newArtifact = repositorySystem.createArtifactWithClassifier(
-                oldArtifact.getGroupId(),
-                oldArtifact.getArtifactId(),
-                oldArtifact.getVersion(),
-                oldArtifact.getType(),
-                "fork");
-        project.setArtifact(newArtifact);
-    }
-}
+package org.openclover.maven.samples;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.repository.RepositorySystem;
+
+/**
+ * Change artifact classifier to 'fork'.
+ */
+@Mojo(name = "add-classifier")
+public class AddClassifierMojo extends AbstractMojo {
+
+    @Parameter(defaultValue = "${project}", required = true)
+    private MavenProject project;
+
+    @Component
+    private RepositorySystem repositorySystem;
+
+    public void execute() {
+        final Artifact oldArtifact = project.getArtifact();
+        final Artifact newArtifact = repositorySystem.createArtifactWithClassifier(
+                oldArtifact.getGroupId(),
+                oldArtifact.getArtifactId(),
+                oldArtifact.getVersion(),
+                oldArtifact.getType(),
+                "fork");
+        project.setArtifact(newArtifact);
+    }
+}

src/it/fork-maven-plugin/src/main/java/com/atlassian/maven/plugins/sample/LifecycleForkMojo.java → src/it/fork-maven-plugin/src/main/java/org/openclover/maven/samples/LifecycleForkMojo.java

@@ -1,17 +1,17 @@
-package com.atlassian.maven.plugins.sample;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugins.annotations.Execute;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-
-/**
- * Fork a build life cycle and run till the 'install' phase.
- */
-@Execute(phase = LifecyclePhase.INSTALL, goal = "fork", lifecycle = "fork")
-@Mojo(name = "fork")
-public class LifecycleForkMojo extends AbstractMojo {
-    public void execute() {
-
-    }
-}
+package org.openclover.maven.samples;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+
+/**
+ * Fork a build life cycle and run till the 'install' phase.
+ */
+@Execute(phase = LifecyclePhase.INSTALL, goal = "fork", lifecycle = "fork")
+@Mojo(name = "fork")
+public class LifecycleForkMojo extends AbstractMojo {
+    public void execute() {
+
+    }
+}

src/it/gmaven-plugin/src/main/groovy/com/atlassian/maven/plugins/Example.groovy → src/it/gmaven-plugin-no-java/src/main/groovy/org/openclover/maven/samples/Example.groovy

@@ -1,4 +1,4 @@
-package com.atlassian.maven.plugins
+package org.openclover.maven.samples
 
 /**
  * Example Groovy class.

src/it/gmaven-plugin-no-java/src/test/groovy/com/atlassian/maven/plugins/ExampleTest.groovy → src/it/gmaven-plugin-no-java/src/test/groovy/org/openclover/maven/samples/ExampleTest.groovy

@@ -1,7 +1,4 @@
-package com.atlassian.maven.plugins
-
-import groovy.util.GroovyTestCase
-
+package org.openclover.maven.samples
 /**
  * Tests for the {@link Example} class.
  */

src/it/gmaven-plugin-no-java/src/main/groovy/com/atlassian/maven/plugins/Example.groovy → src/it/gmaven-plugin/src/main/groovy/org/openclover/maven/samples/Example.groovy

@@ -1,4 +1,4 @@
-package com.atlassian.maven.plugins
+package org.openclover.maven.samples
 
 /**
  * Example Groovy class.

src/it/gmaven-plugin/src/main/java/com/atlassian/maven/plugins/Helper.java → src/it/gmaven-plugin/src/main/java/org/openclover/maven/samples/Helper.java

@@ -1,4 +1,4 @@
-package com.atlassian.maven.plugins;
+package org.openclover.maven.samples;
 
 /**
  * Example Java class.

src/it/gmaven-plugin/src/test/groovy/com/atlassian/maven/plugins/ExampleTest.groovy → src/it/gmaven-plugin/src/test/groovy/org/openclover/maven/samples/ExampleTest.groovy

@@ -1,7 +1,4 @@
-package com.atlassian.maven.plugins
-
-import groovy.util.GroovyTestCase
-
+package org.openclover.maven.samples
 /**
  * Tests for the {@link Example} class.
  */

src/it/gmaven-plugin/src/test/groovy/com/atlassian/maven/plugins/HelperTest.groovy → src/it/gmaven-plugin/src/test/groovy/org/openclover/maven/samples/HelperTest.groovy

@@ -1,4 +1,4 @@
-package com.atlassian.maven.plugins
+package org.openclover.maven.samples
 
 import groovy.util.GroovyTestCase
 

src/it/groovy-eclipse-plugin/src/main/groovy/com/atlassian/maven/plugins/GroovyExample.groovy → src/it/groovy-eclipse-plugin/src/main/groovy/org/openclover/maven/samples/GroovyExample.groovy

@@ -1,4 +1,4 @@
-package com.atlassian.maven.plugins
+package org.openclover.maven.samples
 
 /**
  * GroovyExample Groovy class.

src/it/groovy-eclipse-plugin/src/main/groovy/com/atlassian/maven/plugins/GroovyExcludedFile.groovy → src/it/groovy-eclipse-plugin/src/main/groovy/org/openclover/maven/samples/GroovyExcludedFile.groovy

@@ -1,10 +1,10 @@
-package com.atlassian.maven.plugins
-
-/**
- * Test: file shall not be instrumented by Clover, but still compiled
- */
-class GroovyExcludedFile {
-    def excluded() {
-        println 'GroovyExcludedFile.excluded: this shall not be in the report'
-    }
-}
+package org.openclover.maven.samples
+
+/**
+ * Test: file shall not be instrumented by Clover, but still compiled
+ */
+class GroovyExcludedFile {
+    def excluded() {
+        println 'GroovyExcludedFile.excluded: this shall not be in the report'
+    }
+}

src/it/groovy-eclipse-plugin/src/main/groovy/com/atlassian/maven/plugins/GroovyHelper.groovy → src/it/groovy-eclipse-plugin/src/main/groovy/org/openclover/maven/samples/GroovyHelper.groovy

@@ -1,5 +1,4 @@
-package com.atlassian.maven.plugins
-
+package org.openclover.maven.samples
 /**
  * GroovyExample Java class.
  */

src/it/groovy-eclipse-plugin/src/main/java/com/atlassian/maven/plugins/JavaExample.java → src/it/groovy-eclipse-plugin/src/main/java/org/openclover/maven/samples/JavaExample.java

@@ -1,4 +1,4 @@
-package com.atlassian.maven.plugins;
+package org.openclover.maven.samples;
 
 /**
  * GroovyExample Groovy class.

src/it/groovy-eclipse-plugin/src/main/java/com/atlassian/maven/plugins/JavaExcludedFile.java → src/it/groovy-eclipse-plugin/src/main/java/org/openclover/maven/samples/JavaExcludedFile.java

@@ -1,10 +1,10 @@
-package com.atlassian.maven.plugins;
-
-/**
- *
- */
-public class JavaExcludedFile {
-    public void excluded() {
-        System.out.println("JavaExcludedFile.excluded: this shall not be in the report");
-    }
-}
+package org.openclover.maven.samples;
+
+/**
+ *
+ */
+public class JavaExcludedFile {
+    public void excluded() {
+        System.out.println("JavaExcludedFile.excluded: this shall not be in the report");
+    }
+}

src/it/groovy-eclipse-plugin/src/main/java/com/atlassian/maven/plugins/JavaHelper.java → src/it/groovy-eclipse-plugin/src/main/java/org/openclover/maven/samples/JavaHelper.java

@@ -1,4 +1,4 @@
-package com.atlassian.maven.plugins;
+package org.openclover.maven.samples;
 
 /**
  * GroovyExample Java class.