[maven-scm-publish-plugin] branch master updated: cleanup

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[maven-scm-publish-plugin] branch master updated: cleanup

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

hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm-publish-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new c14d0be  cleanup
c14d0be is described below

commit c14d0be462557712abe4da07185596ed4de84cde
Author: Hervé Boutemy <[hidden email]>
AuthorDate: Sat May 23 18:38:00 2020 +0200

    cleanup
---
 pom.xml                                                 | 8 --------
 src/site/apt/examples/multi-module-configuration.apt.vm | 2 +-
 src/site/apt/index.apt.vm                               | 8 ++++----
 src/site/apt/various-tips.apt.vm                        | 2 +-
 src/site/site.xml                                       | 6 ------
 5 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index af55f15..fa7a327 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,14 +174,6 @@ under the License.
         <filtering>true</filtering>
       </resource>
     </resources>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>3.7</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
   </build>
 
   <profiles>
diff --git a/src/site/apt/examples/multi-module-configuration.apt.vm b/src/site/apt/examples/multi-module-configuration.apt.vm
index 7c3338a..e1b4df5 100644
--- a/src/site/apt/examples/multi-module-configuration.apt.vm
+++ b/src/site/apt/examples/multi-module-configuration.apt.vm
@@ -43,7 +43,7 @@ mvn scm-publish:publish-scm
 
 * Avoiding Extra Path During Staging
 
-  When staging the site, sometimes extra directories appear between <<<target/staging>>> and the effective root of the site:
+  When staging the site, sometimes extra directories may appear between <<<target/staging>>> and the effective root of the site:
   this is caused by the auto-detection algorithm of site root, which cannot detect at which level to stop.
 
   This can be fixed by configuring the {{{/plugins/maven-site-plugin/stage-mojo.html#topSiteURL}site plugin's topSiteURL parameter}}
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index f820919..9b29c5d 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -31,19 +31,19 @@ ${project.name}
     The maven-scm-publish-plugin is a utility plugin to allow publishing Maven
     website to any supported SCM.
     The primary goal was to have an utility plugin to allow Apache projects
-    to publish Maven websites via the ASF svnpubsub system.
+    to publish Maven websites via the {{{https://infra.apache.org/project-site.html#tools}ASF svnpubsub system}}.
 
     In addition to SCM operations, it takes care to fix newline inconsistencies
     generated by <<<maven-site-plugin>>> (see {{{https://issues.apache.org/jira/browse/MSITE-121}MSITE-121}}),
     which prevents simple content import to SCM.
 
-    The plugin has been tested with git scm too and by example can
-    {{{./various-tips.html#Git_branch}push content for GitHub pages}}.
+    The plugin has been tested with Git SCM too and by example can
+    {{{./various-tips.html#Git_branch}push content for GitHub Pages}}.
 
 
 * Implementation
 
-    The plugin works from staged website by default (see {{{./publish-scm-mojo.html#content}<<<content>>> parameter}}).
+    The plugin works from <<staged website>> by default (see {{{./publish-scm-mojo.html#content}<<<content>>> parameter}}).
 
     It first checks out the contents of a directory from
     the SCM (see {{{./publish-scm-mojo.html#pubScmUrl}<<<pubSubUrl>>> parameter}}) into
diff --git a/src/site/apt/various-tips.apt.vm b/src/site/apt/various-tips.apt.vm
index 6e13fc4..8c22549 100644
--- a/src/site/apt/various-tips.apt.vm
+++ b/src/site/apt/various-tips.apt.vm
@@ -59,7 +59,7 @@ Various tips for using this plugin
   <distributionManagement>
     <site>
       <id>site_id</id>
-      <url>scm:git:ssh://[hidden email]/username/tomcat-foo-artifact.git</url><!-- or ${project.scm.developerConnection} -->
+      <url>${project.scm.developerConnection}</url><!-- or scm:git:ssh://[hidden email]/username/tomcat-foo-artifact.git -->
     </site>
   </distributionManagement>
 ...
diff --git a/src/site/site.xml b/src/site/site.xml
index b578fc8..ac80c7c 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -20,12 +20,6 @@ under the License.
 -->
 <project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
-  <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-fluido-skin</artifactId>
-    <version>1.7</version>
-  </skin>
-
   <edit>${project.scm.url}</edit>
 
   <body>