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/04 19:36:42 UTC
[isis] branch master updated: ISIS-1465: updates to docs,
remove reference to the old git repo, since we now only have a github repo
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new f0a3d6a ISIS-1465: updates to docs, remove reference to the old git repo, since we now only have a github repo
f0a3d6a is described below
commit f0a3d6a65d743075b0cbbca80648ced6d629c845
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 4 19:36:35 2018 +0000
ISIS-1465: updates to docs, remove reference to the old git repo, since we now only have a github repo
---
.../cgcom/_cgcom_asciidoc-publish-procedure.adoc | 2 +-
.../guides/cgcom/_cgcom_cutting-a-release.adoc | 10 ++++++----
.../cgcom/_cgcom_post-release-successful.adoc | 2 +-
.../main/asciidoc/guides/dg/_dg_building-isis.adoc | 9 ++-------
.../main/asciidoc/guides/dg/_dg_contributing.adoc | 17 +++--------------
.../dg/images/contributing/git-workflow-2.png | Bin 40826 -> 0 bytes
.../guides/dg/images/contributing/git-workflow.png | Bin 48331 -> 55066 bytes
.../guides/dg/images/contributing/git-workflow.pptx | Bin 68580 -> 39495 bytes
8 files changed, 13 insertions(+), 27 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_asciidoc-publish-procedure.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_asciidoc-publish-procedure.adoc
index 63f7335..638d004 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_asciidoc-publish-procedure.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_asciidoc-publish-procedure.adoc
@@ -24,7 +24,7 @@ This can only be done by Apache Isis committers, and is discussed below.
The generated site is published by copying into the `content/` directory of the https://git-wip-us.apache.org/repos/asf/isis-site.git[isis-site git repo]. You therefore need to check this out this repo.
-The procedure assumes that two git repos (for https://git-wip-us.apache.org/repos/asf/isis.git[isis] itself and for isis-site) are checked out into the same parent directory, eg:
+The procedure assumes that two git repos (for https://github.com/apache/isis[isis] itself on github, and for isis-site) are checked out into the same parent directory, eg:
[source]
----
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
index 78dcec9..743516a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc
@@ -12,7 +12,7 @@ The release process consists of:
* Members of the Apache Isis PMC xref:../cgcom/cgcom.adoc#_cgcom_verifying-releases[verifying] and voting on the release
* the release manager performing post-release tasks, for either a xref:../cgcom/cgcom.adoc#_cgcom_post-release-successful[successful] or an xref:../cgcom/cgcom.adoc#_cgcom_post-release-unsuccessful[unsuccessful] vote.
-Apache Isis itself consists of three separately releasable modules; relative to the link:https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=tree[source code root] there are:
+Apache Isis itself consists of three separately releasable modules; relative to the link:https://github.com/apache/isis[source code root] there are:
* `core`
* `component/example/archetypes/helloworld`
@@ -523,7 +523,9 @@ docker container run -p 8080:8080 -d test/simpleapp
+
[NOTE]
====
-On Windows, you may need to enable the Docker daemon first, otherwise the "mvn install" command above will fail:
+On Windows, make sure that Docker is first switched to using linux containers, not Windows containers (because the `Dockerfile` in the application references a linux base image).
+
+You may also need to enable the Docker daemon first, otherwise the "mvn install" command above will fail:
image::{_imagesdir}docker/docker-daemon.png[width="600px",link="{_imagesdir}docker/docker-daemon.png"]
@@ -898,7 +900,7 @@ git fetch
[NOTE]
====
-The remote tags aren't visible locally but can be seen https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=summary[online].
+The remote tags aren't visible locally but can be seen link:https://github.com/apache/isis/tags[online].
====
@@ -940,7 +942,7 @@ The source code artifacts have been uploaded to staging repositories on reposito
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-1.16.0-RC1, helloworld-archetype-1.16.0-RC1 and simpleapp-archetype-1.16.0-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
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc
index bfccad6..8f777d4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc
@@ -274,7 +274,7 @@ Validate using the http://www.w3.org/RDF/Validator/[W3C RDF Validator] service.
+
For more information on DOAP files, see these http://projects.apache.org/doap.html[Apache policy docs].
-* Update the https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=blob_plain;f=STATUS;hb=HEAD[STATUS] file (in root of Apache Isis' source) should be updated with details of the new release.
+* Update the https://github.com/apache/isis/blob/master/STATUS[STATUS] file (in root of Apache Isis' source) should be updated with details of the new release.
Don't forget to commit the `.adoc` changes and publish to the isis-site repo.
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_building-isis.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_building-isis.adoc
index 104b8c3..1f36f1e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_building-isis.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_building-isis.adoc
@@ -37,19 +37,14 @@ If using Mac, you might also want to check out Atlassian's http://www.atlassian.
[[__dg_building-isis_git_installation_cloning-the-apache-isis-repo]]
==== Cloning the Apache Isis repo
-First, clone the Apache Isis repo.
-
-If you are a *committer*, then clone from the Apache read/write repo:
+First, clone the Apache Isis repo:
[source,bash]
----
-git clone https://git-wip-us.apache.org/repos/asf/isis.git
+git clone https://github.com/apache/isis.git
----
-If you are *not a committer*, please see the xref:../dg/dg.adoc#_dg_contributing[contributing] page for details on which repo to clone from.
-
-
[[__dg_building-isis_git_installation_configuring-git]]
==== Configuring Git
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_contributing.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_contributing.adoc
index 86b268a..34db05a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_contributing.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_contributing.adoc
@@ -14,9 +14,10 @@ Thanks for considering to help out, your contributions are appreciated!
== Recommended Workflow (github)
-Apache Isis' source code is hosted in an Apache git repo (https://git-wip-us.apache.org/repos/asf/isis.git[https], http://git-wip-us.apache.org/repos/asf/isis.git[http]), with a clone on github (https://github.com/apache/isis.git[https], or ssh: `git@github.com:apache/isis.git`.
+Apache Isis' source code is hosted in at github (https://github.com/apache/isis.git[https], or ssh: `git@github.com:apache/isis.git`).
-As you might imagine, only committers are permitted to push changes to the central git repo. As a contributor, we recommend that you fork the https://github.com/apache/isis.git[apache/isis] repo in github, and then use your fork as a way of publishing your patches for the Apache Isis committers to apply.
+As you might imagine, only committers are permitted to push changes to the github repo.
+As a contributor, we recommend that you fork the https://github.com/apache/isis.git[apache/isis] github repo, and then use your fork as a way of publishing your patches for the Apache Isis committers to apply.
The diagram below illustrates the process:
@@ -37,18 +38,6 @@ That is:
-== Alternative Workflow (JIRA patches)
-
-As an alternative, you may decide to clone directly from https://github.com/apache/isis.git[github.com/apache/isis] rather than create your own fork:
-
-
-image::{_imagesdir}contributing/git-workflow-2.png[width="600px",link="{_imagesdir}contributing/git-workflow-2.png"]
-
-In this case your `upstream` repo is the same as your `origin` repo, which might seem more straightforward. On the other hand, if you go this route then you'll need create patches locally and attach them to the JIRA ticket.
-
-For the Apache Isis committers it really doesn't matter which route you take, so go with whatever's most comfortable.
-
-
== Setting up your fork/clone
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/images/contributing/git-workflow-2.png b/adocs/documentation/src/main/asciidoc/guides/dg/images/contributing/git-workflow-2.png
deleted file mode 100644
index 28cc822..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/dg/images/contributing/git-workflow-2.png and /dev/null differ
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/images/contributing/git-workflow.png b/adocs/documentation/src/main/asciidoc/guides/dg/images/contributing/git-workflow.png
index dde5573..606d35b 100644
Binary files a/adocs/documentation/src/main/asciidoc/guides/dg/images/contributing/git-workflow.png and b/adocs/documentation/src/main/asciidoc/guides/dg/images/contributing/git-workflow.png differ
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/images/contributing/git-workflow.pptx b/adocs/documentation/src/main/asciidoc/guides/dg/images/contributing/git-workflow.pptx
index e83367b..7684590 100644
Binary files a/adocs/documentation/src/main/asciidoc/guides/dg/images/contributing/git-workflow.pptx and b/adocs/documentation/src/main/asciidoc/guides/dg/images/contributing/git-workflow.pptx differ
--
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].