You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2018/01/08 23:28:34 UTC
[49/52] [abbrv] [partial] isis-site git commit: republishes,
updating content and creates new SNAPSHOT
http://git-wip-us.apache.org/repos/asf/isis-site/blob/9d921a51/content/guides/cgcom/cgcom.html
----------------------------------------------------------------------
diff --git a/content/guides/cgcom/cgcom.html b/content/guides/cgcom/cgcom.html
index 83a5ed6..8b963a8 100644
--- a/content/guides/cgcom/cgcom.html
+++ b/content/guides/cgcom/cgcom.html
@@ -179,6 +179,7 @@ table.CodeRay td.code>pre{padding:0}
<li><a href="../../guides/ugfun/ugfun.html">Fundamentals</a></li>
<li><a href="../../guides/ugvw/ugvw.html">Wicket Viewer</a></li>
<li><a href="../../guides/ugvro/ugvro.html">Restful Objects Viewer</a></li>
+ <li><a href="../../guides/ugodn/ugodn.html">DataNucleus Object Store</a></li>
<li><a href="../../guides/ugsec/ugsec.html">Security</a></li>
<li><a href="../../guides/ugtst/ugtst.html">Testing</a></li>
<li><a href="../../guides/ugbtb/ugbtb.html">Beyond the Basics</a></li>
@@ -196,25 +197,32 @@ table.CodeRay td.code>pre{padding:0}
</ul> </li>
<li class="dropdown hidden-sm hidden-md"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Downloads<span class="caret"></span></a>
<ul class="dropdown-menu">
- <li><a href="../../downloads.html">Downloads</a></li>
- <li><a href="../../release-notes/release-notes.html">Release Notes</a></li>
- <li><a href="../../migration-notes/migration-notes.html">Migration Notes</a></li>
- <li role="separator" class="divider"></li>
<li class="dropdown-header">Maven archetypes</li>
<li><a href="../../guides/ugfun/ugfun.html#_ugfun_getting-started_helloworld-archetype">helloworld</a></li>
<li><a href="../../guides/ugfun/ugfun.html#_ugfun_getting-started_simpleapp-archetype">simpleapp</a></li>
<li role="separator" class="divider"></li>
- <li><a href="https://issues.apache.org/jira/browse/ISIS">ASF JIRA</a></li>
+ <li><a href="../../downloads.html">Downloads</a></li>
+ <li><a href="../../release-notes/release-notes.html">Release Notes</a></li>
+ <li><a href="../../migration-notes/migration-notes.html">Migration Notes</a></li>
+ <li role="separator" class="divider"></li>
<li><a href="https://github.com/apache/isis">Github mirror</a></li>
</ul> </li>
<li class="dropdown hidden-sm"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Support<span class="caret"></span></a>
<ul class="dropdown-menu">
- <li><a href="../../support.html">Mailing lists</a></li>
+ <li class="dropdown-header">Guides</li>
+ <li><a href="../../guides/dg/dg.html">Developers' Guide</a></li>
+ <li><a href="../../guides/cgcom/cgcom.html">Committers' Guide</a></li>
+ <li><a href="../../guides/htg.html">Hints-n-Tips Guide</a></li>
+ <li role="separator" class="divider"></li>
+ <li class="dropdown-header">Mailing Lists</li>
+ <li><a href="../../support.html">How to subscribe</a></li>
<li><a href="https://lists.apache.org/list.html?users@isis.apache.org">Archives (ASF Pony mail)</a></li>
<li><a href="http://isis.markmail.org/search/?q=">Archives (Markmail)</a></li>
+ <li role="separator" class="divider"></li>
+ <li class="dropdown-header">Other Resources</li>
+ <li><a href="https://issues.apache.org/jira/browse/ISIS">ASF JIRA</a></li>
<li><a href="http://stackoverflow.com/questions/tagged/isis">Stack Overflow</a></li>
- <li><a href="../../guides/dg/dg.html">How to contribute</a></li>
- <li><a href="../../help.html">Other resources</a></li>
+ <li><a href="../../help.html">Wiki, Fisheye etc.</a></li>
</ul> </li>
<li class="dropdown hidden-sm hidden-md"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">@ASF<span class="caret"></span></a>
<ul class="dropdown-menu">
@@ -616,7 +624,7 @@ git checkout master && git merge --no-ff ISIS-1162_pr-31 && git
</ul>
</div>
<div class="paragraph">
- <p>Apache Isis itself consists of three separately releasable modules; relative to the <a href="https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=tree">source code root</a> there are:</p>
+ <p>Apache Isis itself consists of three separately releasable modules; relative to the <a href="https://github.com/apache/isis">source code root</a> there are:</p>
</div>
<div class="ulist">
<ul>
@@ -655,8 +663,8 @@ git checkout master && git merge --no-ff ISIS-1162_pr-31 && git
<div class="content">
<pre class="CodeRay highlight"><code data-lang="bash">cd core
export ISISTMP=/c/tmp <i class="conum" data-value="1"></i><b>(1)</b>
-export ISISDEV=1.16.0-SNAPSHOT
-export ISISREL=1.15.1
+export ISISDEV=2.1.0-SNAPSHOT
+export ISISREL=2.0.0
export ISISRC=RC1
export ISISBRANCH=release-$ISISREL-$ISISRC
export ISISJIRA=ISIS-9999 <i class="conum" data-value="2"></i><b>(2)</b>
@@ -693,7 +701,7 @@ env | grep ISIS | sort</code></pre>
<td class="icon"> <i class="fa icon-important" title="Important"></i> </td>
<td class="content">
<div class="paragraph">
- <p>Note that the branch name is <strong>not</strong> the same any of the eventual tag names (eg <code>isis-1.16.0</code> or <code>simpleapp-archetype-1.16.0</code>).</p>
+ <p>Note that the branch name is <strong>not</strong> the same any of the eventual tag names (eg <code>isis-2.0.0</code> or <code>simpleapp-archetype-2.0.0</code>).</p>
</div>
<div class="paragraph">
<p>If they did have the same name, then what would happen is that the <code>maven-release-plugin</code> would checkout the (HEAD of the) branch and thus upload a SNAPSHOT to the snapshot repository. What it should of course do is checkout the tag and then upload that to the release staging repository.</p>
@@ -722,13 +730,13 @@ git checkout -b $ISISBRANCH</code></pre>
<p>Double check that the version number of the parent pom should reflect the branch name that you are now on (with a <code>-SNAPSHOT</code> suffix). his will normally have been done already during earlier development; but confirm that it has been updated. If it has not, make the change.</p>
</div>
<div class="paragraph">
- <p>Double check that the version number of the core POM (<code>core/pom.xml</code>) should reflect the branch name that you are now on. For example, if releasing version <code>1.16.0</code>, the POM should read:</p>
+ <p>Double check that the version number of the core POM (<code>core/pom.xml</code>) should reflect the branch name that you are now on. For example, if releasing version <code>2.0.0</code>, the POM should read:</p>
</div>
<div class="listingblock">
<div class="content">
<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><groupId></span>org.apache.isis.core<span class="tag"></groupId></span>
<span class="tag"><artifactId></span>isis<span class="tag"></artifactId></span>
-<span class="tag"><version></span>1.16.0-SNAPSHOT<span class="tag"></version></span></code></pre>
+<span class="tag"><version></span>2.0.0-SNAPSHOT<span class="tag"></version></span></code></pre>
</div>
</div>
<div class="paragraph">
@@ -951,7 +959,7 @@ mvn clean install -o</code></pre>
<div class="sect3">
<h4 id="__cgcom_cutting-a-release_releasing-core_post-prepare-sanity-check">4.4.8. Post-prepare sanity check</h4>
<div class="paragraph">
- <p>You should end up with artifacts in your local repo with the new version (eg <code>1.16.0</code>). This is a good time to do some quick sanity checks; nothing has yet been uploaded:</p>
+ <p>You should end up with artifacts in your local repo with the new version (eg <code>2.0.0-M1</code>). This is a good time to do some quick sanity checks; nothing has yet been uploaded:</p>
</div>
<div class="ulist">
<ul>
@@ -1014,17 +1022,17 @@ popd</code></pre>
[INFO] Performing a LOCAL checkout from scm:git:file:///C:\APACHE\isis-git-rw\co
re
[INFO] Checking out the project to perform the release ...
-[INFO] Executing: cmd.exe /X /C "git clone --branch release-1.16.0 file:///C:\APACHE\isis-git-rw\core C:\APACHE\isis-git-rw\core\target\checkout"
+[INFO] Executing: cmd.exe /X /C "git clone --branch release-2.0.0-M1 file:///C:\APACHE\isis-git-rw\core C:\APACHE\isis-git-rw\core\target\checkout"
[INFO] Working directory: C:\APACHE\isis-git-rw\core\target
[INFO] Performing a LOCAL checkout from scm:git:file:///C:\APACHE\isis-git-rw
[INFO] Checking out the project to perform the release ...
-[INFO] Executing: cmd.exe /X /C "git clone --branch release-1.16.0 file:///C:\APACHE\isis-git-rw C:\APACHE\isis-git-rw\core\target\checkout"
+[INFO] Executing: cmd.exe /X /C "git clone --branch release-2.0.0-M1 file:///C:\APACHE\isis-git-rw C:\APACHE\isis-git-rw\core\target\checkout"
[INFO] Working directory: C:\APACHE\isis-git-rw\core\target
[INFO] Executing: cmd.exe /X /C "git ls-remote file:///C:\APACHE\isis-git-rw"
[INFO] Working directory: C:\Users\ADMINI~1\AppData\Local\Temp
[INFO] Executing: cmd.exe /X /C "git fetch file:///C:\APACHE\isis-git-rw"
[INFO] Working directory: C:\APACHE\isis-git-rw\core\target\checkout
-[INFO] Executing: cmd.exe /X /C "git checkout release-1.16.0"
+[INFO] Executing: cmd.exe /X /C "git checkout release-2.0.0-M1"
[INFO] Working directory: C:\APACHE\isis-git-rw\core\target\checkout
[INFO] Executing: cmd.exe /X /C "git ls-files"
[INFO] Working directory: C:\APACHE\isis-git-rw\core\target\checkout
@@ -1056,7 +1064,7 @@ re
<p>If releasing using Windows and Maven >= 3.3.3, then there is an issue that requires a small workaround.</p>
</div>
<div class="paragraph">
- <p>In Maven 3.3.3 the <code>mvn.bat</code> file was removed, replaced instead with <code>mvn.cmd</code>. However, <code>maven-archetype-plugin:2.4</code> only uses <code>mvn.bat</code>; this causes the <code>archetype:create-from-project</code> goal to fail. The fix is to simple: just copy <code>mvn.cmd</code> to <code>mvn.bat</code>.</p>
+ <p>In Maven 3.3.3 the <code>mvn.bat</code> file was removed, replaced instead with <code>mvn.cmd</code>. However, <code>maven-archetype-plugin:2.4</code> only uses <code>mvn.bat</code>; this causes the <code>archetype:create-from-project</code> goal to fail. The fix is simple: just copy <code>mvn.cmd</code> to <code>mvn.bat</code>.</p>
</div> </td>
</tr>
</tbody>
@@ -1107,7 +1115,7 @@ env | grep ISIS | sort</code></pre>
<div class="listingblock">
<div class="content">
<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><properties></span>
- <span class="tag"><isis.version></span>1.16.0<span class="tag"></isis.version></span>
+ <span class="tag"><isis.version></span>2.0.0-M1<span class="tag"></isis.version></span>
...
<span class="tag"></properties></span></code></pre>
</div>
@@ -1189,7 +1197,10 @@ docker container run -p 8080:8080 -d test/simpleapp</code></pre>
<td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
<td class="content">
<div class="paragraph">
- <p>On Windows, you may need to enable the Docker daemon first, otherwise the "mvn install" command above will fail:</p>
+ <p>On Windows, make sure that Docker is first switched to using linux containers, not Windows containers (because the <code>Dockerfile</code> in the application references a linux base image).</p>
+ </div>
+ <div class="paragraph">
+ <p>You may also need to enable the Docker daemon first, otherwise the "mvn install" command above will fail:</p>
</div>
<div class="imageblock">
<div class="content">
@@ -1372,7 +1383,7 @@ env | grep ISIS | sort</code></pre>
<div class="listingblock">
<div class="content">
<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag"><properties></span>
- <span class="tag"><isis.version></span>1.16.0<span class="tag"></isis.version></span>
+ <span class="tag"><isis.version></span>2.0.0-M1<span class="tag"></isis.version></span>
...
<span class="tag"></properties></span></code></pre>
</div>
@@ -1641,7 +1652,7 @@ git fetch</code></pre>
<td class="icon"> <i class="fa icon-note" title="Note"></i> </td>
<td class="content">
<div class="paragraph">
- <p>The remote tags aren’t visible locally but can be seen <a href="https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=summary">online</a>.</p>
+ <p>The remote tags aren’t visible locally but can be seen <a href="https://github.com/apache/isis/tags">online</a>.</p>
</div> </td>
</tr>
</tbody>
@@ -1666,7 +1677,7 @@ git fetch</code></pre>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="bash">[VOTE] Apache Isis Core release 1.16.0 RC1</code></pre>
+ <pre class="CodeRay highlight"><code data-lang="bash">[VOTE] Apache Isis Core release 2.0.0-M1 RC1</code></pre>
</div>
</div>
<div class="paragraph">
@@ -1676,19 +1687,19 @@ git fetch</code></pre>
<div class="content">
<pre class="CodeRay highlight"><code data-lang="bash">I've cut a release for Apache Isis Core and the two archetypes:
-* Core 1.16.0
-* HelloWorld Archetype 1.16.0
-* SimpleApp Archetype 1.16.0
+* Core 2.0.0-M1
+* HelloWorld Archetype 2.0.0-M1
+* SimpleApp Archetype 2.0.0-M1
The source code artifacts have been uploaded to staging repositories on repository.apache.org:
-* http://repository.apache.org/content/repositories/orgapacheisis-10xx/org/apache/isis/core/isis/1.16.0/isis-1.16.0-source-release.zip
-* http://repository.apache.org/content/repositories/orgapacheisis-10xx/org/apache/isis/archetype/helloworld-archetype/1.16.0/helloworld-archetype-1.16.0-source-release.zip
-* http://repository.apache.org/content/repositories/orgapacheisis-10xx/org/apache/isis/archetype/simpleapp-archetype/1.16.0/simpleapp-archetype-1.16.0-source-release.zip
+* http://repository.apache.org/content/repositories/orgapacheisis-10xx/org/apache/isis/core/isis/2.0.0-M1/isis-2.0.0-M1-source-release.zip
+* http://repository.apache.org/content/repositories/orgapacheisis-10xx/org/apache/isis/archetype/helloworld-archetype/2.0.0-M1/helloworld-archetype-2.0.0-M1-source-release.zip
+* http://repository.apache.org/content/repositories/orgapacheisis-10xx/org/apache/isis/archetype/simpleapp-archetype/2.0.0-M1/simpleapp-archetype-2.0.0-M1-source-release.zip
For each zip there is a corresponding signature file (append .asc to the zip's url).
-In the source code repo the code has been tagged as isis-1.16.0-RC1, helloworld-archetype-1.16.0-RC1 and simpleapp-archetype-1.16.0-RC1; see https://git-wip-us.apache.org/repos/asf?p=isis.git
+In the source code repo the code has been tagged as isis-2.0.0-M1-RC1, helloworld-archetype-2.0.0-M1-RC1 and simpleapp-archetype-2.0.0-M1-RC1; see https://github.com/apache/isis/tags
For instructions on how to verify the release (build from binaries and/or use in Maven directly), see https://isis.apache.org/guides/cgcom/cgcom.html#_cgcom_verifying-releases
@@ -1704,7 +1715,7 @@ Please verify the release and cast your vote. The vote will be open for a minim
</div>
<div class="ulist">
<ul>
- <li> <p>the version number (1.16.0 or whatever)</p> </li>
+ <li> <p>the version number (<code>2.0.0-M1</code> or whatever)</p> </li>
<li> <p>the release candidate number (<code>RC1</code> or whatever)</p> </li>
<li> <p>the repository id, as provided by Nexus earlier (<code>orgapacheisis-10xx</code> or whatever)</p> </li>
</ul>
@@ -1969,7 +1980,7 @@ http://repository.apache.org/content/repositories/orgapacheisis-1059/org/apache/
<pre class="CodeRay highlight"><code data-lang="bash">mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=helloworld-archetype \
- -D archetypeVersion=1.16.0 \
+ -D archetypeVersion=2.0.0-M1 \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D version=1.0-SNAPSHOT \
@@ -1989,7 +2000,7 @@ mvn clean install jetty:run -o</code></pre>
<pre class="CodeRay highlight"><code data-lang="bash">mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=simpleapp-archetype \
- -D archetypeVersion=1.16.0 \
+ -D archetypeVersion=2.0.0-M1 \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D version=1.0-SNAPSHOT \
@@ -1997,7 +2008,7 @@ mvn clean install jetty:run -o</code></pre>
-o
cd myapp
-mvn clean install -o && mvn -pl jetty:run -o</code></pre>
+mvn clean install -o && mvn -pl webapp jetty:run -o</code></pre>
</div>
</div>
<div class="paragraph">
@@ -2056,7 +2067,7 @@ mvn clean install -o && mvn -pl jetty:run -o</code></pre>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="bash">[RESULT] [VOTE] Apache Isis Core release 1.16.0</code></pre>
+ <pre class="CodeRay highlight"><code data-lang="bash">[RESULT] [VOTE] Apache Isis Core release 2.0.0-M1</code></pre>
</div>
</div>
<div class="paragraph">
@@ -2088,9 +2099,9 @@ I'll now go ahead and complete the post-release activities.</code></pre>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="bash">sh scripts/promoterctag.sh isis-1.16.0 RC1
-sh scripts/promoterctag.sh helloworld-archetype-1.16.0 RC1
-sh scripts/promoterctag.sh simpleapp-archetype-1.16.0 RC1</code></pre>
+ <pre class="CodeRay highlight"><code data-lang="bash">sh scripts/promoterctag.sh isis-2.0.0-M1 RC1
+sh scripts/promoterctag.sh helloworld-archetype-2.0.0-M1 RC1
+sh scripts/promoterctag.sh simpleapp-archetype-2.0.0-M1 RC1</code></pre>
</div>
</div>
<div class="paragraph">
@@ -2221,7 +2232,7 @@ popd</code></pre>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="bash">sh upd.sh 1.15.1 1.16.0</code></pre>
+ <pre class="CodeRay highlight"><code data-lang="bash">sh upd.sh 1.16.0 2.0.0-M1</code></pre>
</div>
</div>
<div class="paragraph">
@@ -2256,7 +2267,7 @@ popd</code></pre>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="bash">sh scripts/jira-release-notes.sh ISIS 1.16.0 > /tmp/1</code></pre>
+ <pre class="CodeRay highlight"><code data-lang="bash">sh scripts/jira-release-notes.sh ISIS 2.0.0-M1 > /tmp/1</code></pre>
</div>
</div>
</div>
@@ -2291,7 +2302,7 @@ popd</code></pre>
<div class="sect2">
<h3 id="_update_website">6.6. Update website</h3>
<div class="paragraph">
- <p>Update the Apache Isis (asciidoc) website:</p>
+ <p>In the main <code>isis</code> repo (ie containing the asciidoc source):</p>
</div>
<div class="ulist">
<ul>
@@ -2308,10 +2319,66 @@ popd</code></pre>
<p>For more information on DOAP files, see these <a href="http://projects.apache.org/doap.html">Apache policy docs</a>.</p>
</div> </li>
<li> <p>Update the <a href="https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=blob_plain;f=STATUS;hb=HEAD">STATUS</a> file (in root of Apache Isis' source) should be updated with details of the new release.</p> </li>
+ <li> <p>commit the <code>.adoc</code> changes and publish to the <code>isis-site</code> repo.</p> </li>
</ul>
</div>
<div class="paragraph">
- <p>Don’t forget to commit the <code>.adoc</code> changes and publish to the isis-site repo.</p>
+ <p>This will have published to the <code>SNAPSHOT</code> directory of the <code>isis-site</code> repo. Now, in the <code>isis-site</code> repo itself:</p>
+ </div>
+ <div class="ulist">
+ <ul>
+ <li> <p>double check that a copy of <code>current</code> exists as a named directory under <code>content/versions</code></p>
+ <div class="paragraph">
+ <p>If for any reason it isn’t there, then create a copy before it gets deleted in the step below. Also, take a copy of the <code>index.html</code> with one that redirects up to the home page (see a few steps below for an example).</p>
+ </div> </li>
+ <li> <p>delete the <code>current</code> version and then rename the just-published <code>SNAPSHOT</code> as <code>current</code>:</p>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">rm -rf content/versions/current
+mv content/versions/SNAPSHOT content/versions/current</code></pre>
+ </div>
+ </div> </li>
+ <li> <p>take a copy of the new <code>current</code> version as its appropriately named version:</p>
+ <div class="paragraph">
+ <p>For example:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="bash">cp -rf content/versions/current content/versions/2.0.0-M1</code></pre>
+ </div>
+ </div> </li>
+ <li> <p>update the new named version’s <code>index.html</code> with one that will redirect back to the home page.</p>
+ <div class="paragraph">
+ <p>You can take a copy from one of the older named versions, or just use this text:</p>
+ </div>
+ <div class="listingblock">
+ <div class="content">
+ <pre class="CodeRay highlight"><code data-lang="html"><span class="tag"><html></span>
+ <span class="tag"><head></span>
+ <span class="tag"><title></span>Redirecting to index.html<span class="tag"></title></span>
+ <span class="tag"><meta</span> <span class="attribute-name">http-equiv</span>=<span class="string"><span class="delimiter">"</span><span class="content">refresh</span><span class="delimiter">"</span></span> <span class="attribute-name">content</span>=<span class="string"><span class="delimiter">"</span><span class="content">1; URL=../../index.html</span><span class="delimiter">"</span></span><span class="tag">></span>
+ <span class="tag"><meta</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">keywords</span><span class="delimiter">"</span></span> <span class="attribute-name">content</span>=<span class="string"><span class="delimiter">"</span><span class="content">automatic redirection</span><span class="delimiter">"</span></span><span class="tag">></span>
+ <span class="tag"></head></span>
+ <span class="tag"><body></span>
+ Redirecting to <span class="tag"><a</span> <span class="attribute-name">href</span>=<span class="string"><span class="delimiter">"</span><span class="content">../../index.html</span><span class="delimiter">"</span></span><span class="tag">></span>index.html<span class="tag"></a></span>...
+ <span class="tag"></body></span>
+<span class="tag"></html></span></code></pre>
+ </div>
+ </div> </li>
+ <li> <p>In the home page’s index page (<code>content/index.html</code>):</p>
+ <div class="ulist">
+ <ul>
+ <li> <p>update the menu to reference the new version</p> </li>
+ <li> <p>update the version in the archetype.</p> </li>
+ </ul>
+ </div> </li>
+ </ul>
+ </div>
+ <div class="paragraph">
+ <p>At this point the files in the root (directly under <code>content</code>) will still be out of date; the publish process simply preserves whatever is in <code>content/versions/current</code>. Also, the <code>SNAPSHOT</code> will be missing (above it was renamed to <code>current</code>). To fix both of these issues, simply publish the website one more time (from the <code>isis</code> main repo).</p>
+ </div>
+ <div class="paragraph">
+ <p>Finally, preview the changes (in the <code>isis-site</code>). If everything looks ok, then push the changes to make live.</p>
</div>
</div>
<div class="sect2">
@@ -2324,7 +2391,7 @@ popd</code></pre>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="bash">[ANN] Apache Isis version 1.16.0 Released</code></pre>
+ <pre class="CodeRay highlight"><code data-lang="bash">[ANN] Apache Isis version 2.0.0-M1 Released</code></pre>
</div>
</div>
<div class="paragraph">
@@ -2332,7 +2399,7 @@ popd</code></pre>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code>The Apache Isis team is pleased to announce the release of Apache Isis v1.16.0.
+ <pre class="CodeRay highlight"><code>The Apache Isis team is pleased to announce the release of Apache Isis v2.0.0-M1.
New features in this release include:
* ...
@@ -2347,8 +2414,8 @@ Enjoy!
--The Apache Isis team
-[1] http://isis.apache.org/release-notes/release-notes.html#_release-notes_1.16.0
-[2] http://isis.apache.org/migration-notes/migration-notes.html#_migration-notes_1.15.0-to-1.16.0
+[1] http://isis.apache.org/release-notes/release-notes.html#_release-notes_2.0.0-M1
+[2] http://isis.apache.org/migration-notes/migration-notes.html#_migration-notes_1.16.0-to-2.0.0-M1
[3] http://search.maven.org
[4] http://isis.apache.org/downloads.html</code></pre>
</div>
@@ -2369,9 +2436,9 @@ Enjoy!
<div class="content">
<pre class="CodeRay highlight"><code data-lang="bash">git checkout master # update master with latest
git pull
-git merge release-1.16.0-RC1 # merge branch onto master
-git push origin --delete release-1.16.0-RC1 # remote branch no longer needed
-git branch -d release-1.16.0-RC1 # branch no longer needed</code></pre>
+git merge release-2.0.0-M1-RC1 # merge branch onto master
+git push origin --delete release-2.0.0-M1-RC1 # remote branch no longer needed
+git branch -d release-2.0.0-M1-RC1 # branch no longer needed</code></pre>
</div>
</div>
<div class="paragraph">
@@ -2524,7 +2591,7 @@ git push</code></pre>
</div>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="bash">[RESULT] [VOTE] Apache Isis Core release 1.16.0</code></pre>
+ <pre class="CodeRay highlight"><code data-lang="bash">[RESULT] [VOTE] Apache Isis Core release 2.0.0-M1</code></pre>
</div>
</div>
<div class="paragraph">
@@ -2554,23 +2621,23 @@ The vote is UNSUCCESSFUL.</code></pre>
<li> <p>delete the remote branch, for example:<br></p>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="bash">git push --delete origin release-1.16.0-RC1</code></pre>
+ <pre class="CodeRay highlight"><code data-lang="bash">git push --delete origin release-2.0.0-M1-RC1</code></pre>
</div>
</div> </li>
<li> <p>delete the remote origin server’s tags, for example:<br></p>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="bash">git push --delete origin isis-1.16.0-RC1
-git push --delete origin helloworld-archetype-1.16.0-RC1
-git push --delete origin simpleapp-archetype-1.16.0-RC1</code></pre>
+ <pre class="CodeRay highlight"><code data-lang="bash">git push --delete origin isis-2.0.0-M1-RC1
+git push --delete origin helloworld-archetype-2.0.0-M1-RC1
+git push --delete origin simpleapp-archetype-2.0.0-M1-RC1</code></pre>
</div>
</div> </li>
<li> <p>delete the tags that were created locally, for example:<br></p>
<div class="listingblock">
<div class="content">
- <pre class="CodeRay highlight"><code data-lang="bash">git tag -d isis-1.16.0
-git tag -d helloworld-archetype-1.16.0
-git tag -d simpleapp-archetype-1.16.0</code></pre>
+ <pre class="CodeRay highlight"><code data-lang="bash">git tag -d isis-2.0.0-M1
+git tag -d helloworld-archetype-2.0.0-M1
+git tag -d simpleapp-archetype-2.0.0-M1</code></pre>
</div>
</div> </li>
</ul>
@@ -2861,7 +2928,7 @@ mvn -D deploy=snapshot deploy</code></pre>
<p>The generated site is published by copying into the <code>content/</code> directory of the <a href="https://git-wip-us.apache.org/repos/asf/isis-site.git">isis-site git repo</a>. You therefore need to check this out this repo.</p>
</div>
<div class="paragraph">
- <p>The procedure assumes that two git repos (for <a href="https://git-wip-us.apache.org/repos/asf/isis.git">isis</a> itself and for isis-site) are checked out into the same parent directory, eg:</p>
+ <p>The procedure assumes that two git repos (for <a href="https://github.com/apache/isis">isis</a> itself on github, and for isis-site) are checked out into the same parent directory, eg:</p>
</div>
<div class="listingblock">
<div class="content">