You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2024/07/09 15:14:26 UTC

(maven-site-plugin) branch MSITE-1012 updated (dc06cd4b -> 170efdbb)

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch MSITE-1012
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git


    omit dc06cd4b [MSITE-1012] Clean up notion that sites aren't deployed to repositories
     new 3ff6f69a [MSITE-1013] Deprecate and rename SiteStageDeployMojo#stagingRepositoryId to #stagingSiteId
     new 170efdbb [MSITE-1012] Clean up notion that sites aren't deployed to repositories

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (dc06cd4b)
            \
             N -- N -- N   refs/heads/MSITE-1012 (170efdbb)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:


(maven-site-plugin) 01/02: [MSITE-1013] Deprecate and rename SiteStageDeployMojo#stagingRepositoryId to #stagingSiteId

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch MSITE-1012
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git

commit 3ff6f69af3d8a334e476630bdb4ef9121c3c64a4
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Jul 9 17:13:28 2024 +0200

    [MSITE-1013] Deprecate and rename SiteStageDeployMojo#stagingRepositoryId to #stagingSiteId
---
 .../maven/plugins/site/deploy/SiteStageDeployMojo.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java b/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
index e10b4cbd..8a0c3848 100644
--- a/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
+++ b/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
@@ -63,19 +63,19 @@ public class SiteStageDeployMojo extends AbstractStagingMojo {
     private String stagingSiteURL;
 
     /**
-     * The identifier of the repository where the staging site will be deployed. This id will be used to lookup a
+     * The identifier of the site where the staged site will be deployed. This id will be used to lookup a
      * corresponding <code>&lt;server&gt;</code> entry from the <code>settings.xml</code>. If a matching
      * <code>&lt;server&gt;</code> entry is found, its configured credentials will be used for authentication.
      * <p/>
      * If this is not specified, then the corresponding value of <code>distributionManagement.site.id</code>
      * will be taken as default, unless this is not defined either then the String
-     * <code>"stagingSite"</code> is used. (<strong>Note</strong>:
-     * until v. 2.3 and 3.0-beta-3 the String <code>"stagingSite"</code> is always used.)
+     * <code>"stagingSite"</code> is used. Note that the alias {@code stagingRepositoryId} is deprecated
+     * for removal.
      *
      * @since 2.0.1
      */
-    @Parameter(property = "stagingRepositoryId")
-    private String stagingRepositoryId;
+    @Parameter(property = "stagingSiteId", alias = "stagingRepositoryId")
+    private String stagingSiteId;
 
     @Override
     protected boolean isDeploy() {
@@ -109,7 +109,7 @@ public class SiteStageDeployMojo extends AbstractStagingMojo {
     protected Site determineDeploySite() throws MojoExecutionException {
         Site top = new Site();
 
-        top.setId(stagingRepoId());
+        top.setId(determineStagingSiteId());
         getLog().info("Using this server ID for stage deploy: " + top.getId());
 
         String stagingURL = determineStageDeploySiteURL();
@@ -213,9 +213,9 @@ public class SiteStageDeployMojo extends AbstractStagingMojo {
         return defaultStagingSiteURL;
     }
 
-    private String stagingRepoId() {
-        if (stagingRepositoryId != null) {
-            return stagingRepositoryId;
+    private String determineStagingSiteId() {
+        if (stagingSiteId != null) {
+            return stagingSiteId;
         }
 
         try {


(maven-site-plugin) 02/02: [MSITE-1012] Clean up notion that sites aren't deployed to repositories

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch MSITE-1012
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git

commit 170efdbb063b07ed1736f37a475ea8db557de101
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Jul 9 17:13:49 2024 +0200

    [MSITE-1012] Clean up notion that sites aren't deployed to repositories
---
 src/it/mrm/settings.xml                                       |  6 +++---
 src/it/projects/MSITE-604/parent/pom.xml                      |  6 +++---
 src/it/projects/MSITE-604/pom.xml                             | 10 +++++-----
 src/it/projects/MSITE-604/verify.groovy                       | 10 +++++-----
 src/it/projects/inheritance-interpolation/repo-parent/pom.xml |  8 ++++----
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/it/mrm/settings.xml b/src/it/mrm/settings.xml
index d939e59e..4ce9b355 100644
--- a/src/it/mrm/settings.xml
+++ b/src/it/mrm/settings.xml
@@ -76,9 +76,9 @@ under the License.
     <profile>
       <id>msite604</id>
       <properties>
-        <msite604.siteRepositoryId>settingsId</msite604.siteRepositoryId>
-        <msite604.siteRepositoryRoot>file://@project.build.directory@/it/MSITE-604/target/root</msite604.siteRepositoryRoot>
-        <msite604.siteRepositoryBase>settingsBase</msite604.siteRepositoryBase>
+        <msite604.siteId>settingsId</msite604.siteId>
+        <msite604.siteURL>file://@project.build.directory@/it/MSITE-604/target/root</msite604.siteURL>
+        <msite604.siteBase>settingsBase</msite604.siteBase>
       </properties>
     </profile>
   </profiles>
diff --git a/src/it/projects/MSITE-604/parent/pom.xml b/src/it/projects/MSITE-604/parent/pom.xml
index dedbcd4d..0e325922 100644
--- a/src/it/projects/MSITE-604/parent/pom.xml
+++ b/src/it/projects/MSITE-604/parent/pom.xml
@@ -32,13 +32,13 @@ under the License.
   <name>Parent override settings IT</name>
 
   <properties>
-    <msite604.siteRepositoryUrl>parent</msite604.siteRepositoryUrl>
+    <msite604.sitePath>parent</msite604.sitePath>
   </properties>
 
   <distributionManagement>
     <site>
-      <id>${msite604.siteRepositoryId}</id>
-      <url>${msite604.siteRepositoryRoot}/${msite604.siteRepositoryBase}/${msite604.siteRepositoryUrl}</url>
+      <id>${msite604.siteId}</id>
+      <url>${msite604.siteURL}/${msite604.siteBase}/${msite604.sitePath}</url>
     </site>
   </distributionManagement>
 </project>
diff --git a/src/it/projects/MSITE-604/pom.xml b/src/it/projects/MSITE-604/pom.xml
index 2ecd5611..0f85b4a3 100644
--- a/src/it/projects/MSITE-604/pom.xml
+++ b/src/it/projects/MSITE-604/pom.xml
@@ -40,15 +40,15 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <msite604.siteRepositoryId>defaultId</msite604.siteRepositoryId>
-    <msite604.siteRepositoryBase>defaultBase</msite604.siteRepositoryBase>
-    <msite604.siteRepositoryUrl>defaultRepositoryUrl</msite604.siteRepositoryUrl>
+    <msite604.siteId>defaultId</msite604.siteId>
+    <msite604.siteBase>defaultBase</msite604.siteBase>
+    <msite604.sitePath>defaultPath</msite604.sitePath>
   </properties>
 
   <distributionManagement>
     <site>
-      <id>${msite604.siteRepositoryId}</id>
-      <url>${msite604.siteRepositoryRoot}/${msite604.siteRepositoryBase}/${msite604.siteRepositoryUrl}</url>
+      <id>${msite604.siteId}</id>
+      <url>${msite604.siteURL}/${msite604.siteBase}/${msite604.sitePath}</url>
     </site>
   </distributionManagement>
 
diff --git a/src/it/projects/MSITE-604/verify.groovy b/src/it/projects/MSITE-604/verify.groovy
index 58fdd389..7c7040c2 100644
--- a/src/it/projects/MSITE-604/verify.groovy
+++ b/src/it/projects/MSITE-604/verify.groovy
@@ -20,20 +20,20 @@
 target = new File( basedir, 'target' );
 assert target.isDirectory();
 
-// msite604.siteRepositoryRoot property value from settings.xml
+// msite604.siteURL property value from settings.xml
 rootDirectory = new File( target, 'root' );
 assert rootDirectory.isDirectory();
 
-// msite604.siteRepositoryBase property value from pom.xml
+// msite604.siteBase property value from pom.xml
 baseDirectory = new File( rootDirectory, 'defaultBase' );
 assert !baseDirectory.isDirectory();
 
-// msite604.siteRepositoryBase property value from settings.xml
+// msite604.siteBase property value from settings.xml
 baseDirectory = new File( rootDirectory, 'settingsBase' );
 assert baseDirectory.isDirectory();
 
-// msite604.siteRepositoryUrl property value from pom.xml
-defaultDirectory = new File( baseDirectory, 'defaultRepositoryUrl' );
+// msite604.sitePath property value from pom.xml
+defaultDirectory = new File( baseDirectory, 'defaultPath' );
 assert defaultDirectory.exists();
 
 return true;
diff --git a/src/it/projects/inheritance-interpolation/repo-parent/pom.xml b/src/it/projects/inheritance-interpolation/repo-parent/pom.xml
index c0933ca9..3c3a8f35 100644
--- a/src/it/projects/inheritance-interpolation/repo-parent/pom.xml
+++ b/src/it/projects/inheritance-interpolation/repo-parent/pom.xml
@@ -39,15 +39,15 @@ under the License.
     <project.source.encoding>UTF-8</project.source.encoding>
     <prop>project.artifactId = '${project.artifactId}'</prop>
     <distUrl>scp://from.repo/dist</distUrl>
-    <msite604.siteRepositoryId>repo-parent-id</msite604.siteRepositoryId>
-    <msite604.siteRepositoryBase>default-repository-base-from-repo-parent</msite604.siteRepositoryBase>
+    <msite604.siteId>site-parent-id</msite604.siteId>
+    <msite604.siteBase>default-repository-base-from-repo-parent</msite604.siteBase>
     <fluidoSkinVersion>2.0.0-M9</fluidoSkinVersion><!-- invoker interpolation doesn't apply here: but version is not important at this level -->
   </properties>
 
   <distributionManagement>
     <site>
-      <id>${msite604.siteRepositoryId}</id>
-      <url>${msite604.siteRepositoryRoot}/${msite604.siteRepositoryBase}</url>
+      <id>${msite604.siteId}</id>
+      <url>${msite604.siteURL}/${msite604.siteBase}</url>
     </site>
   </distributionManagement>