[isis] 21/31: ISIS-1813: hides git-commit-id-plugin behind a profile, and updates the instructions for verifying releases.

[da...@apache.org]

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

danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git

commit c85a24246b09c7fd938f89271474e00f4f047261
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 18 14:20:52 2018 +0000

    ISIS-1813: hides git-commit-id-plugin behind a profile, and updates the instructions for verifying releases.
---
 .../guides/cgcom/_cgcom_verifying-releases.adoc     | 19 +++++++++++--------
 core/pom.xml                                        | 21 ++++++++++++++++-----
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_verifying-releases.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_verifying-releases.adoc
index 07da28c..38cac73 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_verifying-releases.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_verifying-releases.adoc
@@ -83,24 +83,27 @@ gpg --verify isis-x.y.z.zip.asc isis-x.y.z.zip
 
 Assuming the ZIP file verifies, it should be unpacked, and then the artifact built from source.
 
-To build Apache Isis core, first download any dependencies:
+To build Apache Isis core, first clean out the local repository cache:
 
 [source]
 ----
-mvn dependency:go-offline
+rm -rf ~/m2/repository/org/apache/isis
 ----
 
-Check that no Isis artifacts have yet been downloaded, ie there is no `~/.m2/org/repository/org/apache/isis` directory.
-If there are, it could indicate that the release being verified incorrectly references previous versions of Apache Isis
-
-Assuming all is ok, build using the `-o` offline flag:
+and then build using:
 
 [source]
 ----
-mvn clean install -o
+mvn clean install -Dskip.git
 ----
 
-Confirm that the versions of the Isis artifacts now cached in your local repository are correct.
+[IMPORTANT]
+====
+The `-Dskip.git` is required in order to temporarily disable the `git-commit-id-plugin` (which expects to be run within a git repository).
+====
+
+
+Optionally, confirm that the versions of the Isis artifacts now cached in your local repository are correct.
 
 
 ==== Verifying binary artifacts
diff --git a/core/pom.xml b/core/pom.xml
index f65309e..346864a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1060,11 +1060,6 @@
             </plugin>
 
             <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
-            </plugin>
-
-            <plugin>
                 <artifactId>maven-remote-resources-plugin</artifactId>
                 <executions>
                     <execution>
@@ -2266,6 +2261,22 @@ ${license.additional-notes}
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>git</id>
+            <activation>
+                <property>
+                    <name>!skip.git</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>pl.project13.maven</groupId>
+                        <artifactId>git-commit-id-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <modules>

-- 
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.