This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/distributedlog.git
The following commit(s) were added to refs/heads/master by this push:
new 1e78957 Issue 141: graduation changes, remove/change incubate related
things
1e78957 is described below
commit 1e789573fc41a8844f1378bfadc5453bc674e972
Author: Jia Zhai <zhaiji...@gmail.com>
AuthorDate: Mon Aug 14 18:13:08 2017 -0700
Issue 141: graduation changes, remove/change incubate related things
- remove the "-incubating" from the code base.
- change website link from http://distributedlog.incubator.apache.org into
https://bookkeeper.apache.org/distributedlog
- change repo from https://github.com/apache/incubator-distributedlog into
https://github.com/apache/distributedlog
- git from
https://git-wip-us.apache.org/repos/asf/incubator-distributedlog.git into
https://gitbox.apache.org/repos/asf/distributedlog.git
- remove website foot, whch contains incubate infos in websiteindex.md
- remove Disclaimer file and its references
Author: Jia Zhai <zhaiji...@gmail.com>
Reviewers: Sijie Guo <si...@apache.org>
Closes #143 from zhaijack/issue_141
---
DISCLAIMER | 7 ---
NOTICE | 4 +-
README.md | 34 +++++------
distributedlog-benchmark/pom.xml | 2 +-
distributedlog-build-tools/pom.xml | 4 +-
distributedlog-common/pom.xml | 2 +-
distributedlog-core-twitter/pom.xml | 2 +-
distributedlog-core/pom.xml | 2 +-
distributedlog-protocol/pom.xml | 2 +-
distributedlog-proxy-client/pom.xml | 2 +-
distributedlog-proxy-protocol/pom.xml | 2 +-
distributedlog-proxy-server/pom.xml | 2 +-
.../distributedlog-basic/pom.xml | 2 +-
.../distributedlog-kafka/pom.xml | 2 +-
.../distributedlog-mapreduce/pom.xml | 2 +-
.../distributedlog-messaging/pom.xml | 2 +-
distributedlog-tutorials/pom.xml | 2 +-
docs/README.md | 2 +-
docs/_config.yml | 10 +--
docs/basics/introduction.rst | 2 +-
docs/tutorials/analytics-mapreduce.rst | 2 +-
docs/tutorials/messaging-3.rst | 2 +-
docs/tutorials/messaging-4.rst | 2 +-
docs/tutorials/messaging-5.rst | 4 +-
pom.xml | 15 +++--
scripts/dev/build-website.sh | 4 +-
scripts/dev/dl-merge-pr.py | 4 +-
src/assemble/bin.xml | 6 --
src/assemble/src.xml | 1 -
website/README.md | 7 +--
website/_config.yml | 8 +--
.../_posts/2016-09-19-kafka-vs-distributedlog.md | 2 +-
website/_posts/2017-04-25-the-first-release.md | 4 +-
website/build.sh | 2 +-
website/community/community.md | 5 +-
website/community/release_guide.md | 71 +++-------------------
website/docs/0.4.0-incubating/README.md | 2 +-
website/docs/0.4.0-incubating/_config.yml | 4 +-
.../docs/0.4.0-incubating/basics/introduction.rst | 2 +-
.../tutorials/analytics-mapreduce.rst | 2 +-
.../0.4.0-incubating/tutorials/messaging-3.rst | 2 +-
.../0.4.0-incubating/tutorials/messaging-4.rst | 2 +-
.../0.4.0-incubating/tutorials/messaging-5.rst | 4 +-
website/index.md | 7 +--
44 files changed, 86 insertions(+), 167 deletions(-)
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 09fea68..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache DistributedLog is an effort undergoing incubation at The Apache
Software Foundation (ASF),
-sponsored by the Apache Incubator PMC. Incubation is required of all newly
accepted projects until
-a further review indicates that the infrastructure, communications, and
decision making process have
-stabilized in a manner consistent with other successful ASF projects. While
incubation status is not
-necessarily a reflection of the completeness or stability of the code, it does
indicate that the
-project has yet to be fully endorsed by the ASF.
-
diff --git a/NOTICE b/NOTICE
index dda6c45..e49dfdc 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,8 +1,8 @@
Apache DistributedLog
Copyright 2017 The Apache Software Foundation
-Apache DistributedLog is currently undergoing Incubation at the Apache
-Software Foundation.
+Apache DistributedLog project graduated from Incubator at July 2017.
+It is now a sub-project of Apache BookKeeper.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/README.md b/README.md
index bdbafd0..521e7cc 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
[](https://builds.apache.org/job/distributedlog-nightly-build/)
[](https://coveralls.io/github/apache/incubator-distributedlog?branch=master)
-# Apache DistributedLog (incubating)
+# Apache DistributedLog
Apache DistributedLog (DL) is a *high-throughput*, *low-latency* replicated
log service, offering
*durability*, *replication* and *strong consistency* as essentials for building
@@ -12,9 +12,7 @@ reliable _real-time_ applications.
## Status
-_The Apache DistributedLog project is in the process of incubating. This
includes the creation of project resources,
-the refactoring of the initial code submissions, and the formulation of
project documentation, planning and the
-improvements of existing user and operation documents. Any feedback and
contributions are welcome._
+_Apache DistributedLog project graduated from Incubator at July 2017. It is
now a sub-project of Apache BookKeeper._
## Features
@@ -57,25 +55,25 @@ and memory.
## First Steps
-* *Concepts*: Start with the [basic
concepts](http://distributedlog.incubator.apache.org/docs/latest/basics/introduction)
of DistributedLog.
+* *Concepts*: Start with the [basic
concepts](http://bookkeeper.apache.org/distributedlog/docs/latest/basics/introduction)
of DistributedLog.
This will help you to fully understand the other parts of the documentation,
- including
[setup](http://distributedlog.incubator.apache.org/docs/latest/deployment/cluster),
-
[integration](http://distributedlog.incubator.apache.org/docs/latest/user_guide/api/main.html)
and
- [operation
guide](http://distributedlog.incubator.apache.org/docs/latest/admin_guide/main.html).
+ including
[setup](http://bookkeeper.apache.org/distributedlog/docs/latest/deployment/cluster),
+
[integration](http://bookkeeper.apache.org/distributedlog/docs/latest/user_guide/api/main.html)
and
+ [operation
guide](http://bookkeeper.apache.org/distributedlog/docs/latest/admin_guide/main.html).
It is highly recommended to read this first.
-* *Quickstarts*: [Run
DistributedLog](http://distributedlog.incubator.apache.org/docs/latest/start/quickstart)
on your local machine
- or follow the tutorial to [write a simple
program](http://distributedlog.incubator.apache.org/docs/latest/tutorials/basic-1)
to interact with _DistributedLog_.
-* *Setup*: The
[docker](http://distributedlog.incubator.apache.org/docs/latest/deployment/docker)
and
[cluster](http://distributedlog.incubator.apache.org/docs/latest/deployment/cluster)
setup guides show how to deploy DistributedLog stack.
-* *User Guide*: You can checkout our guides about the [basic
concepts](http://distributedlog.incubator.apache.org/docs/latest/basics/introduction)
and the [Core Library
API](http://distributedlog.incubator.apache.org/docs/latest/user_guide/api/core)
or [Proxy Client
API](http://distributedlog.incubator.apache.org/docs/latest/user_guide/api/proxy)
+* *Quickstarts*: [Run
DistributedLog](http://bookkeeper.apache.org/distributedlog/docs/latest/start/quickstart)
on your local machine
+ or follow the tutorial to [write a simple
program](http://bookkeeper.apache.org/distributedlog/docs/latest/tutorials/basic-1)
to interact with _DistributedLog_.
+* *Setup*: The
[docker](http://bookkeeper.apache.org/distributedlog/docs/latest/deployment/docker)
and
[cluster](http://bookkeeper.apache.org/distributedlog/docs/latest/deployment/cluster)
setup guides show how to deploy DistributedLog stack.
+* *User Guide*: You can checkout our guides about the [basic
concepts](http://bookkeeper.apache.org/distributedlog/docs/latest/basics/introduction)
and the [Core Library
API](http://bookkeeper.apache.org/distributedlog/docs/latest/user_guide/api/core)
or [Proxy Client
API](http://bookkeeper.apache.org/distributedlog/docs/latest/user_guide/api/proxy)
to learn how to use DistributedLog to build your reliable real-time services.
## Next Steps
-* *Design Documents*: Learn about the
[architecture](http://distributedlog.incubator.apache.org/docs/latest/user_guide/architecture/main),
- [design
considerations](http://distributedlog.incubator.apache.org/docs/latest/user_guide/design/main)
and
- [implementation
details](http://distributedlog.incubator.apache.org/docs/latest/user_guide/implementation/main)
of DistributedLog.
-* *Tutorials*: You can check out the
[tutorials](http://distributedlog.incubator.apache.org/docs/latest/tutorials/main)
on how to build real applications.
-* *Admin Guide*: You can check out our guides about how to
[operate](http://distributedlog.incubator.apache.org/docs/latest/admin_guide/main)
the DistributedLog Stack.
+* *Design Documents*: Learn about the
[architecture](http://bookkeeper.apache.org/distributedlog/docs/latest/user_guide/architecture/main),
+ [design
considerations](http://bookkeeper.apache.org/distributedlog/docs/latest/user_guide/design/main)
and
+ [implementation
details](http://bookkeeper.apache.org/distributedlog/docs/latest/user_guide/implementation/main)
of DistributedLog.
+* *Tutorials*: You can check out the
[tutorials](http://bookkeeper.apache.org/distributedlog/docs/latest/tutorials/main)
on how to build real applications.
+* *Admin Guide*: You can check out our guides about how to
[operate](http://bookkeeper.apache.org/distributedlog/docs/latest/admin_guide/main)
the DistributedLog Stack.
## Get In Touch
@@ -101,7 +99,7 @@ We feel that a welcoming open community is important and
welcome contributions.
2. Take a look at our [open issues](https://issues.apache.org/jira/browse/DL).
-3. Review our [coding
style](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=65867477)
and follow our [code
reviews](https://github.com/apache/incubator-distributedlog/pulls) to learn
about our conventions.
+3. Review our [coding
style](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=65867477)
and follow our [code reviews](https://github.com/apache/distributedlog/pulls)
to learn about our conventions.
4. Make your changes according to our [code review
workflow](https://cwiki.apache.org/confluence/display/DL/Contributing+to+DistributedLog#ContributingtoDistributedLog-ContributingCodeChanges).
diff --git a/distributedlog-benchmark/pom.xml b/distributedlog-benchmark/pom.xml
index bd9889c..8d18f0e 100644
--- a/distributedlog-benchmark/pom.xml
+++ b/distributedlog-benchmark/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.5.0-incubating-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
</parent>
<artifactId>distributedlog-benchmark</artifactId>
<name>Apache DistributedLog :: Benchmark</name>
diff --git a/distributedlog-build-tools/pom.xml
b/distributedlog-build-tools/pom.xml
index 53f8272..68e85cf 100644
--- a/distributedlog-build-tools/pom.xml
+++ b/distributedlog-build-tools/pom.xml
@@ -20,10 +20,10 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.5.0-incubating-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>distributedlog-build-tools</artifactId>
<name>Apache DistributedLog :: Build Tools</name>
- <version>0.5.0-incubating-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
</project>
diff --git a/distributedlog-common/pom.xml b/distributedlog-common/pom.xml
index cad2bc8..e768574 100644
--- a/distributedlog-common/pom.xml
+++ b/distributedlog-common/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.5.0-incubating-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
</parent>
<artifactId>distributedlog-common</artifactId>
<name>Apache DistributedLog :: Common</name>
diff --git a/distributedlog-core-twitter/pom.xml
b/distributedlog-core-twitter/pom.xml
index 41116b9..bec9b03 100644
--- a/distributedlog-core-twitter/pom.xml
+++ b/distributedlog-core-twitter/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.5.0-incubating-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
</parent>
<artifactId>distributedlog-core-twitter</artifactId>
<name>Apache DistributedLog :: Core Library (Twitter Future Interface)</name>
diff --git a/distributedlog-core/pom.xml b/distributedlog-core/pom.xml
index 1ad51c2..4f37a13 100644
--- a/distributedlog-core/pom.xml
+++ b/distributedlog-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.5.0-incubating-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
</parent>
<artifactId>distributedlog-core</artifactId>
<name>Apache DistributedLog :: Core Library</name>
diff --git a/distributedlog-protocol/pom.xml b/distributedlog-protocol/pom.xml
index 7197feb..e81450d 100644
--- a/distributedlog-protocol/pom.xml
+++ b/distributedlog-protocol/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.5.0-incubating-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
</parent>
<artifactId>distributedlog-protocol</artifactId>
<name>Apache DistributedLog :: Protocol</name>
diff --git a/distributedlog-proxy-client/pom.xml
b/distributedlog-proxy-client/pom.xml
index 25ad732..3ae7357 100644
--- a/distributedlog-proxy-client/pom.xml
+++ b/distributedlog-proxy-client/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.5.0-incubating-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
</parent>
<artifactId>distributedlog-proxy-client</artifactId>
<name>Apache DistributedLog :: Proxy Client</name>
diff --git a/distributedlog-proxy-protocol/pom.xml
b/distributedlog-proxy-protocol/pom.xml
index 0f6a85f..468ee09 100644
--- a/distributedlog-proxy-protocol/pom.xml
+++ b/distributedlog-proxy-protocol/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.5.0-incubating-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
</parent>
<artifactId>distributedlog-proxy-protocol</artifactId>
<name>Apache DistributedLog :: Proxy Protocol</name>
diff --git a/distributedlog-proxy-server/pom.xml
b/distributedlog-proxy-server/pom.xml
index 83b2bef..0e294f3 100644
--- a/distributedlog-proxy-server/pom.xml
+++ b/distributedlog-proxy-server/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.5.0-incubating-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
</parent>
<artifactId>distributedlog-proxy-server</artifactId>
<name>Apache DistributedLog :: Proxy Service</name>
diff --git a/distributedlog-tutorials/distributedlog-basic/pom.xml
b/distributedlog-tutorials/distributedlog-basic/pom.xml
index fde8e56..d126d9e 100644
--- a/distributedlog-tutorials/distributedlog-basic/pom.xml
+++ b/distributedlog-tutorials/distributedlog-basic/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>distributedlog</artifactId>
<groupId>org.apache.distributedlog</groupId>
- <version>0.5.0-incubating-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.apache.distributedlog</groupId>
diff --git a/distributedlog-tutorials/distributedlog-kafka/pom.xml
b/distributedlog-tutorials/distributedlog-kafka/pom.xml
index 00ed7d3..bb23594 100644
--- a/distributedlog-tutorials/distributedlog-kafka/pom.xml
+++ b/distributedlog-tutorials/distributedlog-kafka/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>distributedlog</artifactId>
<groupId>org.apache.distributedlog</groupId>
- <version>0.5.0-incubating-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.apache.distributedlog</groupId>
diff --git a/distributedlog-tutorials/distributedlog-mapreduce/pom.xml
b/distributedlog-tutorials/distributedlog-mapreduce/pom.xml
index 7a6b67a..e7693df 100644
--- a/distributedlog-tutorials/distributedlog-mapreduce/pom.xml
+++ b/distributedlog-tutorials/distributedlog-mapreduce/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>distributedlog</artifactId>
<groupId>org.apache.distributedlog</groupId>
- <version>0.5.0-incubating-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.apache.distributedlog</groupId>
diff --git a/distributedlog-tutorials/distributedlog-messaging/pom.xml
b/distributedlog-tutorials/distributedlog-messaging/pom.xml
index 97af77b..d10e1b5 100644
--- a/distributedlog-tutorials/distributedlog-messaging/pom.xml
+++ b/distributedlog-tutorials/distributedlog-messaging/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>distributedlog</artifactId>
<groupId>org.apache.distributedlog</groupId>
- <version>0.5.0-incubating-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.apache.distributedlog</groupId>
diff --git a/distributedlog-tutorials/pom.xml b/distributedlog-tutorials/pom.xml
index 56957b1..1346656 100644
--- a/distributedlog-tutorials/pom.xml
+++ b/distributedlog-tutorials/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.5.0-incubating-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>distributedlog-tutorials</artifactId>
diff --git a/docs/README.md b/docs/README.md
index 88d8855..c225b07 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -2,7 +2,7 @@ This README gives an overview of how to build and contribute to
the documentatio
The documentation is included with the source of Apache DistributedLog in
order to ensure that you always
have docs corresponding to your checked out version. The online documentation
at
-http://distributedlog.incubator.apache.org/docs/latest is also generated from
the files found at master branch.
+http://bookkeeper.apache.org/distributedlog/docs/latest is also generated from
the files found at master branch.
# Requirements
diff --git a/docs/_config.yml b/docs/_config.yml
index c293c4d..0d8a8e3 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -6,22 +6,22 @@
# 'jekyll serve'. If you change this file, please restart the server process.
# Site settings
-title: Apache DistributedLog (incubating)
+title: Apache DistributedLog
description: > # this means to ignore newlines until "baseurl:"
Apache DistributedLog is an high performance replicated log.
# the subpath of your site, e.g. /blog
baseurl: ""
-distributedlog_version: "0.5.0-incubating-SNAPSHOT"
-distributedlog_version_short: "0.5.0-incubating"
+distributedlog_version: "0.5.0-SNAPSHOT"
+distributedlog_version_short: "0.5.0"
# the base hostname & protocol for your site
-url: "http://distributedlog.incubator.apache.org";
+url: "http://bookkeeper.apache.org/distributedlog";
twitter_username: distributedlog
twitter_url: https://twitter.com/distributedlog
-github_url: https://github.com/apache/incubator-distributedlog
+github_url: https://github.com/apache/distributedlog
wiki_url:
https://cwiki.apache.org/confluence/display/DL/Apache+DistributedLog+Home
jira_url: https://issues.apache.org/jira/browse/DL
diff --git a/docs/basics/introduction.rst b/docs/basics/introduction.rst
index 9e6be83..7debe9c 100644
--- a/docs/basics/introduction.rst
+++ b/docs/basics/introduction.rst
@@ -134,5 +134,5 @@ At a high level, DistributedLog gives the following
guarantees:
* All records are persisted on disk before acknowledgments, to gurantee
durability.
* For a log with replication factor of N, DistributedLog tolerates up to N-1
server failures without losing any records.
-More details on these guarantees are given in the [design
section](http://distributedlog.incubator.apache.org/docs/latest/user_guide/design/main.html).
+More details on these guarantees are given in the [design
section](http://bookkeeper.apache.org/distributedlog/docs/latest/user_guide/design/main.html).
diff --git a/docs/tutorials/analytics-mapreduce.rst
b/docs/tutorials/analytics-mapreduce.rst
index 6a18d4a..ae4974e 100644
--- a/docs/tutorials/analytics-mapreduce.rst
+++ b/docs/tutorials/analytics-mapreduce.rst
@@ -211,4 +211,4 @@ We could calculate the progress by comparing the position
with the record count
Once we have *LogSegmentSplit* and the *LogSegmentReader* over a split. We
could hook them up to
implement distributedlog's InputFormat. Please check out the code_ for more
details.
-.. _code:
https://github.com/apache/incubator-distributedlog/tree/master/distributedlog-tutorials/distributedlog-mapreduce
+.. _code:
https://github.com/apache/distributedlog/tree/master/distributedlog-tutorials/distributedlog-mapreduce
diff --git a/docs/tutorials/messaging-3.rst b/docs/tutorials/messaging-3.rst
index 7629c4d..723fc1d 100644
--- a/docs/tutorials/messaging-3.rst
+++ b/docs/tutorials/messaging-3.rst
@@ -108,4 +108,4 @@ Periodically update the last read position to the offset
store.
Check
`distributedlog-tutorials/distributedlog-messaging/src/main/java/org/apache/distributedlog/messaging/ReaderWithOffsets`_
for more details.
-..
_distributedlog-tutorials/distributedlog-messaging/src/main/java/org/apache/distributedlog/messaging/ReaderWithOffsets:
https://github.com/apache/incubator-distributedlog/blob/master/distributedlog-tutorials/distributedlog-messaging/src/main/java/org/apache/distributedlog/messaging/ReaderWithOffsets.java
+..
_distributedlog-tutorials/distributedlog-messaging/src/main/java/org/apache/distributedlog/messaging/ReaderWithOffsets:
https://github.com/apache/distributedlog/blob/master/distributedlog-tutorials/distributedlog-messaging/src/main/java/org/apache/distributedlog/messaging/ReaderWithOffsets.java
diff --git a/docs/tutorials/messaging-4.rst b/docs/tutorials/messaging-4.rst
index 82d7816..e44b932 100644
--- a/docs/tutorials/messaging-4.rst
+++ b/docs/tutorials/messaging-4.rst
@@ -21,4 +21,4 @@ reader position and the effects of the corresponding log
records.
This tutorial_ shows how to do `exact-once` processing.
-.. _tutorial:
https://github.com/apache/incubator-distributedlog/blob/master/distributedlog-tutorials/distributedlog-messaging/src/main/java/org/apache/distributedlog/messaging/StreamTransformer.java
+.. _tutorial:
https://github.com/apache/distributedlog/blob/master/distributedlog-tutorials/distributedlog-messaging/src/main/java/org/apache/distributedlog/messaging/StreamTransformer.java
diff --git a/docs/tutorials/messaging-5.rst b/docs/tutorials/messaging-5.rst
index 5d88509..1fc6ee4 100644
--- a/docs/tutorials/messaging-5.rst
+++ b/docs/tutorials/messaging-5.rst
@@ -14,6 +14,6 @@ How to implement a kafka-like partitioned pub/sub system
using DistributedLog
`./distributedlog-tutorials/distributedlog-kafka`_ shows how to implement a
kafka-like publisher using multiple streams.
Check `KafkaDistributedLogProducer`_ for more details.
-.. _./distributedlog-tutorials/distributedlog-kafka:
https://github.com/apache/incubator-distributedlog/tree/master/distributedlog-tutorials/distributedlog-kafka
-.. _KafkaDistributedLogProducer:
https://github.com/apache/incubator-distributedlog/blob/master/distributedlog-tutorials/distributedlog-kafka/src/main/java/org/apache/distributedlog/kafka/KafkaDistributedLogProducer.java
+.. _./distributedlog-tutorials/distributedlog-kafka:
https://github.com/apache/distributedlog/tree/master/distributedlog-tutorials/distributedlog-kafka
+.. _KafkaDistributedLogProducer:
https://github.com/apache/distributedlog/blob/master/distributedlog-tutorials/distributedlog-kafka/src/main/java/org/apache/distributedlog/kafka/KafkaDistributedLogProducer.java
diff --git a/pom.xml b/pom.xml
index 0eacc72..9191bd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,12 +25,12 @@
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
<packaging>pom</packaging>
- <version>0.5.0-incubating-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
<name>Apache DistributedLog :: Parent</name>
<description>
Apache DistributedLog provides a high performance replicated log service.
</description>
- <url>http://distributedlog.incubator.apache.org</url>
+ <url>http://bookkeeper.apache.org/distributedlog</url>
<inceptionYear>2016</inceptionYear>
<licenses>
<license>
@@ -40,10 +40,10 @@
</license>
</licenses>
<scm>
-
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-distributedlog.git</connection>
-
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-distributedlog.git</developerConnection>
-
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-distributedlog.git;a=summary</url>
- <tag>release-0.5.0-incubating</tag>
+
<connection>scm:git:https://gitbox.apache.org/repos/asf/distributedlog.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/distributedlog.git</developerConnection>
+
<url>https://gitbox.apache.org/repos/asf?p=distributedlog.git;a=summary</url>
+ <tag>release-0.5.0</tag>
</scm>
<issueManagement>
<system>jira</system>
@@ -76,7 +76,7 @@
<developer>
<name>The Apache DistributedLog Team</name>
<email>distributedlog-...@bookkeeper.apache.org</email>
- <url>http://distributedlog.incubator.apache.org</url>
+ <url>http://bookkeeper.apache.org/distributedlog</url>
<organization>Apache Software Foundation</organization>
<organizationUrl>http://www.apache.org</organizationUrl>
</developer>
@@ -235,7 +235,6 @@
<exclude>CONFIG.ini</exclude>
<exclude>**/**.md</exclude>
<exclude>scripts/dev/reviewers</exclude>
- <exclude>src/main/resources/DISCLAIMER.bin.txt</exclude>
<exclude>**/dependency-reduced-pom.xml</exclude>
<exclude>**/org/apache/distributedlog/thrift/*</exclude>
</excludes>
diff --git a/scripts/dev/build-website.sh b/scripts/dev/build-website.sh
index b8490d7..3c2529a 100755
--- a/scripts/dev/build-website.sh
+++ b/scripts/dev/build-website.sh
@@ -22,7 +22,7 @@ DLOG_ENV=$1
set -e
-PROJECT_NAME="incubator-distributedlog"
+PROJECT_NAME="distributedlog"
CAPITALIZED_PROJECT_NAME="DL"
BASEDIR=$(dirname "$0")
@@ -30,7 +30,7 @@ DLOG_ROOT="${BASEDIR}/../.."
DLOG_ROOT=`cd $DLOG_ROOT > /dev/null;pwd`
# Location of the local git repository
REPO_HOME=${DL_HOME:-"$DLOG_ROOT"}
-SITE_REMOTE="https://git-wip-us.apache.org/repos/asf/${PROJECT_NAME}.git";
+SITE_REMOTE="https://gitbox.apache.org/repos/asf/${PROJECT_NAME}.git";
BUILT_DIR=${DLOG_ROOT}/build/website
# remove the built content first
diff --git a/scripts/dev/dl-merge-pr.py b/scripts/dev/dl-merge-pr.py
index a669fd4..6b8755b 100755
--- a/scripts/dev/dl-merge-pr.py
+++ b/scripts/dev/dl-merge-pr.py
@@ -42,7 +42,7 @@ try:
except ImportError:
JIRA_IMPORTED = False
-PROJECT_NAME = 'incubator-distributedlog'
+PROJECT_NAME = 'distributedlog'
CAPITALIZED_PROJECT_NAME = 'DL'
@@ -77,7 +77,7 @@ GITHUB_API_BASE = '{0}/repos/{1}/{2}'.format(GITHUB_API_URL,
GITHUB_USER, PROJEC
JIRA_BASE = 'https://issues.apache.org/jira/browse'
JIRA_API_BASE = 'https://issues.apache.org/jira'
-PUSH_PR_REMOTE =
'https://git-wip-us.apache.org/repos/asf/{0}.git'.format(PROJECT_NAME)
+PUSH_PR_REMOTE =
'https://gitbox.apache.org/repos/asf/{0}.git'.format(PROJECT_NAME)
# Prefix added to temporary branches
TEMP_BRANCH_PREFIX = 'PR_TOOL'
diff --git a/src/assemble/bin.xml b/src/assemble/bin.xml
index d2f6166..ba8077d 100644
--- a/src/assemble/bin.xml
+++ b/src/assemble/bin.xml
@@ -62,12 +62,6 @@
<destName>NOTICE</destName>
<fileMode>644</fileMode>
</file>
- <file>
- <source>../DISCLAIMER</source>
- <outputDirectory>/</outputDirectory>
- <destName>DISCLAIMER</destName>
- <fileMode>644</fileMode>
- </file>
</files>
<dependencySets>
<dependencySet>
diff --git a/src/assemble/src.xml b/src/assemble/src.xml
index d56d45c..7031e06 100644
--- a/src/assemble/src.xml
+++ b/src/assemble/src.xml
@@ -29,7 +29,6 @@
<includes>
<include>**/README.md</include>
<include>**/LICENSE</include>
- <include>**/DISCLAIMER</include>
<include>**/NOTICE</include>
<include>**/pom.xml</include>
<include>**/src/**</include>
diff --git a/website/README.md b/website/README.md
index 2efe425..6e2534e 100644
--- a/website/README.md
+++ b/website/README.md
@@ -1,7 +1,6 @@
-# Apache DistributedLog (incubating) website
+# Apache DistributedLog website
-This is the website for [Apache
DistributedLog](http://distributedlog.incubator.apache.org)
-(incubating).
+This is the website for [Apache
DistributedLog](http://bookkeeper.apache.org/distributedlog).
### About this site
The DistributedLog website is built using [Jekyll](http://jekyllrb.com/).
Additionally,
@@ -10,7 +9,7 @@ for additional formatting capabilities, this website uses
This website is hosted at:
- http://distributedlog.incubator.apache.org
+ http://bookkeeper.apache.org/distributedlog
It is important to note there are two sets of "website code" with respect to
the Apache DistributedLog website.
diff --git a/website/_config.yml b/website/_config.yml
index c5219d4..f9d4734 100644
--- a/website/_config.yml
+++ b/website/_config.yml
@@ -6,24 +6,24 @@
# 'jekyll serve'. If you change this file, please restart the server process.
# Site settings
-title: Apache DistributedLog (incubating)
+title: Apache DistributedLog
description: > # this means to ignore newlines until "baseurl:"
Apache DistributedLog is an high performance replicated log.
# versions
DL_VERSION_STABLE: 0.3.51-RC1
-DL_VERSION_LATEST: 0.5.0-incubating-SNAPSHOT
+DL_VERSION_LATEST: 0.5.0-SNAPSHOT
stable_doc_version: 0.4.0-incubating
# the subpath of your site, e.g. /blog
baseurl: ""
# the base hostname & protocol for your site
-url: "http://distributedlog.incubator.apache.org";
+url: "http://bookkeeper.apache.org/distributedlog";
twitter_username: distributedlog
twitter_url: https://twitter.com/distributedlog
-github_url: https://github.com/apache/incubator-distributedlog
+github_url: https://github.com/apache/distributedlog
getslack_url: https://getdl-slack.herokuapp.com
slack_url: https://apachedistributedlog.slack.com
wiki_url:
https://cwiki.apache.org/confluence/display/DL/Apache+DistributedLog+Home
diff --git a/website/_posts/2016-09-19-kafka-vs-distributedlog.md
b/website/_posts/2016-09-19-kafka-vs-distributedlog.md
index ea1ac8d..c8f8cec 100644
--- a/website/_posts/2016-09-19-kafka-vs-distributedlog.md
+++ b/website/_posts/2016-09-19-kafka-vs-distributedlog.md
@@ -179,7 +179,7 @@ Expanding a DistributedLog cluster works in a very
different way. DistributedLog
As shown in Figure 1, Kafka producers write batches of records to the leader
broker of a Kafka partition. The follower brokers in the [ISR (in-sync-replica)
set](https://cwiki.apache.org/confluence/display/KAFKA/Kafka+Replication)
[^kafkareplication] will replicate the records from the leader broker. A record
is considered as committed only when the leader receives acknowledgments from
all the replicas in the ISR. The producer can be configured to wait for the
response from leader broker [...]
-There are two ways in DistributedLog to write log records to a DistributedLog
stream, one is using a thin thrift client to write records through the write
proxies (aka multiple-writer semantic), while the other one is using the
DistributedLog core library to talk directly to the storage nodes (aka
single-writer semantics). The first approach is common for building messaging
systems while the second approach is common for building replicated state
machines. You can check the [Best Practic [...]
+There are two ways in DistributedLog to write log records to a DistributedLog
stream, one is using a thin thrift client to write records through the write
proxies (aka multiple-writer semantic), while the other one is using the
DistributedLog core library to talk directly to the storage nodes (aka
single-writer semantics). The first approach is common for building messaging
systems while the second approach is common for building replicated state
machines. You can check the [Best Practic [...]
The owner of a log stream writes a batch of records as BookKeeper entries in
parallel to the bookies and waits for responses from a quorum of bookies. The
size of a quorum is known as the `ack_quorum_size` of a BookKeeper ledger and
it can be configured per DistributedLog stream. It provides similar flexibility
on durability as Kafka producers. We will discuss more about the differences on
replication algorithms later in 'Replication' section.
diff --git a/website/_posts/2017-04-25-the-first-release.md
b/website/_posts/2017-04-25-the-first-release.md
index d4b78e8..eee65a7 100644
--- a/website/_posts/2017-04-25-the-first-release.md
+++ b/website/_posts/2017-04-25-the-first-release.md
@@ -19,7 +19,7 @@ This initial release includes:
- distributedlog-tutorials: A set of tutorials on how to use Apache
DistributedLog in different use cases, e.g pub/sub messaging, replicated state
machine and analytics.
The release is available in the [Maven Central
Repository](https://search.maven.org/#search%7Cga%7C1%7Corg.apache.distributedlog),
-or can be downloaded from the project’s
[website](https://distributedlog.incubator.apache.org/docs/latest/start/download).
+or can be downloaded from the project’s
[website](https://bookkeeper.apache.org/distributedlog/docs/latest/start/download).
As a community, we take every release seriously and try to ensure production
readiness.
The first release is not just about following the Apache release process, i.e.
creating a release and getting signoff from the Apache Software
@@ -38,7 +38,7 @@ Usability, security, and integration will be our focus for
the next several mont
is anticipated, perhaps one every 2~3 months.
If you have any comments or discover any issues, I’d like to invite you to
reach out to us
-via [user’s mailing
list](https://distributedlog.incubator.apache.org/community/#mailing-lists),
[slack channel](https://getdl-slack.herokuapp.com/) or
+via [user’s mailing
list](https://bookkeeper.apache.org/distributedlog/community/#mailing-lists),
[slack channel](https://getdl-slack.herokuapp.com/) or
the [Apache Jira issues](https://issues.apache.org/jira/browse/DL).
diff --git a/website/build.sh b/website/build.sh
index 379dce4..1eb64ba 100755
--- a/website/build.sh
+++ b/website/build.sh
@@ -89,7 +89,7 @@ function build_docs() {
cp -r ${DLOG_HOME}/target/site/apidocs/* ${DOC_DEST_HOME}/api/java
else
rm -r /tmp/distributedlog-${version}
- git clone
https://git-wip-us.apache.org/repos/asf/incubator-distributedlog.git
/tmp/distributedlog-${version}
+ git clone https://gitbox.apache.org/repos/asf/distributedlog.git
/tmp/distributedlog-${version}
cd /tmp/distributedlog-${version}
git checkout $tag
# create the api directory
diff --git a/website/community/community.md b/website/community/community.md
index 567f6b5..e6351c9 100644
--- a/website/community/community.md
+++ b/website/community/community.md
@@ -79,8 +79,7 @@ All issue activity is also mirrored to the dev mailing list.
### Main source repositories
-- **ASF writable**:
[https://git-wip-us.apache.org/repos/asf/incubator-distributedlog.git](https://git-wip-us.apache.org/repos/asf/incubator-distributedlog.git)
-- **ASF read-only**:
git://git.apache.org/repos/asf/incubator-distributedlog.git
-- **GitHub mirror**:
[https://github.com/apache/incubator-distributedlog.git](https://github.com/apache/incubator-distributedlog.git)
+- **ASF gitbox**:
[https://gitbox.apache.org/repos/asf/distributedlog.git](https://gitbox.apache.org/repos/asf/distributedlog.git)
+- **GitHub mirror**:
[https://github.com/apache/distributedlog.git](https://github.com/apache/distributedlog.git)
Note: We prefer to run distributedlog using Java 8.
diff --git a/website/community/release_guide.md
b/website/community/release_guide.md
index a0cd2f3..7c105fa 100644
--- a/website/community/release_guide.md
+++ b/website/community/release_guide.md
@@ -77,7 +77,7 @@ This will list your GPG keys. One of these should reflect
your Apache account, f
Here, the key ID is the 8-digit hex string in the `pub` line: `845E6689`.
-Now, add your Apache GPG key to the DistributedLog’s `KEYS` file both in
[`dev`](https://dist.apache.org/repos/dist/dev/bookkeeper/distributedlog/KEYS)
and
[`release`](https://dist.apache.org/repos/dist/release/incubator/distributedlog/KEYS)
repositories at `dist.apache.org`. Follow the instructions listed at the top
of these files.
+Now, add your Apache GPG key to the DistributedLog’s `KEYS` file both in
[`dev`](https://dist.apache.org/repos/dist/dev/bookkeeper/distributedlog/KEYS)
and
[`release`](https://dist.apache.org/repos/dist/release/bookkeeper/distributedlog/KEYS)
repositories at `dist.apache.org`. Follow the instructions listed at the top
of these files.
Configure `git` to use this key when signing code by giving it your key ID, as
follows:
@@ -164,7 +164,7 @@ Check out the version of the codebase from which you start
the release. For a ne
Set up a few environment variables to simplify Maven commands that follow. (We
use `bash` Unix syntax in this guide.)
VERSION="0.4.0-incubating"
- NEXT_VERSION="0.5.0-incubating"
+ NEXT_VERSION="0.5.0"
BRANCH_NAME="release-${VERSION}"
DEVELOPMENT_VERSION="${NEXT_VERSION}-SNAPSHOT"
@@ -280,7 +280,7 @@ Use Maven Javadoc plugin to generate the new Java reference
manual, as follows:
-Dwindowtitle="Apache DistributedLog Library for Java, version
${VERSION}" \
-Dmaven.javadoc.failOnError=false
-By default, the Javadoc will be generated in `target/site/apidocs/`. Let
`${JAVADOC_ROOT}` be the absolute path to `apidocs`. ([Pull request
#1015](https://github.com/apache/incubator-distributedlog/pull/1015) will
hopefully simplify this process.)
+By default, the Javadoc will be generated in `target/site/apidocs/`. Let
`${JAVADOC_ROOT}` be the absolute path to `apidocs`. ([Pull request
#1015](https://github.com/apache/distributedlog/pull/1015) will hopefully
simplify this process.)
Please carefully review the generated Javadoc. Check for completeness and
presence of all relevant packages and `package-info.java`; consider adding less
relevant packages to the `excludePackageNames` configuration. The index page is
generated at `${JAVADOC_ROOT}/index.html`.
@@ -298,7 +298,7 @@ Copy the generated javadoc files to the asf site, as
follows:
The final step of building the candidate is to propose a website pull request.
-Follow the [example pull
request](https://github.com/apache/incubator-distributedlog/pull/109) to make
the modifications.
+Follow the [example pull
request](https://github.com/apache/distributedlog/pull/109) to make the
modifications.
Finally, propose a pull request with these changes. (Don’t merge before
finalizing the release.)
@@ -364,64 +364,10 @@ If there are no issues, reply on the vote thread to close
the voting. Then, tall
Thanks everyone!
-While in incubation, the Apache Incubator PMC must also vote on each release,
using the same process as above. Start the review and vote thread on the
`gene...@incubator.apache.org` list.
-
- From: Release Manager
- To: gene...@incubator.apache.org
- Cc: distributedlog-...@bookkeeper.apache.org
- Subject: [VOTE] Apache DistributedLog release 0.4.0-incubating
-
- Hi everyone,
- Please review and vote on the release candidate #0 for the Apache
DistributedLog version 0.4.0-incubating, as follows:
- [ ] +1, Approve the release
- [ ] -1, Do not approve the release (please provide specific comments)
-
-
- The complete staging area is available for your review, which includes:
- * JIRA release notes [1],
- * the official Apache source release to be deployed to dist.apache.org [2],
- * all artifacts to be deployed to the Maven Central Repository [3],
- * source code tag "v0.4.0-RC0" [4],
- * website pull request listing the release and publishing the API
reference manual [5].
-
- The Apache DistributedLog community has unanimously approved this release
[6].
-
- As customary, the vote will be open for at least 72 hours. It is adopted by
- a majority approval with at least three PMC affirmative votes. If approved,
- we will proceed with the release.
-
- Thanks!
-
- [1] link
- [2] link
- [3] link
- [4] link
- [5] link
- [6] lists.apache.org permalink to the vote result thread, e.g., link
-
-If passed, close the voting and summarize the results.
-
- From: Release Manager
- To: gene...@incubator.apache.org
- Cc: distributedlog-...@bookkeeper.apache.org
- Subject: [RESULT] [VOTE] Apache DistributedLog release 0.4.0-incubating
-
- There are XXX approving votes, all of which are binding:
- * approver 1
- * approver 2
- * approver 3
- * approver 4
-
- There are no disapproving votes.
-
- We'll proceed with this release as staged.
-
- Thanks everyone!
### Checklist to proceed to the finalization step
1. Community votes to release the proposed candidate
-1. While in incubation, Apache Incubator PMC votes to release the proposed
candidate
**********
@@ -468,7 +414,7 @@ In JIRA, inside [version
management](https://issues.apache.org/jira/plugins/serv
### Checklist to proceed to the next step
* Maven artifacts released and indexed in the [Maven Central
Repository](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.distributedlog%22)
-* Source distribution available in the release repository of
[dist.apache.org](https://dist.apache.org/repos/dist/release/incubator/distributedlog/)
+* Source distribution available in the release repository of
[dist.apache.org](https://dist.apache.org/repos/dist/release/bookkeeper/distributedlog/)
* Website pull request to [list the release]({{ site.baseurl }}/use/releases/)
and publish the [API reference manual]({{ site.baseurl }}/learn/sdks/javadoc/)
merged
* Release tagged in the source code repository
* Release version finalized in JIRA
@@ -485,11 +431,9 @@ Announce on the dev@ mailing list that the release has
been finished.
Announce on the release on the user@ mailing list, listing major improvements
and contributions.
-While in incubation, announce the release on the Incubator’s general@ mailing
list.
-
### ASF press release
-After incubation, use reporter.apache.org to promote the release.
+Use reporter.apache.org to promote the release.
### DistributedLog blog
@@ -502,9 +446,8 @@ Tweet, post on Facebook, LinkedIn, and other platforms. Ask
other contributors t
### Checklist to declare the process completed
1. Release announced on the user@ mailing list.
-1. While in incubation, release announced on the Incubator’s general@ mailing
list.
1. Blog post published, if applicable.
-1. After incubation, Apache Software Foundation press release published.
+1. Apache Software Foundation press release published.
1. Release announced on social media.
1. Completion declared on the dev@ mailing list.
diff --git a/website/docs/0.4.0-incubating/README.md
b/website/docs/0.4.0-incubating/README.md
index 7209147..3213ce7 100644
--- a/website/docs/0.4.0-incubating/README.md
+++ b/website/docs/0.4.0-incubating/README.md
@@ -2,7 +2,7 @@ This README gives an overview of how to build and contribute to
the documentatio
The documentation is included with the source of Apache DistributedLog in
order to ensure that you always
have docs corresponding to your checked out version. The online documentation
at
-http://distributedlog.incubator.apache.org/docs/0.4.0-incubating is also
generated from the files found at master branch.
+http://bookkeeper.apache.org/distributedlog/docs/0.4.0-incubating is also
generated from the files found at master branch.
# Requirements
diff --git a/website/docs/0.4.0-incubating/_config.yml
b/website/docs/0.4.0-incubating/_config.yml
index 6864f22..5a2eb62 100644
--- a/website/docs/0.4.0-incubating/_config.yml
+++ b/website/docs/0.4.0-incubating/_config.yml
@@ -17,11 +17,11 @@ distributedlog_version: "0.4.0-incubating"
distributedlog_version_short: "0.4.0"
# the base hostname & protocol for your site
-url: "http://distributedlog.incubator.apache.org";
+url: "http://bookkeeper.apache.org/distributedlog";
twitter_username: distributedlog
twitter_url: https://twitter.com/distributedlog
-github_url: https://github.com/apache/incubator-distributedlog
+github_url: https://github.com/apache/distributedlog
wiki_url:
https://cwiki.apache.org/confluence/display/DL/Apache+DistributedLog+Home
jira_url: https://issues.apache.org/jira/browse/DL
diff --git a/website/docs/0.4.0-incubating/basics/introduction.rst
b/website/docs/0.4.0-incubating/basics/introduction.rst
index 13ee120..4e1c9cd 100644
--- a/website/docs/0.4.0-incubating/basics/introduction.rst
+++ b/website/docs/0.4.0-incubating/basics/introduction.rst
@@ -134,5 +134,5 @@ At a high level, DistributedLog gives the following
guarantees:
* All records are persisted on disk before acknowledgments, to gurantee
durability.
* For a log with replication factor of N, DistributedLog tolerates up to N-1
server failures without losing any records.
-More details on these guarantees are given in the [design
section](http://distributedlog.incubator.apache.org/docs/0.4.0-incubating/user_guide/design/main.html).
+More details on these guarantees are given in the [design
section](http://bookkeeper.apache.org/distributedlog/docs/0.4.0-incubating/user_guide/design/main.html).
diff --git a/website/docs/0.4.0-incubating/tutorials/analytics-mapreduce.rst
b/website/docs/0.4.0-incubating/tutorials/analytics-mapreduce.rst
index 6a18d4a..ae4974e 100644
--- a/website/docs/0.4.0-incubating/tutorials/analytics-mapreduce.rst
+++ b/website/docs/0.4.0-incubating/tutorials/analytics-mapreduce.rst
@@ -211,4 +211,4 @@ We could calculate the progress by comparing the position
with the record count
Once we have *LogSegmentSplit* and the *LogSegmentReader* over a split. We
could hook them up to
implement distributedlog's InputFormat. Please check out the code_ for more
details.
-.. _code:
https://github.com/apache/incubator-distributedlog/tree/master/distributedlog-tutorials/distributedlog-mapreduce
+.. _code:
https://github.com/apache/distributedlog/tree/master/distributedlog-tutorials/distributedlog-mapreduce
diff --git a/website/docs/0.4.0-incubating/tutorials/messaging-3.rst
b/website/docs/0.4.0-incubating/tutorials/messaging-3.rst
index 7629c4d..723fc1d 100644
--- a/website/docs/0.4.0-incubating/tutorials/messaging-3.rst
+++ b/website/docs/0.4.0-incubating/tutorials/messaging-3.rst
@@ -108,4 +108,4 @@ Periodically update the last read position to the offset
store.
Check
`distributedlog-tutorials/distributedlog-messaging/src/main/java/org/apache/distributedlog/messaging/ReaderWithOffsets`_
for more details.
-..
_distributedlog-tutorials/distributedlog-messaging/src/main/java/org/apache/distributedlog/messaging/ReaderWithOffsets:
https://github.com/apache/incubator-distributedlog/blob/master/distributedlog-tutorials/distributedlog-messaging/src/main/java/org/apache/distributedlog/messaging/ReaderWithOffsets.java
+..
_distributedlog-tutorials/distributedlog-messaging/src/main/java/org/apache/distributedlog/messaging/ReaderWithOffsets:
https://github.com/apache/distributedlog/blob/master/distributedlog-tutorials/distributedlog-messaging/src/main/java/org/apache/distributedlog/messaging/ReaderWithOffsets.java
diff --git a/website/docs/0.4.0-incubating/tutorials/messaging-4.rst
b/website/docs/0.4.0-incubating/tutorials/messaging-4.rst
index 82d7816..e44b932 100644
--- a/website/docs/0.4.0-incubating/tutorials/messaging-4.rst
+++ b/website/docs/0.4.0-incubating/tutorials/messaging-4.rst
@@ -21,4 +21,4 @@ reader position and the effects of the corresponding log
records.
This tutorial_ shows how to do `exact-once` processing.
-.. _tutorial:
https://github.com/apache/incubator-distributedlog/blob/master/distributedlog-tutorials/distributedlog-messaging/src/main/java/org/apache/distributedlog/messaging/StreamTransformer.java
+.. _tutorial:
https://github.com/apache/distributedlog/blob/master/distributedlog-tutorials/distributedlog-messaging/src/main/java/org/apache/distributedlog/messaging/StreamTransformer.java
diff --git a/website/docs/0.4.0-incubating/tutorials/messaging-5.rst
b/website/docs/0.4.0-incubating/tutorials/messaging-5.rst
index 5d88509..1fc6ee4 100644
--- a/website/docs/0.4.0-incubating/tutorials/messaging-5.rst
+++ b/website/docs/0.4.0-incubating/tutorials/messaging-5.rst
@@ -14,6 +14,6 @@ How to implement a kafka-like partitioned pub/sub system
using DistributedLog
`./distributedlog-tutorials/distributedlog-kafka`_ shows how to implement a
kafka-like publisher using multiple streams.
Check `KafkaDistributedLogProducer`_ for more details.
-.. _./distributedlog-tutorials/distributedlog-kafka:
https://github.com/apache/incubator-distributedlog/tree/master/distributedlog-tutorials/distributedlog-kafka
-.. _KafkaDistributedLogProducer:
https://github.com/apache/incubator-distributedlog/blob/master/distributedlog-tutorials/distributedlog-kafka/src/main/java/org/apache/distributedlog/kafka/KafkaDistributedLogProducer.java
+.. _./distributedlog-tutorials/distributedlog-kafka:
https://github.com/apache/distributedlog/tree/master/distributedlog-tutorials/distributedlog-kafka
+.. _KafkaDistributedLogProducer:
https://github.com/apache/distributedlog/blob/master/distributedlog-tutorials/distributedlog-kafka/src/main/java/org/apache/distributedlog/kafka/KafkaDistributedLogProducer.java
diff --git a/website/index.md b/website/index.md
index d2847b6..b808e87 100644
--- a/website/index.md
+++ b/website/index.md
@@ -121,9 +121,4 @@ and memory.
<hr>
-<p style="text-align:center"><img align="center"
src="https://incubator.apache.org/images/apache-incubator-logo.png"; alt="Apache
Incubator Logo"></p>
-
-Apache DistributedLog is an effort undergoing incubation at [The Apache
Software Foundation (ASF)](http://www.apache.org) sponsored by the Apache
Incubator PMC. Incubation is required of all newly accepted projects until a
further review indicates that the infrastructure, communications, and decision
making process have stabilized in a manner consistent with other successful ASF
projects. While incubation status is not necessarily a reflection of the
completeness or stability of the code [...]
-
-
-Apache DistributedLog (incubating) is available under [Apache License, version
2.0](http://www.apache.org/licenses/LICENSE-2.0).
+Apache DistributedLog is available under [Apache License, version
2.0](http://www.apache.org/licenses/LICENSE-2.0).
--
To stop receiving notification emails like this one, please contact
['"distributedlog-commits@bookkeeper.apache.org"
<distributedlog-commits@bookkeeper.apache.org>'].
![https://incubator.apache.org/images/apache-incubator-logo.png"](https://incubator.apache.org/images/apache-incubator-logo.png"){kind=link}