You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2021/12/29 08:50:10 UTC

[hop-website] branch master updated: [GRADUATION] update git reference

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

hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop-website.git


The following commit(s) were added to refs/heads/master by this push:
     new ef760b1  [GRADUATION] update git reference
     new da7a2c8  Merge pull request #105 from hansva/master
ef760b1 is described below

commit ef760b14aa05e5509c9020d871c9cceb5ccfc3e2
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Wed Dec 29 09:49:33 2021 +0100

    [GRADUATION] update git reference
---
 Jenkinsfile                                                    |  2 +-
 README.md                                                      |  6 +++---
 antora-ui-hop/src/partials/header-content.hbs                  |  2 +-
 content/_index.adoc                                            |  2 +-
 content/blog/2020/11/roundup-2020-11/index.adoc                |  8 ++++----
 content/blog/2021/01/release-0.60/index.adoc                   | 10 +++++-----
 content/blog/2021/01/roundup-2021-01/index.adoc                |  4 ++--
 content/blog/2021/04/release-0.70/index.adoc                   |  4 ++--
 content/blog/2021/07/roundup-2021-07/index.adoc                |  2 +-
 content/blog/2021/09/roundup-2021-08/index.adoc                |  2 +-
 .../contribution-guides/documentation-contribution-guide.adoc  |  8 ++++----
 .../contribution-guides/translation-contribution-guide.adoc    |  2 +-
 content/community/incubator/index.adoc                         |  6 +++---
 content/community/sources.adoc                                 |  6 +++---
 content/community/tools.adoc                                   |  4 ++--
 content/download/index.adoc                                    |  4 ++--
 layouts/partials/footer.html                                   |  2 +-
 layouts/partials/header.html                                   |  2 +-
 site-local.yml                                                 |  6 +++---
 site.yml                                                       |  6 +++---
 static/doap_Hop.rdf                                            |  4 ++--
 21 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index dead697..836bbb4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -106,7 +106,7 @@ pipeline {
             steps {
                 dir('deploy/staging') {
                     deleteDir()
-                    sh 'git clone -b asf-site https://gitbox.apache.org/repos/asf/incubator-hop-website.git .'
+                    sh 'git clone -b asf-site https://gitbox.apache.org/repos/asf/hop-website.git .'
                     sh 'git rm -rf --ignore-unmatch .'
                     sh "cp -R $WORKSPACE/hop-website/public/. ."
                     sh "cp $WORKSPACE/hop-website/.asf.yaml ."
diff --git a/README.md b/README.md
index 9e0bcba..9f219cb 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ Follow [the documentation on installing](https://yarnpkg.com/en/docs/install) Ya
 
 Clone the hop-webiste git repository:
 
-    $ git clone https://github.com/apache/hincubator-op-website.git
+    $ git clone https://github.com/apache/hop-website.git
 
 
 ## Build the Antora Hop UI theme
@@ -100,9 +100,9 @@ or
 
     $ yarn preview-local 
 
-`preview` will pull the latest docs version from [github](https://github.com/apache/incubator-hop-docs),  `preview-local` will use the (committed) documentation files from your local incubator-hop-docs clone. 
+`preview` will pull the latest docs version from [github](https://github.com/apache/hop),  `preview-local` will use the (committed) documentation files from your local hop clone. 
 
-NOTE: `preview-local` assumes your docs repository is cloned to a folder `incubator-hop-docs` next to `incubator-hop-webste` (both repositories in the same parent folder). 
+NOTE: `preview-local` assumes your docs repository is cloned to a folder `hop` next to `hop-webste` (both repositories in the same parent folder). 
 
 and you will be provided with a web server running the site on [http://localhost:1313/](http://localhost:1313/)
 
diff --git a/antora-ui-hop/src/partials/header-content.hbs b/antora-ui-hop/src/partials/header-content.hbs
index 2ab8518..e6325a7 100644
--- a/antora-ui-hop/src/partials/header-content.hbs
+++ b/antora-ui-hop/src/partials/header-content.hbs
@@ -40,7 +40,7 @@
         <a href="https://twitter.com/ApacheHop" title="Follow us on Twitter" target="_blank"><svg focusable="false" height="30" width="30" viewBox="0 0 30 30" class="brand-icon"><path d="M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10-10-4.486-10-10 4.486-10 10-10zm0-2c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm6.5 8.778c-.441.196-.916.328-1.414.388.509-.305.898-.787 1.083-1.362-.476.282-1.003.487-1.564.597-.448-.479-1.089-.778-1.796-.778-1.59 0-2.758 1.483-2.399  [...]
         <a href="https://www.linkedin.com/company/apachehop/" title="Follow us on LinkedIn" target="_blank"><svg focusable="false" height="30" width="30" viewBox="0 0 30 30" class="brand-icon"><path d="M19 0h-14c-2.761 0-5 2.239-5 5v14c0 2.761 2.239 5 5 5h14c2.762 0 5-2.239 5-5v-14c0-2.761-2.238-5-5-5zm-11 19h-3v-11h3v11zm-1.5-12.268c-.966 0-1.75-.79-1.75-1.764s.784-1.764 1.75-1.764 1.75.79 1.75 1.764-.783 1.764-1.75 1.764zm13.5 12.268h-3v-5.604c0-3.368-4-3.113-4 0v5.604h-3v-11h3v1.765c1 [...]
         <a href="https://www.youtube.com/channel/UCGlcYslwe03Y2zbZ1W6DAGA" title="Subscribe to our YouTube channel" target="_blank"><svg focusable="false" height="30" width="30" viewBox="0 0 30 30" class="brand-icon"><path fill-rule="evenodd" d="M4.652 0h1.44l.988 3.702.916-3.702h1.454l-1.665 5.505v3.757h-1.431v-3.757l-1.702-5.505zm6.594 2.373c-1.119 0-1.861.74-1.861 1.835v3.349c0 1.204.629 1.831 1.861 1.831 1.022 0 1.826-.683 1.826-1.831v-3.349c0-1.069-.797-1.835-1.826-1.835zm.531 5.127 [...]
-        <a href="https://github.com/apache/incubator-hop/" title="Collaborate on GitHub"><svg focusable="false" class="brand-icon" viewBox="0 0 22 22"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 [...]
+        <a href="https://github.com/apache/hop/" title="Collaborate on GitHub"><svg focusable="false" class="brand-icon" viewBox="0 0 22 22"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2 [...]
      </div>
       <button class="navbar-burger" data-target="topbar-nav" type="button">
         <span></span>
diff --git a/content/_index.adoc b/content/_index.adoc
index 5d4b797..863a950 100644
--- a/content/_index.adoc
+++ b/content/_index.adoc
@@ -113,7 +113,7 @@ Hop is an [Apache Software Foundation](https://www.apache.org) project, availabl
 
 [Sources](./community/sources/), [mailing lists](./community/mailing-list/), [issue tracker](./community/support/): it's fully open, you can access directly.
 
-We also love contributions: don't hesitate to [contribute](./community/contributing/). You can contribute by <a href="https://github.com/apache/incubator-hop-website/edit/master/content/_index.md">editing this page</a>!
+We also love contributions: don't hesitate to [contribute](./community/contributing/). You can contribute by <a href="https://github.com/apache/hop-website/edit/master/content/_index.md">editing this page</a>!
 
 [Be Involved In The Community](./community/contributing/)
 
diff --git a/content/blog/2020/11/roundup-2020-11/index.adoc b/content/blog/2020/11/roundup-2020-11/index.adoc
index 9d2b337..4bb8158 100644
--- a/content/blog/2020/11/roundup-2020-11/index.adoc
+++ b/content/blog/2020/11/roundup-2020-11/index.adoc
@@ -28,7 +28,7 @@ With the start of the incubation process, the project will now be referred to as
 
 Below are a list of useful new project links for reference. Most existing links should forward to the new ones, but please update your bookmarks:
 
-* project url: link:https://hop.apache.org[hop.apache.org] or link:https://hop.incubator.apache.org[hop.incubator.apache.org]
+* project url: link:https://hop.apache.org[hop.apache.org]
 * link:https://chat.project-hop.org[chat]
 * link:https://issues.apache.org/jira/projects/HOP/issues[JIRA]
 * link:https://ci-builds.apache.org/job/Hop/[Jenkins]
@@ -61,7 +61,7 @@ Many thanks to Nicolas Adment for this contribution!
 
 ## Documentation
 
-Hop documentation is a work in progress. We've added or updated documentation for link:https://hop.incubator.apache.org/manual/latest/hop-gui/environments/environments.html[projects and environments], https://hop.incubator.apache.org/manual/latest/plugins/transforms/metainject.html[metadata injection], and lots of other small changes.
+Hop documentation is a work in progress. We've added or updated documentation for link:https://hop.apache.org/manual/latest/hop-gui/environments/environments.html[projects and environments], https://hop.apache.org/manual/latest/plugins/transforms/metainject.html[metadata injection], and lots of other small changes.
 
 As always, ping us on https://chat.project-hop.org[mattermost] to discuss documentation, and create link:https://issues.apache.org/jira/projects/HOP/issues[tickets] if you find any missing or incorrect information in the docs. Documentation is code, we take bugs in the documentation just as serious as bugs in the code.
 
@@ -71,8 +71,8 @@ Hop now works with Beam 2.24.
 
 Two new transforms have been added:
 
-* link:https://hop.incubator.apache.org/manual/latest/plugins/transforms/fake.html[Fake Data]
-* link:https://hop.incubator.apache.org/manual/latest/plugins/transforms/streamschemamerge.html[Stream Schema Merge]
+* link:https://hop.apache.org/manual/latest/plugins/transforms/fake.html[Fake Data]
+* link:https://hop.apache.org/manual/latest/plugins/transforms/streamschemamerge.html[Stream Schema Merge]
 
 ## Community
 
diff --git a/content/blog/2021/01/release-0.60/index.adoc b/content/blog/2021/01/release-0.60/index.adoc
index 2a0bc79..b2508c7 100644
--- a/content/blog/2021/01/release-0.60/index.adoc
+++ b/content/blog/2021/01/release-0.60/index.adoc
@@ -16,7 +16,7 @@ Less than three months since Project Hop joined the ASF Incubator (late October
 As stated earlier, one of the main goal of the incubator program is to give projects the time to adopt "The Apache Way". As such, it took us a bit of time to get the entire process straightened out. We went through 2 0.50 release candidates (RC1 and RC2) before this 0.60 release got accepted.
 Since the main purpose of this release was to work through the legal formalities that come with an ASF release, 0.60 is a code only release. We already started working on 0.70, which will be a complete release, including binaries. Once 0.70 has been released, moving towards a 1.0 release should be smooth sailing.
 
-Check our https://hop.apache.org/download/[downloads page] for the 0.60 source code (https://github.com/apache/incubator-hop/blob/master/README.md[build instructions]) or a recent nightly build.
+Check our https://hop.apache.org/download/[downloads page] for the 0.60 source code (https://github.com/apache/hop/blob/master/README.md[build instructions]) or a recent nightly build.
 
 ## Apache Hop (Incubating) - 0.60 Release Highlight
 
@@ -61,9 +61,9 @@ A number of new plugins were added to Hop or were ported from Kettle/PDI:
 ** http://hop.apache.org/manual/latest/plugins/actions/repeat.html[Repeat] and http://hop.apache.org/manual/latest/plugins/actions/repeat-end.html[End Repeat]
 * Transforms:
 ** https://github.com/m-a-hall/hop-cpython[CPython] (external)
-** https://hop.incubator.apache.org/manual/latest/plugins/transforms/fake.html[Fake Data]
+** https://hop.apache.org/manual/latest/plugins/transforms/fake.html[Fake Data]
 ** http://hop.apache.org/manual/latest/plugins/transforms/mongodbinput.html[MongoDB Input] and http://hop.apache.org/manual/latest/plugins/transforms/mongodboutput.html[Output]
-** https://hop.incubator.apache.org/manual/latest/plugins/transforms/streamschemamerge.html[Stream Schema Merge]
+** https://hop.apache.org/manual/latest/plugins/transforms/streamschemamerge.html[Stream Schema Merge]
 ** https://hop.apache.org/manual/latest/plugins/transforms/tokenreplacement.html[Token Replacement]
 ** https://hop.apache.org/manual/latest/plugins/transforms/userdefinedjavaclass.html[User Defined Java Class]
 ** Salesforce:
@@ -113,9 +113,9 @@ image:/img/Roundup-2020-08/metadata-injection.png[Metadata Injection, 65% , alig
 
 ## Docker, Kubernetes
 
-The separate Dockerfile and configuration were moved to the main Hop https://github.com/apache/incubator-hop/tree/master/docker[repository].
+The separate Dockerfile and configuration were moved to the main Hop https://github.com/apache/hop/tree/master/docker[repository].
 
-A Hop Docker image is now one `docker pull` away through https://hub.docker.com/r/apache/incubator-hop/[Docker Hub].
+A Hop Docker image is now one `docker pull` away through https://hub.docker.com/r/apache/hop/[Docker Hub].
 
 Work on Kubernetes continues in the separate https://github.com/project-hop/hop-docker[repository].
 
diff --git a/content/blog/2021/01/roundup-2021-01/index.adoc b/content/blog/2021/01/roundup-2021-01/index.adoc
index 3ef7c3c..969559c 100644
--- a/content/blog/2021/01/roundup-2021-01/index.adoc
+++ b/content/blog/2021/01/roundup-2021-01/index.adoc
@@ -99,9 +99,9 @@ image:/img/Roundup-2021-01/hop-berserker.png[Hop Berserker, width=40%, scalewidt
 
 ## Docker, Kubernetes updates
 
-The separate Dockerfile and configuration were moved to the main Hop https://github.com/apache/incubator-hop/tree/master/docker[repository].
+The separate Dockerfile and configuration were moved to the main Hop https://github.com/apache/hop/tree/master/docker[repository].
 
-A Hop Docker image is now one `docker pull` away through https://hub.docker.com/r/apache/incubator-hop/[Docker Hub].
+A Hop Docker image is now one `docker pull` away through https://hub.docker.com/r/apache/hop/[Docker Hub].
 
 Work on Kubernetes continues in the separate https://github.com/project-hop/hop-docker[repository].
 
diff --git a/content/blog/2021/04/release-0.70/index.adoc b/content/blog/2021/04/release-0.70/index.adoc
index fc6f93f..30d378f 100644
--- a/content/blog/2021/04/release-0.70/index.adoc
+++ b/content/blog/2021/04/release-0.70/index.adoc
@@ -213,14 +213,14 @@ Check out the updated http://hop.apache.org/manual/latest/hop-gui/pipelines/pipe
 
 A number of small issues have been fixed and improvements have been made. As the number of Docker use cases continues to grow, Hop in Docker has become stable and mature.
 
-The https://hub.docker.com/r/apache/incubator-hop[Hop image] is continuously pushed to , check it out with the pull command:  `docker pull apache/incubator-hop`
+The https://hub.docker.com/r/apache/hop[Hop image] is continuously pushed to , check it out with the pull command:  `docker pull apache/hop`
 
 
 ### Hop Web
 
 Hop Web is now fully integrated and is included in the default Hop build. It is still a little rough around the edges, but it is starting to look very good.
 
-Just like the default Docker image, the https://hub.docker.com/r/apache/incubator-hop-web[Hop Web Image] is pushed to Docker Hub continuously, check it out with the pull command `docker pull apache/incubator-hop-web`.
+Just like the default Docker image, the https://hub.docker.com/r/apache/hop-web[Hop Web Image] is pushed to Docker Hub continuously, check it out with the pull command `docker pull apache/hop-web`.
 
 
 ### Ordered List
diff --git a/content/blog/2021/07/roundup-2021-07/index.adoc b/content/blog/2021/07/roundup-2021-07/index.adoc
index 41bb008..a10bc3e 100644
--- a/content/blog/2021/07/roundup-2021-07/index.adoc
+++ b/content/blog/2021/07/roundup-2021-07/index.adoc
@@ -52,7 +52,7 @@ Hop Gui was designed from the start to provide one single, fully integrated user
 
 Hop Web now even has its own dark mode. Trying Hop Web on your local machine has never been easier:
 
-`docker pull apache/incubator-hop-web:1.0-SNAPSHOT docker run -p 8080:8080 -e HOP_WEB_THEME=dark apache/incubator-hop-web:1.0-SNAPSHOT`
+`docker pull apache/hop-web:1.0-SNAPSHOT docker run -p 8080:8080 -e HOP_WEB_THEME=dark apache/hop-web:1.0-SNAPSHOT`
 
 image:/img/Roundup-2021-07/hop-web-dark.jpeg[Hop Web Dark Mode, width="65%", align="left", link="/img/Roundup-2021-07/hop-web-dark.jpeg"]
 
diff --git a/content/blog/2021/09/roundup-2021-08/index.adoc b/content/blog/2021/09/roundup-2021-08/index.adoc
index c2cc638..afad83e 100644
--- a/content/blog/2021/09/roundup-2021-08/index.adoc
+++ b/content/blog/2021/09/roundup-2021-08/index.adoc
@@ -37,7 +37,7 @@ In addition to cloud storage for AWS, Azure and GCP, Hop VFS now also https://ho
 
 A number of (minor) bugs have been identified and fixed since the 0.99 release.
 
-In preparation for 1.0, the Hop team continues to clean up old and deprecated code. Automated code formatting has been added, we continue to fix https://sonarcloud.io/dashboard?id=apache_incubator-hop[SonarCloud] and other issues to get the Hop source code in the best shape possible for the Hop 1.0 release.
+In preparation for 1.0, the Hop team continues to clean up old and deprecated code. Automated code formatting has been added, we continue to fix https://sonarcloud.io/dashboard?id=apache_hop[SonarCloud] and other issues to get the Hop source code in the best shape possible for the Hop 1.0 release.
 
 
 [[community]]
diff --git a/content/community/contribution-guides/documentation-contribution-guide.adoc b/content/community/contribution-guides/documentation-contribution-guide.adoc
index af60ba1..3a0f032 100644
--- a/content/community/contribution-guides/documentation-contribution-guide.adoc
+++ b/content/community/contribution-guides/documentation-contribution-guide.adoc
@@ -68,12 +68,12 @@ All Apache Hop documentation is maintained in the same git repository as the cod
 
 === User manual and Technical documentation
 
-The easiest way to contribute documentation is to fork https://github.com/apache/incubator-hop[Hop’s repository] on GitHub into your own GitHub account by clicking on the fork button at the top right. If you have no GitHub account, you can create one for free.
+The easiest way to contribute documentation is to fork https://github.com/apache/hop[Hop’s repository] on GitHub into your own GitHub account by clicking on the fork button at the top right. If you have no GitHub account, you can create one for free.
 
 Next, clone your fork to your local machine.
 
 [source,shell]
-git clone https://github.com/<your-user-name>/incubator-hop.git
+git clone https://github.com/<your-user-name>/hop.git
 
 The user manual documentation is located in the docs/hop-user-manual/ subdirectory.
 The technical documentation is located in the docs/hop-tech-manual/ subdirectory.
@@ -83,7 +83,7 @@ The technical documentation is located in the docs/hop-tech-manual/ subdirectory
 To contribute to the API and code documentation create a fork of Hop's code repository.
 
 [source,shell]
-git clone https://github.com/<your-user-name>/incubator-hop.git
+git clone https://github.com/<your-user-name>/hop.git
 
 The API documentation is located in the docs/hop-dev-manual subdirectory
 
@@ -112,6 +112,6 @@ Push your committed contribution to your fork of the Hop repository at GitHub.
 [source,shell]
 git push origin myBranch
 
-Go to the website of your repository fork (`https://github.com/<your-user-name>/incubator-hop`) and use the “Create Pull Request” button to start creating a pull request. Make sure that the base fork is hop master and the head fork selects the branch with your changes. Give the pull request a meaningful description and submit it.
+Go to the website of your repository fork (`https://github.com/<your-user-name>/hop`) and use the “Create Pull Request” button to start creating a pull request. Make sure that the base fork is hop master and the head fork selects the branch with your changes. Give the pull request a meaningful description and submit it.
 
 It is also possible to attach a patch to a Jira issue.
diff --git a/content/community/contribution-guides/translation-contribution-guide.adoc b/content/community/contribution-guides/translation-contribution-guide.adoc
index 0aef33a..ec89a31 100644
--- a/content/community/contribution-guides/translation-contribution-guide.adoc
+++ b/content/community/contribution-guides/translation-contribution-guide.adoc
@@ -11,7 +11,7 @@ The Hop Translator is a single dialog application.
 
 == anchor:hop-translator-how-to-run[]How to run
 You'll need the source code if you want to run the Hop Translator.
-Clone the repository from https://github.com/apache/incubator-hop
+Clone the repository from https://github.com/apache/hop
 
 Build Hop:
 [source,bash]
diff --git a/content/community/incubator/index.adoc b/content/community/incubator/index.adoc
index 8c818e2..99d8da7 100644
--- a/content/community/incubator/index.adoc
+++ b/content/community/incubator/index.adoc
@@ -19,9 +19,9 @@ Mentors and community members are encouraged to contribute to this page and comm
 |===
 |ID|Description|Status
 |CD10|The project produces Open Source software for distribution to the public, at no charge.|The project source code is licensed under the Apache License, version 2.0.
-|CD20|Anyone can easily discover and access the project's code.|The Apache Hop (Incubating) source code is available on https://gitbox.apache.org/repos/asf?p=incubator-hop.git[GitBot] and http://github.com/apache/incubator-hop[github]
+|CD20|Anyone can easily discover and access the project's code.|The Apache Hop (Incubating) source code is available on https://gitbox.apache.org/repos/asf?p=hop.git[GitBot] and http://github.com/apache/hop[github]
 |CD30|Anyone using standard, widely-available tools, can build the code in a reproducible way.|The Apache Hop (Incubating) is built after each commit and integration tests are run on a daily basis on the https://ci-builds.apache.org/job/Hop/[ASF Jenkins server]. + Development environment setup and build instructions are http://hop.apache.org/dev-manual/latest/setup-dev-environment.html[documented] on the Hop website.
-|CD40|The full history of the project's code is available via a source code control system, in a way that allows anyone to recreate any released version.| The entire commit history is available from the https://github.com/apache/incubator-hop/commit/e24b53ea7dfe6bcad9e03011d1ce88eeb1bb7edc[beginning].
+|CD40|The full history of the project's code is available via a source code control system, in a way that allows anyone to recreate any released version.| The entire commit history is available from the https://github.com/apache-hop/commit/e24b53ea7dfe6bcad9e03011d1ce88eeb1bb7edc[beginning].
 |CD50|The source code control system establishes the provenance of each line of code in a reliable way, based on strong authentication of the committer. When third parties contribute code, commit messages provide reliable information about the code provenance.|The project uses the git repository, managed by Apache Infra, ensuring provenance of each line of code to a committer. All code is checked in after review and approval of a pull-request. For 3rd party contribution, the commit messa [...]
 |===
 
@@ -45,7 +45,7 @@ Mentors and community members are encouraged to contribute to this page and comm
 |RE10|Releases consist of source code, distributed using standard and open archive formats that are expected to stay readable in the long term.|Releases are available via https://dlcdn.apache.org/incubator/hop/. Source code and convenience binaries are linked to from the http://hop.apache.org/download/[website].
 |RE20|The project's PMC (Project Management Committee, see CS10) approves each software release in order to make the release an act of the Foundation.|All incubating releases have been approved by the Hop community and the Incubator, all with at least 3 (P)PMC votes and more +1 than -1.
 |RE30|Releases are signed and/or distributed along with digests that anyone can reliably use to validate the downloaded archives.|Releases are signed, the keys are available from the http://hop.apache.org/download/[Hop download page].
-|RE40|The project can distribute convenience binaries alongside source code, but they are not Apache Releases, they are provided with no guarantee.|Convenience binaries are available from the download page, a Docker image is available from https://hub.docker.com/r/apache/incubator-hop[Dockerbub]
+|RE40|The project can distribute convenience binaries alongside source code, but they are not Apache Releases, they are provided with no guarantee.|Convenience binaries are available from the download page, a Docker image is available from https://hub.docker.com/r/apache/hop[Dockerbub]
 |RE50|The project documents a repeatable release process so that someone new to the project can independently generate the complete set of artifacts required for a release.|The processes to https://hop.apache.org/dev-manual/latest/apache-release/creating-a-release.html[create], https://hop.apache.org/dev-manual/latest/apache-release/promoting-a-release.html[promote] and https://hop.apache.org/dev-manual/latest/apache-release/checking-a-release.html[check] a release are documented.
 |===
 
diff --git a/content/community/sources.adoc b/content/community/sources.adoc
index 6e46785..8e14085 100644
--- a/content/community/sources.adoc
+++ b/content/community/sources.adoc
@@ -7,13 +7,13 @@ title: "Sources"
 To browse via the web:
 
 ```
-https://gitbox.apache.org/repos/asf/incubator-hop.git
+https://gitbox.apache.org/repos/asf/hop.git
 ```
 
 ## Checking out from git
 
 ```
-git clone https://gitbox.apache.org/repos/asf/incubator-hop.git
+git clone https://gitbox.apache.org/repos/asf/hop.git
 ```
 
 Only project developers can commit to the git via this method. SSH must be installed on your client machine. Enter your site password when prompted.
@@ -23,5 +23,5 @@ Only project developers can commit to the git via this method. SSH must be insta
 The source code is mirrored to github, so you can also checkout the source code from github, if you are familiar with using github. By using github you can submit pull requests to the project using the standard github way.
 
 ```
-https://github.com/apache/incubator-hop/
+https://github.com/apache/hop/
 ```
diff --git a/content/community/tools.adoc b/content/community/tools.adoc
index f6fbfb4..aca5d5f 100644
--- a/content/community/tools.adoc
+++ b/content/community/tools.adoc
@@ -15,7 +15,7 @@ The following tools are used within the Hop community.
 == anchor:github[]GitHub
 All our source code is publicly available on GitHub, GitHub is a Git repository hosting service, but it adds many of its own features. While Git is a command line tool, GitHub provides a Web-based graphical interface. It also provides access control and several collaboration features.
 
-Our repositories can be found https://github.com/apache/incubator-hop[here , window="_blank"]
+Our repositories can be found https://github.com/apache/hop[here , window="_blank"]
 
 While GitHub provides solutions to do issue tracking we use a separate platform for this.
 
@@ -38,7 +38,7 @@ Artifactyory can be found https://artifactory.project-hop.org[here]
 == anchor:sonarcloud[]Sonarcloud
 Sonarcloud is a platform that does code checks and validates the quality of your code. The goal of Apache Hop is to create solid clean code, Sonarcloud helps us achieve this goal. Currently it does not look good yet but we are still in a stage where we are refactoring and cleaning up the Hop code base.
 
-You can take a look at the status of our project https://sonarcloud.io/dashboard?id=apache_incubator-hop[here]
+You can take a look at the status of our project https://sonarcloud.io/dashboard?id=apache_hop[here]
 
 == anchor:wiki[]Wiki
 
diff --git a/content/download/index.adoc b/content/download/index.adoc
index b7b53a3..2a747e0 100644
--- a/content/download/index.adoc
+++ b/content/download/index.adoc
@@ -16,8 +16,8 @@ description: "Download Apache Hop source and binary releases or Docker images fo
 
 Apache Hop is available as a Docker image on Dockerhub:
 
-* https://hub.docker.com/r/apache/incubator-hop[Hop], Docker pull command:  `docker pull apache/incubator-hop`
-* https://hub.docker.com/r/apache/incubator-hop-web[Hop Web], Docker pull command `docker pull apache/incubator-hop-web`
+* https://hub.docker.com/r/apache/hop[Hop], Docker pull command:  `docker pull apache/hop`
+* https://hub.docker.com/r/apache/hop-web[Hop Web], Docker pull command `docker pull apache/hop-web`
 
 
 ## Keys
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 094c53f..5efe92a 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,6 +1,6 @@
 <div class="footer-tools">
     {{ with .File }}
-    <a title="Improve this document, receive free virtual hugs &hearts;" href="https://github.com/apache/incubator-hop-website/edit/master/content/{{ .Path | replaceRE "^/" "" }}">Edit this Page</a>
+    <a title="Improve this document, receive free virtual hugs &hearts;" href="https://github.com/apache/hop-website/edit/master/content/{{ .Path | replaceRE "^/" "" }}">Edit this Page</a>
     {{ end }}
     <a href="#top" title="Reach the top of the page">Back to top</a>
 </div>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index f09871f..d821d6d 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -68,7 +68,7 @@
                     <a href="https://twitter.com/ApacheHop" title="Follow us on Twitter" target="_blank"><svg focusable="false" height="30" width="30" viewBox="0 0 30 30" class="brand-icon"><path d="M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10-10-4.486-10-10 4.486-10 10-10zm0-2c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm6.5 8.778c-.441.196-.916.328-1.414.388.509-.305.898-.787 1.083-1.362-.476.282-1.003.487-1.564.597-.448-.479-1.089-.778-1.796-.778-1.59 0-2.758  [...]
                     <a href="https://www.linkedin.com/company/apachehop/" title="Follow us on LinkedIn" target="_blank"><svg focusable="false" height="30" width="30" viewBox="0 0 30 30" class="brand-icon"><path d="M19 0h-14c-2.761 0-5 2.239-5 5v14c0 2.761 2.239 5 5 5h14c2.762 0 5-2.239 5-5v-14c0-2.761-2.238-5-5-5zm-11 19h-3v-11h3v11zm-1.5-12.268c-.966 0-1.75-.79-1.75-1.764s.784-1.764 1.75-1.764 1.75.79 1.75 1.764-.783 1.764-1.75 1.764zm13.5 12.268h-3v-5.604c0-3.368-4-3.113-4 0v5.604h-3v- [...]
                     <a href="https://www.youtube.com/channel/UCGlcYslwe03Y2zbZ1W6DAGA" title="Subscribe to our YouTube channel" target="_blank"><svg focusable="false" height="30" width="30" viewBox="0 0 30 30" class="brand-icon"><path fill-rule="evenodd" d="M4.652 0h1.44l.988 3.702.916-3.702h1.454l-1.665 5.505v3.757h-1.431v-3.757l-1.702-5.505zm6.594 2.373c-1.119 0-1.861.74-1.861 1.835v3.349c0 1.204.629 1.831 1.861 1.831 1.022 0 1.826-.683 1.826-1.831v-3.349c0-1.069-.797-1.835-1.826-1.835 [...]
-                    <a href="https://github.com/apache/incubator-hop/" title="Collaborate on GitHub" target="_blank"><svg focusable="false" class="brand-icon" width="30" height="30" viewBox="0 0 30 30"><path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.76 [...]
+                    <a href="https://github.com/apache/hop/" title="Collaborate on GitHub" target="_blank"><svg focusable="false" class="brand-icon" width="30" height="30" viewBox="0 0 30 30"><path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2. [...]
                 </div>
                 <button class="navbar-burger" data-target="topbar-nav" type="button">
                     <span></span>
diff --git a/site-local.yml b/site-local.yml
index b4860b7..f63cc61 100644
--- a/site-local.yml
+++ b/site-local.yml
@@ -7,14 +7,14 @@ site:
 
 content:
   sources:
-  - url: ../incubator-hop/
+  - url: ../hop/
     branches: 
       - HEAD
     start_path: /docs/hop-user-manual/
-  - url: ../incubator-hop/
+  - url: ../hop/
     branches: HEAD
     start_path: /docs/hop-tech-manual/
-  - url: ../incubator-hop/
+  - url: ../hop/
     branches: HEAD
     start_path: /docs/hop-dev-manual/
     
diff --git a/site.yml b/site.yml
index ec851b8..30b006d 100644
--- a/site.yml
+++ b/site.yml
@@ -7,15 +7,15 @@ site:
 
 content:
   sources:
-  - url: git@github.com:apache/incubator-hop.git
+  - url: git@github.com:apache/hop.git
     branches: 
       - master
       - release1.0.0
     start_path: /docs/hop-user-manual/
-  - url: git@github.com:apache/incubator-hop.git
+  - url: git@github.com:apache/hop.git
     branches: master
     start_path: /docs/hop-tech-manual/
-  - url: git@github.com:apache/incubator-hop.git
+  - url: git@github.com:apache/hop.git
     branches: master
     start_path: /docs/hop-dev-manual/
     
diff --git a/static/doap_Hop.rdf b/static/doap_Hop.rdf
index eb247f0..495412d 100644
--- a/static/doap_Hop.rdf
+++ b/static/doap_Hop.rdf
@@ -49,8 +49,8 @@ Hop aims to be the future of data integration. Visual development enables develo
     </release>
     <repository>
       <GitRepository>
-        <location rdf:resource="https://github.com/apache/incubator-hop.git"/>
-        <browse rdf:resource="https://github.com/apache/incubator-hop"/>
+        <location rdf:resource="https://github.com/apache/hop.git"/>
+        <browse rdf:resource="https://github.com/apache/hop"/>
       </GitRepository>
     </repository>
     <maintainer>