Move Version to internal package

groovy · Dec 13, 2020 · 3e7363b · 3e7363b
1 parent bf6f5b7
commit 3e7363b
Show file tree

Hide file tree

Showing 23 changed files with 42 additions and 22 deletions.
diff --git a/src/main/java/org/codehaus/gmavenplus/groovyworkarounds/GroovyDocTemplateInfo.java b/src/main/java/org/codehaus/gmavenplus/groovyworkarounds/GroovyDocTemplateInfo.java
@@ -16,7 +16,7 @@
 
 package org.codehaus.gmavenplus.groovyworkarounds;
 
-import org.codehaus.gmavenplus.model.Version;
+import org.codehaus.gmavenplus.model.internal.Version;
 
 import static org.codehaus.gmavenplus.util.ClassWrangler.groovyAtLeast;
 

diff --git a/...rg/codehaus/gmavenplus/model/Version.java → ...us/gmavenplus/model/internal/Version.java b/...rg/codehaus/gmavenplus/model/Version.java → ...us/gmavenplus/model/internal/Version.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.codehaus.gmavenplus.model;
+package org.codehaus.gmavenplus.model.internal;
 
 import java.util.Arrays;
 

diff --git a/src/main/java/org/codehaus/gmavenplus/model/internal/package-info.java b/src/main/java/org/codehaus/gmavenplus/model/internal/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Classes to model supporting data.
+ */
+package org.codehaus.gmavenplus.model.internal;
diff --git a/src/main/java/org/codehaus/gmavenplus/model/package-info.java b/src/main/java/org/codehaus/gmavenplus/model/package-info.java
@@ -15,6 +15,6 @@
  */
 
 /**
- * Classes to model supporting data.
+ * Classes to model Maven parameters.
  */
 package org.codehaus.gmavenplus.model;
diff --git a/src/main/java/org/codehaus/gmavenplus/mojo/AbstractCompileMojo.java b/src/main/java/org/codehaus/gmavenplus/mojo/AbstractCompileMojo.java
@@ -18,7 +18,7 @@
 
 import org.apache.maven.plugins.annotations.Parameter;
 import org.codehaus.gmavenplus.model.IncludeClasspath;
-import org.codehaus.gmavenplus.model.Version;
+import org.codehaus.gmavenplus.model.internal.Version;
 
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;

diff --git a/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGenerateStubsMojo.java b/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGenerateStubsMojo.java
@@ -19,7 +19,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.codehaus.gmavenplus.groovyworkarounds.DotGroovyFile;
 import org.codehaus.gmavenplus.model.IncludeClasspath;
-import org.codehaus.gmavenplus.model.Version;
+import org.codehaus.gmavenplus.model.internal.Version;
 import org.codehaus.gmavenplus.util.FileUtils;
 
 import java.io.File;

diff --git a/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovyDocMojo.java b/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovyDocMojo.java
@@ -23,7 +23,7 @@
 import org.codehaus.gmavenplus.model.IncludeClasspath;
 import org.codehaus.gmavenplus.model.Link;
 import org.codehaus.gmavenplus.model.Scopes;
-import org.codehaus.gmavenplus.model.Version;
+import org.codehaus.gmavenplus.model.internal.Version;
 import org.codehaus.gmavenplus.util.FileUtils;
 
 import java.io.*;

diff --git a/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovyMojo.java b/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovyMojo.java
@@ -23,7 +23,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.gmavenplus.model.IncludeClasspath;
-import org.codehaus.gmavenplus.model.Version;
+import org.codehaus.gmavenplus.model.internal.Version;
 import org.codehaus.gmavenplus.util.ClassWrangler;
 
 import java.io.File;

diff --git a/src/main/java/org/codehaus/gmavenplus/mojo/ExecuteMojo.java b/src/main/java/org/codehaus/gmavenplus/mojo/ExecuteMojo.java
@@ -21,7 +21,7 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.codehaus.gmavenplus.model.Version;
+import org.codehaus.gmavenplus.model.internal.Version;
 import org.codehaus.gmavenplus.util.FileUtils;
 import org.codehaus.gmavenplus.util.NoExitSecurityManager;
 

diff --git a/src/main/java/org/codehaus/gmavenplus/mojo/ShellMojo.java b/src/main/java/org/codehaus/gmavenplus/mojo/ShellMojo.java
@@ -21,7 +21,7 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.codehaus.gmavenplus.model.Version;
+import org.codehaus.gmavenplus.model.internal.Version;
 import org.codehaus.gmavenplus.util.NoExitSecurityManager;
 
 import java.lang.reflect.InvocationTargetException;

diff --git a/src/main/java/org/codehaus/gmavenplus/util/ClassWrangler.java b/src/main/java/org/codehaus/gmavenplus/util/ClassWrangler.java
@@ -17,7 +17,7 @@
 package org.codehaus.gmavenplus.util;
 
 import org.apache.maven.plugin.logging.Log;
-import org.codehaus.gmavenplus.model.Version;
+import org.codehaus.gmavenplus.model.internal.Version;
 
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;

diff --git a/src/test/java/org/codehaus/gmavenplus/groovyworkarounds/GroovyDocTemplateInfoTest.java b/src/test/java/org/codehaus/gmavenplus/groovyworkarounds/GroovyDocTemplateInfoTest.java
@@ -1,6 +1,6 @@
 package org.codehaus.gmavenplus.groovyworkarounds;
 
-import org.codehaus.gmavenplus.model.Version;
+import org.codehaus.gmavenplus.model.internal.Version;
 import org.junit.Test;
 
 import static org.junit.Assert.assertArrayEquals;

diff --git a/...odehaus/gmavenplus/model/VersionTest.java → ...mavenplus/model/internal/VersionTest.java b/...odehaus/gmavenplus/model/VersionTest.java → ...mavenplus/model/internal/VersionTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.gmavenplus.model;
+package org.codehaus.gmavenplus.model.internal;
 
 import org.junit.Test;
 

diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/AbstractCompileMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/AbstractCompileMojoTest.java
@@ -16,7 +16,7 @@
 
 package org.codehaus.gmavenplus.mojo;
 
-import org.codehaus.gmavenplus.model.Version;
+import org.codehaus.gmavenplus.model.internal.Version;
 import org.codehaus.gmavenplus.util.ClassWrangler;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/AbstractGenerateStubsMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/AbstractGenerateStubsMojoTest.java
@@ -18,7 +18,7 @@
 
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.model.fileset.FileSet;
-import org.codehaus.gmavenplus.model.Version;
+import org.codehaus.gmavenplus.model.internal.Version;
 import org.codehaus.gmavenplus.util.ClassWrangler;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/AbstractGroovyMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/AbstractGroovyMojoTest.java
@@ -16,7 +16,7 @@
 
 package org.codehaus.gmavenplus.mojo;
 
-import org.codehaus.gmavenplus.model.Version;
+import org.codehaus.gmavenplus.model.internal.Version;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/CompileMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/CompileMojoTest.java
@@ -21,7 +21,7 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.model.fileset.FileSet;
-import org.codehaus.gmavenplus.model.Version;
+import org.codehaus.gmavenplus.model.internal.Version;
 import org.codehaus.gmavenplus.util.ClassWrangler;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/CompileTestsMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/CompileTestsMojoTest.java
@@ -21,7 +21,7 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.model.fileset.FileSet;
-import org.codehaus.gmavenplus.model.Version;
+import org.codehaus.gmavenplus.model.internal.Version;
 import org.codehaus.gmavenplus.util.ClassWrangler;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/ExecuteMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/ExecuteMojoTest.java
@@ -19,7 +19,7 @@
 import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.project.MavenProject;
-import org.codehaus.gmavenplus.model.Version;
+import org.codehaus.gmavenplus.model.internal.Version;
 import org.codehaus.gmavenplus.util.ClassWrangler;
 import org.codehaus.gmavenplus.util.FileUtils;
 import org.junit.Before;

diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/GenerateStubsMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/GenerateStubsMojoTest.java
@@ -21,7 +21,7 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.model.fileset.FileSet;
-import org.codehaus.gmavenplus.model.Version;
+import org.codehaus.gmavenplus.model.internal.Version;
 import org.codehaus.gmavenplus.util.ClassWrangler;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/GenerateTestStubsMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/GenerateTestStubsMojoTest.java
@@ -21,7 +21,7 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.model.fileset.FileSet;
-import org.codehaus.gmavenplus.model.Version;
+import org.codehaus.gmavenplus.model.internal.Version;
 import org.codehaus.gmavenplus.util.ClassWrangler;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/GroovyDocMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/GroovyDocMojoTest.java
@@ -20,7 +20,7 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.model.fileset.FileSet;
-import org.codehaus.gmavenplus.model.Version;
+import org.codehaus.gmavenplus.model.internal.Version;
 import org.codehaus.gmavenplus.util.ClassWrangler;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/GroovyDocTestsMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/GroovyDocTestsMojoTest.java
@@ -20,7 +20,7 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.model.fileset.FileSet;
-import org.codehaus.gmavenplus.model.Version;
+import org.codehaus.gmavenplus.model.internal.Version;
 import org.codehaus.gmavenplus.util.ClassWrangler;
 import org.junit.Before;
 import org.junit.Test;