This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git
The following commit(s) were added to refs/heads/master by this push:
new 5182319 [MSHARED-1452] Rename package (#76)
5182319 is described below
commit 5182319d0174aa2e85ff05322a5ccbad0112ec10
Author: Guillaume Nodet <[email protected]>
AuthorDate: Tue Nov 26 17:11:34 2024 +0100
[MSHARED-1452] Rename package (#76)
---
.../{ => shared}/archiver/ManifestConfiguration.java | 20 ++++++++++----------
.../maven/{ => shared}/archiver/ManifestSection.java | 2 +-
.../archiver/MavenArchiveConfiguration.java | 10 +++++-----
.../maven/{ => shared}/archiver/MavenArchiver.java | 14 +++++++-------
.../archiver/MavenArchiverException.java | 2 +-
.../{ => shared}/archiver/PomPropertiesUtil.java | 2 +-
.../archiver/ManifestConfigurationTest.java | 2 +-
.../archiver/MavenArchiveConfigurationTest.java | 2 +-
.../{ => shared}/archiver/MavenArchiverTest.java | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/main/java/org/apache/maven/archiver/ManifestConfiguration.java
b/src/main/java/org/apache/maven/shared/archiver/ManifestConfiguration.java
similarity index 92%
rename from src/main/java/org/apache/maven/archiver/ManifestConfiguration.java
rename to
src/main/java/org/apache/maven/shared/archiver/ManifestConfiguration.java
index 6b839b3..e1cd9b3 100644
--- a/src/main/java/org/apache/maven/archiver/ManifestConfiguration.java
+++ b/src/main/java/org/apache/maven/shared/archiver/ManifestConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.archiver;
+package org.apache.maven.shared.archiver;
/**
* Capture common manifest configuration.
@@ -259,7 +259,7 @@ public class ManifestConfiguration {
* 'repository' (CLASSPATH_LAYOUT_TYPE_REPOSITORY, or the same as a maven
classpath layout), and 'custom'
* (CLASSPATH_LAYOUT_TYPE_CUSTOM). <br>
* <b>NOTE:</b> If you specify a type of 'custom' you MUST set
- * {@link
org.apache.maven.archiver.ManifestConfiguration#setCustomClasspathLayout(String)}.
+ * {@link ManifestConfiguration#setCustomClasspathLayout(String)}.
*
* @return The classpath layout type.
*/
@@ -271,9 +271,9 @@ public class ManifestConfiguration {
* Set the type of layout to use when formatting classpath entries. Should
be one of: 'simple'
* (CLASSPATH_LAYOUT_TYPE_SIMPLE), 'repository'
(CLASSPATH_LAYOUT_TYPE_REPOSITORY, or the same as a maven classpath
* layout), and 'custom' (CLASSPATH_LAYOUT_TYPE_CUSTOM). The constant
names noted here are defined in the
- * {@link org.apache.maven.archiver.ManifestConfiguration} class. <br>
+ * {@link ManifestConfiguration} class. <br>
* <b>NOTE:</b> If you specify a type of 'custom' you MUST set
- * {@link
org.apache.maven.archiver.ManifestConfiguration#setCustomClasspathLayout(String)}.
+ * {@link ManifestConfiguration#setCustomClasspathLayout(String)}.
*
* @param classpathLayoutType The classpath layout type.
*/
@@ -283,7 +283,7 @@ public class ManifestConfiguration {
/**
* Retrieve the layout expression for use when the layout type set in
- * {@link
org.apache.maven.archiver.ManifestConfiguration#setClasspathLayoutType(String)}
has the value 'custom'.
+ * {@link ManifestConfiguration#setClasspathLayoutType(String)} has the
value 'custom'.
* <b>The default value is
* null.</b> Expressions will be evaluated against the following ordered
list of classpath-related objects:
* <ol>
@@ -301,7 +301,7 @@ public class ManifestConfiguration {
/**
* Set the layout expression for use when the layout type set in
- * {@link
org.apache.maven.archiver.ManifestConfiguration#setClasspathLayoutType(String)}
has the value 'custom'.
+ * {@link ManifestConfiguration#setClasspathLayoutType(String)} has the
value 'custom'.
* Expressions will be
* evaluated against the following ordered list of classpath-related
objects:
* <ol>
@@ -312,10 +312,10 @@ public class ManifestConfiguration {
* <b>NOTE:</b> If you specify a layout type of 'custom' you MUST set this
layout expression.
* You can take a look at
* <ol>
- * <li>{@link org.apache.maven.archiver.MavenArchiver#SIMPLE_LAYOUT}</li>
- * <li>{@link
org.apache.maven.archiver.MavenArchiver#SIMPLE_LAYOUT_NONUNIQUE}</li>
- * <li>{@link
org.apache.maven.archiver.MavenArchiver#REPOSITORY_LAYOUT}</li>
- * <li>{@link
org.apache.maven.archiver.MavenArchiver#REPOSITORY_LAYOUT_NONUNIQUE}</li>
+ * <li>{@link MavenArchiver#SIMPLE_LAYOUT}</li>
+ * <li>{@link MavenArchiver#SIMPLE_LAYOUT_NONUNIQUE}</li>
+ * <li>{@link MavenArchiver#REPOSITORY_LAYOUT}</li>
+ * <li>{@link MavenArchiver#REPOSITORY_LAYOUT_NONUNIQUE}</li>
* </ol>
* how such an expression looks like.
*
diff --git a/src/main/java/org/apache/maven/archiver/ManifestSection.java
b/src/main/java/org/apache/maven/shared/archiver/ManifestSection.java
similarity index 98%
rename from src/main/java/org/apache/maven/archiver/ManifestSection.java
rename to src/main/java/org/apache/maven/shared/archiver/ManifestSection.java
index dd08e6c..91c138b 100644
--- a/src/main/java/org/apache/maven/archiver/ManifestSection.java
+++ b/src/main/java/org/apache/maven/shared/archiver/ManifestSection.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.archiver;
+package org.apache.maven.shared.archiver;
import java.util.LinkedHashMap;
import java.util.Map;
diff --git
a/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java
b/src/main/java/org/apache/maven/shared/archiver/MavenArchiveConfiguration.java
similarity index 95%
rename from
src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java
rename to
src/main/java/org/apache/maven/shared/archiver/MavenArchiveConfiguration.java
index 86606a1..a19980e 100644
--- a/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java
+++
b/src/main/java/org/apache/maven/shared/archiver/MavenArchiveConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.archiver;
+package org.apache.maven.shared.archiver;
import java.nio.file.Path;
import java.util.LinkedHashMap;
@@ -144,7 +144,7 @@ public class MavenArchiveConfiguration {
/**
* <p>Setter for the field <code>manifest</code>.</p>
*
- * @param manifest {@link org.apache.maven.archiver.ManifestConfiguration}
+ * @param manifest {@link ManifestConfiguration}
*/
public void setManifest(ManifestConfiguration manifest) {
this.manifest = manifest;
@@ -199,7 +199,7 @@ public class MavenArchiveConfiguration {
/**
* <p>addManifestSection.</p>
*
- * @param section {@link org.apache.maven.archiver.ManifestSection}
+ * @param section {@link ManifestSection}
*/
public void addManifestSection(ManifestSection section) {
manifestSections.add(section);
@@ -208,7 +208,7 @@ public class MavenArchiveConfiguration {
/**
* <p>addManifestSections.</p>
*
- * @param list Added list of {@link
org.apache.maven.archiver.ManifestSection}.
+ * @param list Added list of {@link ManifestSection}.
*/
public void addManifestSections(List<ManifestSection> list) {
manifestSections.addAll(list);
@@ -235,7 +235,7 @@ public class MavenArchiveConfiguration {
/**
* <p>Setter for the field <code>manifestSections</code>.</p>
*
- * @param manifestSections set The list of {@link
org.apache.maven.archiver.ManifestSection}.
+ * @param manifestSections set The list of {@link ManifestSection}.
*/
public void setManifestSections(List<ManifestSection> manifestSections) {
this.manifestSections = manifestSections;
diff --git a/src/main/java/org/apache/maven/archiver/MavenArchiver.java
b/src/main/java/org/apache/maven/shared/archiver/MavenArchiver.java
similarity index 98%
rename from src/main/java/org/apache/maven/archiver/MavenArchiver.java
rename to src/main/java/org/apache/maven/shared/archiver/MavenArchiver.java
index 2117572..31151ee 100644
--- a/src/main/java/org/apache/maven/archiver/MavenArchiver.java
+++ b/src/main/java/org/apache/maven/shared/archiver/MavenArchiver.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.archiver;
+package org.apache.maven.shared.archiver;
import javax.lang.model.SourceVersion;
@@ -60,9 +60,9 @@ import org.codehaus.plexus.interpolation.RecursionInterceptor;
import org.codehaus.plexus.interpolation.StringSearchInterpolator;
import org.codehaus.plexus.interpolation.ValueSource;
-import static
org.apache.maven.archiver.ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM;
-import static
org.apache.maven.archiver.ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_REPOSITORY;
-import static
org.apache.maven.archiver.ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_SIMPLE;
+import static
org.apache.maven.shared.archiver.ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM;
+import static
org.apache.maven.shared.archiver.ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_REPOSITORY;
+import static
org.apache.maven.shared.archiver.ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_SIMPLE;
/**
* MavenArchiver class.
@@ -188,7 +188,7 @@ public class MavenArchiver {
* Return a pre-configured manifest.
*
* @param project {@link org.apache.maven.api.Project}
- * @param config {@link org.apache.maven.archiver.ManifestConfiguration}
+ * @param config {@link ManifestConfiguration}
* @return {@link org.codehaus.plexus.archiver.jar.Manifest}
* @throws MavenArchiverException exception.
*/
@@ -227,7 +227,7 @@ public class MavenArchiver {
*
* @param session {@link org.apache.maven.api.Session}
* @param project {@link org.apache.maven.api.Project}
- * @param config {@link org.apache.maven.archiver.ManifestConfiguration}
+ * @param config {@link ManifestConfiguration}
* @param entries The entries.
* @return {@link org.codehaus.plexus.archiver.jar.Manifest}
* @throws MavenArchiverException exception
@@ -487,7 +487,7 @@ public class MavenArchiver {
*
* @param session {@link org.apache.maven.api.Session}
* @param project {@link org.apache.maven.api.Project}
- * @param archiveConfiguration {@link
org.apache.maven.archiver.MavenArchiveConfiguration}
+ * @param archiveConfiguration {@link MavenArchiveConfiguration}
* @throws MavenArchiverException Archiver Exception.
*/
public void createArchive(Session session, Project project,
MavenArchiveConfiguration archiveConfiguration)
diff --git
a/src/main/java/org/apache/maven/archiver/MavenArchiverException.java
b/src/main/java/org/apache/maven/shared/archiver/MavenArchiverException.java
similarity index 96%
rename from src/main/java/org/apache/maven/archiver/MavenArchiverException.java
rename to
src/main/java/org/apache/maven/shared/archiver/MavenArchiverException.java
index 798981e..6addd56 100644
--- a/src/main/java/org/apache/maven/archiver/MavenArchiverException.java
+++ b/src/main/java/org/apache/maven/shared/archiver/MavenArchiverException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.archiver;
+package org.apache.maven.shared.archiver;
import org.apache.maven.api.services.MavenException;
diff --git a/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
b/src/main/java/org/apache/maven/shared/archiver/PomPropertiesUtil.java
similarity index 99%
rename from src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
rename to src/main/java/org/apache/maven/shared/archiver/PomPropertiesUtil.java
index de9722c..3eb523e 100644
--- a/src/main/java/org/apache/maven/archiver/PomPropertiesUtil.java
+++ b/src/main/java/org/apache/maven/shared/archiver/PomPropertiesUtil.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.archiver;
+package org.apache.maven.shared.archiver;
import java.io.BufferedReader;
import java.io.IOException;
diff --git
a/src/test/java/org/apache/maven/archiver/ManifestConfigurationTest.java
b/src/test/java/org/apache/maven/shared/archiver/ManifestConfigurationTest.java
similarity index 97%
rename from
src/test/java/org/apache/maven/archiver/ManifestConfigurationTest.java
rename to
src/test/java/org/apache/maven/shared/archiver/ManifestConfigurationTest.java
index d662d6f..fdacf86 100644
--- a/src/test/java/org/apache/maven/archiver/ManifestConfigurationTest.java
+++
b/src/test/java/org/apache/maven/shared/archiver/ManifestConfigurationTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.archiver;
+package org.apache.maven.shared.archiver;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git
a/src/test/java/org/apache/maven/archiver/MavenArchiveConfigurationTest.java
b/src/test/java/org/apache/maven/shared/archiver/MavenArchiveConfigurationTest.java
similarity index 98%
rename from
src/test/java/org/apache/maven/archiver/MavenArchiveConfigurationTest.java
rename to
src/test/java/org/apache/maven/shared/archiver/MavenArchiveConfigurationTest.java
index 994a4c7..f93ff36 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiveConfigurationTest.java
+++
b/src/test/java/org/apache/maven/shared/archiver/MavenArchiveConfigurationTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.archiver;
+package org.apache.maven.shared.archiver;
import java.util.Map;
diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
b/src/test/java/org/apache/maven/shared/archiver/MavenArchiverTest.java
similarity index 99%
rename from src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
rename to src/test/java/org/apache/maven/shared/archiver/MavenArchiverTest.java
index 77be6f9..42b5b1b 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/shared/archiver/MavenArchiverTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.archiver;
+package org.apache.maven.shared.archiver;
import java.io.File;
import java.io.IOException;
