Restructure to ease scijava-maven-plugin merge

ctrueden · ctrueden · commit b620c36edb2b · 2021-11-12T17:50:45.000-06:00
diff --git a/.travis.yml b/.travis.yml
diff --git a/src/main/java/org/scijava/maven/plugin/enforcer/AbstractPackageEnforcementRule.java b/src/main/java/org/scijava/maven/plugin/enforcer/AbstractPackageEnforcementRule.java
@@ -1,5 +1,5 @@
 
-package org.scijava.packages.rules;
+package org.scijava.maven.plugin.enforcer;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/org/scijava/maven/plugin/enforcer/CollectionOutput.java b/src/main/java/org/scijava/maven/plugin/enforcer/CollectionOutput.java
@@ -1,4 +1,4 @@
-package org.scijava.packages.rules;
+package org.scijava.maven.plugin.enforcer;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/src/main/java/org/scijava/maven/plugin/enforcer/DirectoriesWithClasses.java b/src/main/java/org/scijava/maven/plugin/enforcer/DirectoriesWithClasses.java
@@ -1,4 +1,4 @@
-package org.scijava.packages.rules;
+package org.scijava.maven.plugin.enforcer;
 
 import static java.util.Collections.unmodifiableList;
 
diff --git a/src/main/java/org/scijava/maven/plugin/enforcer/JavaClassNameComparator.java b/src/main/java/org/scijava/maven/plugin/enforcer/JavaClassNameComparator.java
@@ -1,4 +1,4 @@
-package org.scijava.packages.rules.comparator;
+package org.scijava.maven.plugin.enforcer;
 
 import java.util.Comparator;
 
diff --git a/src/main/java/org/scijava/maven/plugin/enforcer/JavaPackageListComparator.java b/src/main/java/org/scijava/maven/plugin/enforcer/JavaPackageListComparator.java
@@ -1,4 +1,4 @@
-package org.scijava.packages.rules.comparator;
+package org.scijava.maven.plugin.enforcer;
 
 import java.util.Comparator;
 import java.util.List;
diff --git a/src/main/java/org/scijava/maven/plugin/enforcer/JavaPackageNameComparator.java b/src/main/java/org/scijava/maven/plugin/enforcer/JavaPackageNameComparator.java
@@ -1,4 +1,4 @@
-package org.scijava.packages.rules.comparator;
+package org.scijava.maven.plugin.enforcer;
 
 import java.util.Comparator;
 
diff --git a/src/main/java/org/scijava/maven/plugin/enforcer/NoPackageCyclesRule.java b/src/main/java/org/scijava/maven/plugin/enforcer/NoPackageCyclesRule.java
@@ -1,5 +1,5 @@
 
-package org.scijava.packages.rules;
+package org.scijava.maven.plugin.enforcer;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/org/scijava/maven/plugin/enforcer/NoSubpackageDependenceRule.java b/src/main/java/org/scijava/maven/plugin/enforcer/NoSubpackageDependenceRule.java
@@ -1,5 +1,5 @@
 
-package org.scijava.packages.rules;
+package org.scijava.maven.plugin.enforcer;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/org/scijava/maven/plugin/enforcer/PackageCycleCollector.java b/src/main/java/org/scijava/maven/plugin/enforcer/PackageCycleCollector.java
@@ -1,4 +1,4 @@
-package org.scijava.packages.rules;
+package org.scijava.maven.plugin.enforcer;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/src/main/java/org/scijava/maven/plugin/enforcer/PackageCycleOutput.java b/src/main/java/org/scijava/maven/plugin/enforcer/PackageCycleOutput.java
@@ -1,18 +1,15 @@
-package org.scijava.packages.rules;
+package org.scijava.maven.plugin.enforcer;
 
-import static org.scijava.packages.rules.CollectionOutput.joinCollection;
+import static org.scijava.maven.plugin.enforcer.CollectionOutput.joinCollection;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
-import org.scijava.packages.rules.CollectionOutput.Appender;
-import org.scijava.packages.rules.CollectionOutput.StringProvider;
-import org.scijava.packages.rules.comparator.JavaClassNameComparator;
-import org.scijava.packages.rules.comparator.JavaPackageListComparator;
-import org.scijava.packages.rules.comparator.JavaPackageNameComparator;
+import org.scijava.maven.plugin.enforcer.CollectionOutput.Appender;
+import org.scijava.maven.plugin.enforcer.CollectionOutput.StringProvider;
 
 import jdepend.framework.JavaClass;
 import jdepend.framework.JavaPackage;
diff --git a/src/main/java/org/scijava/maven/plugin/enforcer/SubpackageDependenceOutput.java b/src/main/java/org/scijava/maven/plugin/enforcer/SubpackageDependenceOutput.java
@@ -1,16 +1,14 @@
-package org.scijava.packages.rules;
+package org.scijava.maven.plugin.enforcer;
 
-import static org.scijava.packages.rules.CollectionOutput.joinCollection;
+import static org.scijava.maven.plugin.enforcer.CollectionOutput.joinCollection;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.scijava.packages.rules.CollectionOutput.Appender;
-import org.scijava.packages.rules.comparator.JavaClassNameComparator;
-import org.scijava.packages.rules.comparator.JavaPackageNameComparator;
+import org.scijava.maven.plugin.enforcer.CollectionOutput.Appender;
 
 import jdepend.framework.JavaClass;
 import jdepend.framework.JavaPackage;
diff --git a/src/test/java/org/scijava/maven/plugin/enforcer/CollectionOutputTest.java b/src/test/java/org/scijava/maven/plugin/enforcer/CollectionOutputTest.java
@@ -1,18 +1,18 @@
-package org.scijava.packages.rules;
+package org.scijava.maven.plugin.enforcer;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.scijava.packages.rules.CollectionOutput.joinArray;
-import static org.scijava.packages.rules.CollectionOutput.joinCollection;
+import static org.scijava.maven.plugin.enforcer.CollectionOutput.joinArray;
+import static org.scijava.maven.plugin.enforcer.CollectionOutput.joinCollection;
 
 import java.util.Collections;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.scijava.packages.rules.CollectionOutput.Appender;
-import org.scijava.packages.rules.CollectionOutput.StringProvider;
+import org.scijava.maven.plugin.enforcer.CollectionOutput.Appender;
+import org.scijava.maven.plugin.enforcer.CollectionOutput.StringProvider;
 
 public class CollectionOutputTest {
 	private final DummyAppender appender = new DummyAppender();
diff --git a/src/test/java/org/scijava/maven/plugin/enforcer/EnforcerRuleHelperMock.java b/src/test/java/org/scijava/maven/plugin/enforcer/EnforcerRuleHelperMock.java
@@ -1,4 +1,4 @@
-package org.scijava.packages.rules.mock;
+package org.scijava.maven.plugin.enforcer;
 
 import java.io.File;
 import java.util.List;
@@ -9,7 +9,6 @@
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.scijava.packages.rules.DirectoriesWithClasses;
 
 public class EnforcerRuleHelperMock implements EnforcerRuleHelper {
 
diff --git a/src/test/java/org/scijava/maven/plugin/enforcer/JDependMock.java b/src/test/java/org/scijava/maven/plugin/enforcer/JDependMock.java
@@ -1,4 +1,4 @@
-package org.scijava.packages.rules.mock;
+package org.scijava.maven.plugin.enforcer;
 
 import java.io.IOException;
 
diff --git a/src/test/java/org/scijava/maven/plugin/enforcer/LogMock.java b/src/test/java/org/scijava/maven/plugin/enforcer/LogMock.java
@@ -1,4 +1,4 @@
-package org.scijava.packages.rules.mock;
+package org.scijava.maven.plugin.enforcer;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/test/java/org/scijava/maven/plugin/enforcer/NoPackageCyclesRuleIntegrationTest.java b/src/test/java/org/scijava/maven/plugin/enforcer/NoPackageCyclesRuleIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.scijava.packages.rules;
+package org.scijava.maven.plugin.enforcer;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -12,8 +12,6 @@
 import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
 import org.junit.Before;
 import org.junit.Test;
-import org.scijava.packages.rules.NoPackageCyclesRule;
-import org.scijava.packages.rules.mock.EnforcerRuleHelperMock;
 
 public class NoPackageCyclesRuleIntegrationTest {
 	private static final URL FITNESSE_TARGET_FOLDER = getResource("fitnesse-target");
diff --git a/src/test/java/org/scijava/maven/plugin/enforcer/NoPackageCyclesRuleTest.java b/src/test/java/org/scijava/maven/plugin/enforcer/NoPackageCyclesRuleTest.java
@@ -1,4 +1,4 @@
-package org.scijava.packages.rules;
+package org.scijava.maven.plugin.enforcer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
@@ -17,9 +17,6 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
-import org.scijava.packages.rules.NoPackageCyclesRule;
-import org.scijava.packages.rules.mock.EnforcerRuleHelperMock;
-import org.scijava.packages.rules.mock.JDependMock;
 
 public class NoPackageCyclesRuleTest {
 
diff --git a/src/test/java/org/scijava/maven/plugin/enforcer/NoSubpackageDependenceRuleIntegrationTest.java b/src/test/java/org/scijava/maven/plugin/enforcer/NoSubpackageDependenceRuleIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.scijava.packages.rules;
+package org.scijava.maven.plugin.enforcer;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -12,9 +12,6 @@
 import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
 import org.junit.Before;
 import org.junit.Test;
-import org.scijava.packages.rules.NoPackageCyclesRule;
-import org.scijava.packages.rules.NoSubpackageDependenceRule;
-import org.scijava.packages.rules.mock.EnforcerRuleHelperMock;
 
 public class NoSubpackageDependenceRuleIntegrationTest {
 	private static final URL FITNESSE_TARGET_FOLDER = getResource("fitnesse-target");
diff --git a/src/test/java/org/scijava/maven/plugin/enforcer/PackageCycleCollectorPerformanceTest.java b/src/test/java/org/scijava/maven/plugin/enforcer/PackageCycleCollectorPerformanceTest.java
@@ -1,4 +1,4 @@
-package org.scijava.packages.rules;
+package org.scijava.maven.plugin.enforcer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.empty;
@@ -14,7 +14,6 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.scijava.packages.rules.PackageCycleCollector;
 
 public class PackageCycleCollectorPerformanceTest {
 	private static final int PACKAGE_MATRIX_SIZE = 20;
diff --git a/src/test/java/org/scijava/maven/plugin/enforcer/PackageCycleCollectorTest.java b/src/test/java/org/scijava/maven/plugin/enforcer/PackageCycleCollectorTest.java
@@ -1,4 +1,4 @@
-package org.scijava.packages.rules;
+package org.scijava.maven.plugin.enforcer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -13,7 +13,6 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.scijava.packages.rules.PackageCycleCollector;
 
 public class PackageCycleCollectorTest {
 
diff --git a/src/test/java/org/scijava/maven/plugin/enforcer/PackageCycleOutputTest.java b/src/test/java/org/scijava/maven/plugin/enforcer/PackageCycleOutputTest.java
@@ -1,8 +1,8 @@
-package org.scijava.packages.rules;
+package org.scijava.maven.plugin.enforcer;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.scijava.packages.rules.CollectionOutput.joinArray;
+import static org.scijava.maven.plugin.enforcer.CollectionOutput.joinArray;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,9 +12,7 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.scijava.packages.rules.CollectionOutput;
-import org.scijava.packages.rules.PackageCycleOutput;
-import org.scijava.packages.rules.CollectionOutput.StringProvider;
+import org.scijava.maven.plugin.enforcer.CollectionOutput.StringProvider;
 
 public class PackageCycleOutputTest {
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.scijava.packages.rules;`
	`1`	`+package org.scijava.maven.plugin.enforcer;`
`2`	`2`
`3`	`3`	`import java.util.Arrays;`
`4`	`4`	`import java.util.Collection;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.scijava.packages.rules.comparator;`
	`1`	`+package org.scijava.maven.plugin.enforcer;`
`2`	`2`
`3`	`3`	`import java.util.Comparator;`
`4`	`4`