Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

Commit 8ae38bc

Browse files
author
David Yan
committed
APEXCORE-442 Removed incubating
1 parent 1b13619 commit 8ae38bc

13 files changed

+64
-67
lines changed

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Apache Apex Incubator Website
1+
Apache Apex Website
22
=============================
33

44
This is the source code for the Apache Apex website, hosted at [apex.apache.org](http://apex.apache.org/). The following tools are used to build the html pages:
@@ -59,7 +59,7 @@ Contributing
5959
------------
6060
If you would like to make a change to the site:
6161

62-
1. Fork the [github mirror](https://github.com/apache/incubator-apex-site)
62+
1. Fork the [github mirror](https://github.com/apache/apex-site)
6363
2. Create a new branch from `master`
6464
3. Add commit(s) to your branch
6565
4. Test your changes locally (see Development section below)
@@ -69,7 +69,7 @@ If you would like to make a change to the site:
6969
If you are a committer, do the following:
7070

7171
1. Update the master branch with your (or a Pull Request's) change.
72-
2. Push updated master to the asf remote master (https://git-wip-us.apache.org/repos/asf/incubator-apex-site.git)
72+
2. Push updated master to the asf remote master (https://git-wip-us.apache.org/repos/asf/apex-site.git)
7373
2. Run `build.sh` from the master branch directory (requires nodejs and npm). This will:
7474
- ensure the necessary npm and bower dependencies are installed
7575
- checks out and updates the `asf-site` branch with a new commit of the build from the current branch

bower.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
{
2-
"name": "apex-incubator-site",
2+
"name": "apex-site",
33
"version": "1.0.0",
44
"authors": [
55
"Andy Perlitch <[email protected]>"
66
],
7-
"description": "The public incubator website for the Apache Apex Project",
7+
"description": "The public website for the Apache Apex Project",
88
"keywords": [
99
"apache",
1010
"software",
1111
"foundation",
1212
"apex",
13-
"incubator",
1413
"website"
1514
],
1615
"license": "Apache-2.0",
17-
"homepage": "http://apex.incubator.apache.org/",
16+
"homepage": "http://apex.apache.org/",
1817
"ignore": [
1918
"**/.*",
2019
"node_modules",

gulpfile.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,8 @@ gulp.task('fetch-releases', function(taskCb) {
298298
// The release "targets", in this case meaning apex-core and apex-malhar
299299
var targets = [
300300
// NOTE: Once apex leaves incubation, this object should be changed to exclude "incubator"
301-
{ key: 'core.src', path: 'release/incubator/apex', repo: 'incubator-apex-core' },
302-
{ key: 'malhar.src', path: 'release/incubator/apex/malhar', repo: 'incubator-apex-malhar' }
301+
{ key: 'core.src', path: 'release/incubator/apex', repo: 'apex-core' },
302+
{ key: 'malhar.src', path: 'release/incubator/apex/malhar', repo: 'apex-malhar' }
303303
];
304304

305305
// For each target, get the releases

navigation.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@
44
{ "id": "community", "label": "Community", "href": "/community.html" },
55
{ "id": "docs", "label": "Docs", "href": "/docs.html" },
66
{ "id": "source", "label": "Source", "items": [
7-
{ "label": "Apex Core (ASF)", "href": "https://git-wip-us.apache.org/repos/asf?p=incubator-apex-core.git" },
8-
{ "label": "Apex Core (Github Mirror)", "href": "https://github.com/apache/incubator-apex-core" },
9-
{ "label": "Apex Malhar (ASF)", "href": "https://git-wip-us.apache.org/repos/asf?p=incubator-apex-malhar.git" },
10-
{ "label": "Apex Malhar (Github Mirror)", "href": "https://github.com/apache/incubator-apex-malhar" }
7+
{ "label": "Apex Core (ASF)", "href": "https://git-wip-us.apache.org/repos/asf?p=apex-core.git" },
8+
{ "label": "Apex Core (Github Mirror)", "href": "https://github.com/apache/apex-core" },
9+
{ "label": "Apex Malhar (ASF)", "href": "https://git-wip-us.apache.org/repos/asf?p=apex-malhar.git" },
10+
{ "label": "Apex Malhar (Github Mirror)", "href": "https://github.com/apache/apex-malhar" }
1111
] },
1212
{ "id": "apache", "label": "Apache", "items": [
13-
{ "label": "Status Page", "href": "http://incubator.apache.org/projects/apex.html" },
1413
{ "label": "Apache Foundation", "href": "http://www.apache.org/foundation/how-it-works.html" },
1514
{ "label": "Apache License", "href": "http://www.apache.org/licenses/" },
1615
{ "label": "Sponsorship", "href": "http://www.apache.org/foundation/sponsorship.html" },
1716
{ "label": "Thanks", "href": "http://www.apache.org/foundation/thanks.html" }
1817
]},
1918
{ "id": "download", "label": "Download", "href": "/downloads.html", "classes": "btn btn-success" }
20-
]
19+
]

package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
{
2-
"name": "apex-incubator-site",
2+
"name": "apex-site",
33
"version": "1.0.0",
4-
"description": "The public incubator website for the Apache Apex Project",
4+
"description": "The public website for the Apache Apex Project",
55
"main": "index.js",
66
"scripts": {
77
"test": "echo \"Error: no test specified\" && exit 1"
88
},
99
"repository": {
1010
"type": "git",
11-
"url": "https://git-wip-us.apache.org/repos/asf/incubator-apex-site.git"
11+
"url": "https://git-wip-us.apache.org/repos/asf/apex-site.git"
1212
},
1313
"keywords": [
1414
"apache",
1515
"software",
1616
"foundation",
1717
"apex",
18-
"incubator",
1918
"website"
2019
],
2120
"author": "Andy Perlitch <[email protected]>",

src/md/community.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ The following mailing lists are available for Apex.
2020

2121
The Apex Project is made up of two repositories:
2222

23-
- [Apex Core](https://github.com/apache/incubator-apex-core) - The core of the Apex platform.
24-
- [Apex Malhar](https://github.com/apache/incubator-apex-malhar) - Community-driven set of open-source "operators" and utilities for use in your Apex applications.
23+
- [Apex Core](https://github.com/apache/apex-core) - The core of the Apex platform.
24+
- [Apex Malhar](https://github.com/apache/apex-malhar) - Community-driven set of open-source "operators" and utilities for use in your Apex applications.
2525

2626
## Release Process
2727

src/md/contributing.md

+14-14
Original file line numberDiff line numberDiff line change
@@ -16,36 +16,36 @@ People that help with the project in any of the above categories or other ways a
1616

1717
## Becoming a committer
1818

19-
Community members that make sustained, welcome contributions to the project may be invited to become a committer. Committers are voted in by the PPMC. A committer has a signed Contributor License Agreement ([CLA](http://www.apache.org/licenses/icla.txt)) on file and an apache.org address.
19+
Community members that make sustained, welcome contributions to the project may be invited to become a committer. Committers are voted in by the PMC. A committer has a signed Contributor License Agreement ([CLA](http://www.apache.org/licenses/icla.txt)) on file and an apache.org address.
2020

2121
We expect committers to subscribe to the [project mailing lists](community.html#mailing-lists).
2222

23-
A committer will be considered “emeritus/inactive” by not contributing in any form to the project for over 1 year. An emeritus committer may request reinstatement of commit access from the PPMC. Such reinstatement is subject to lazy consensus of active PPMC members.
23+
A committer will be considered “emeritus/inactive” by not contributing in any form to the project for over 1 year. An emeritus committer may request reinstatement of commit access from the PMC. Such reinstatement is subject to lazy consensus of active PMC members.
2424

25-
The Podling Project Management Committee ([PPMC](http://incubator.apache.org/guides/ppmc.html)) is responsible for the oversight of the project and it also decides who to add as a PPMC member. Existing committers may be invited to become a PPMC member after consistent contribution and activity over a period of time and participation in directional and community building discussions.
25+
The Project Management Committee ([PMC](http://www.apache.org/dev/pmc.html)) is responsible for the oversight of the project and it also decides who to add as a PMC member. Existing committers may be invited to become a PMC member after consistent contribution and activity over a period of time and participation in directional and community building discussions.
2626

2727
## Code Style
2828
Apache Apex follows coding style that is closest to K & R style and uses [Checkstyle](http://checkstyle.sourceforge.net/) tool to enforce these standards. Travis CI will fail for any pull request that introduces any style violations.
2929

30-
The checkstyle configuration that Apache Apex projects use is present here : https://github.com/apache/incubator-apex-core/blob/master/apex_checks.xml
30+
The checkstyle configuration that Apache Apex projects use is present here : https://github.com/apache/apex-core/blob/master/apex_checks.xml
3131

3232
To make it easier for the users to set up their development environment, settings for the following common IDEs are provided in the Apache Apex Core repository with instructions.
33-
- [IntelliJ](https://github.com/apache/incubator-apex-core/tree/master/misc/ide-templates/intellij)
34-
- [Eclipse](https://github.com/apache/incubator-apex-core/tree/master/misc/ide-templates/eclipse)
35-
- [NetBeans](https://github.com/apache/incubator-apex-core/tree/master/misc/ide-templates/netbeans)
33+
- [IntelliJ](https://github.com/apache/apex-core/tree/master/misc/ide-templates/intellij)
34+
- [Eclipse](https://github.com/apache/apex-core/tree/master/misc/ide-templates/eclipse)
35+
- [NetBeans](https://github.com/apache/apex-core/tree/master/misc/ide-templates/netbeans)
3636

3737
## Opening Pull Requests (contributors)
3838

3939
The apex-core and apex-malhar repositories both have mirror repositories on github which are used to review pull requests and provide a second remote endpoint for the codebase.
4040

4141
1. Create a JIRA ([-core](https://issues.apache.org/jira/browse/APEXCORE/),[-malhar](https://issues.apache.org/jira/browse/APEXMALHAR/)) for the work you plan to do (or assign yourself to an existing JIRA ticket)
4242
1. Fork the ASF github mirror (one time step):
43-
https://github.com/apache/incubator-apex-core/
43+
https://github.com/apache/apex-core/
4444
1. Clone the **fork** on your local workspace (one time step):
45-
`git clone https://github.com/{github_username}/incubator-apex-core.git`
46-
1. Add [incubator apex core](https://github.com/apache/incubator-apex-core) as a remote repository (one time step):
47-
`git remote add upstream https://github.com/apache/incubator-apex-core`
48-
1. Create a new branch from the [master](https://github.com/apache/incubator-apex-core/tree/master) branch. **Name your branch with the JIRA number in it, e.g. `APEXCORE-123.my-feature`.**
45+
`git clone https://github.com/{github_username}/apex-core.git`
46+
1. Add [apex core](https://github.com/apache/apex-core) as a remote repository (one time step):
47+
`git remote add upstream https://github.com/apache/apex-core`
48+
1. Create a new branch from the [master](https://github.com/apache/apex-core/tree/master) branch. **Name your branch with the JIRA number in it, e.g. `APEXCORE-123.my-feature`.**
4949
`git checkout -b APEXCORE-123.my-feature -t upstream/master`
5050
Creating a local branch that tracks a remote makes pull easier (no need to specify the remote branch while pulling). A branch can be made to track a remote branch anytime, not necessarily at its creation by:
5151
`git branch -u upstream/master`
@@ -113,8 +113,8 @@ Thanks for contributing!
113113
- Travis CI pull request build needs to pass
114114
- Ensure tests are added/modified for new features or fixes
115115
- Ensure appropriate JavaDoc comments have been added
116-
1. To set up access to the ASF source repository, [follow these steps](https://git-wip-us.apache.org/#committers-getting-started). The ASF master repository is: `https://git-wip-us.apache.org/repos/asf/incubator-apex-core.git`
117-
1. Use the git command line to pull in the changes from the pull requests. You can refer to the corresponding email that will be automatically sent to the `dev@apex.incubator.apache.org` mailing list to see the exact commands to merge the given pull request.
116+
1. To set up access to the ASF source repository, [follow these steps](https://git-wip-us.apache.org/#committers-getting-started). The ASF master repository is: `https://git-wip-us.apache.org/repos/asf/apex-core.git`
117+
1. Use the git command line to pull in the changes from the pull requests. You can refer to the corresponding email that will be automatically sent to the `[email protected]` mailing list to see the exact commands to merge the given pull request.
118118
1. Once done with verification, push the changes to the ASF repository's `master` branch. Within a few
119119
seconds, the changes will propagate back to the github mirror and the pull requests be closed and marked merged automatically.
120120
1. The `Fix version` field on the corresponding JIRA ticket needs to be set and the ticket resolved after pushing the changes.

src/md/docs.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ word counting application with Apache Apex starting with setting up your develop
1414
- <a href="http://docs.datatorrent.com/tutorials/salesdimensions/" rel="nofollow">Sales Dimensions Application Tutorial</a> Similar to the Top N Words application but covers
1515
dimensional computations on a simulated sales data stream.
1616
- <a href="https://github.com/DataTorrent/examples" rel="nofollow">Example Applications</a> Sample code for specialized tutorials covering a variety of topics such as large key-value state management (HDHT), custom partitioning using stream codecs, etc.
17-
- [Malhar Demos](https://github.com/apache/incubator-apex-malhar/tree/master/demos) This is part of the source repository for Apache Apex Malhar and contains a number of more substantial sample applications that developers will find especially useful. They include an application that computes some statistics (such as moving averages) from a live stream of stock transactions from *Yahoo! Finance*; one that analyzes a synthetic stream of eruption event data for the *Old Faithful* geyser; a Twitter stream analyzer; and a simulated fraud detector.
17+
- [Malhar Demos](https://github.com/apache/apex-malhar/tree/master/demos) This is part of the source repository for Apache Apex Malhar and contains a number of more substantial sample applications that developers will find especially useful. They include an application that computes some statistics (such as moving averages) from a live stream of stock transactions from *Yahoo! Finance*; one that analyzes a synthetic stream of eruption event data for the *Old Faithful* geyser; a Twitter stream analyzer; and a simulated fraud detector.
1818

1919
### Presentations
2020

src/md/people.md

+13-13
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ The community is comprised of the PMC, Committers and Contributors. The PMC (pod
44

55
## Becoming a committer
66

7-
Community members that make sustained, welcome contributions to the project may be invited to become a committer. Committers are voted in by the PPMC. A committer has a signed Contributor License Agreement (CLA) on file and an apache.org address.
7+
Community members that make sustained, welcome contributions to the project may be invited to become a committer. Committers are voted in by the PMC. A committer has a signed Contributor License Agreement (CLA) on file and an apache.org address.
88

99
We expect committers to subscribe to the project mailing lists.
1010

11-
A committer will be considered “emeritus/inactive” by not contributing in any form to the project for over 1 year. An emeritus committer may request reinstatement of commit access from the PPMC. Such reinstatement is subject to lazy consensus of active PPMC members.
11+
A committer will be considered “emeritus/inactive” by not contributing in any form to the project for over 1 year. An emeritus committer may request reinstatement of commit access from the PMC. Such reinstatement is subject to lazy consensus of active PMC members.
1212

13-
The Podling Project Management Committee (PPMC) is responsible for the oversight of the project and it also decides who to add as a PPMC member. Existing committers may be invited to become a PPMC member after consistent contribution and activity over a period of time and participation in directional and community building discussions.
13+
The Project Management Committee (PMC) is responsible for the oversight of the project and it also decides who to add as a PMC member. Existing committers may be invited to become a PMC member after consistent contribution and activity over a period of time and participation in directional and community building discussions.
1414

1515
## Committers
1616

17-
Following is the list of all Apache Apex committers, PPMC members and mentors. A good place to see all contributors and other project stats is [Open Hub](https://www.openhub.net/p/apache_apex)
17+
Following is the list of all Apache Apex committers, PMC members and mentors. A good place to see all contributors and other project stats is [Open Hub](https://www.openhub.net/p/apache_apex)
1818

1919
| Name | Apache ID | Role |
2020
| --- | --- | --- |
@@ -28,36 +28,36 @@ Following is the list of all Apache Apex committers, PPMC members and mentors. A
2828
| Yogi Devendra | yogidevendra | Committer |
2929
| Ted Dunning | tdunning | Mentor |
3030
| Timothy Farkas | timothyfarkas | Committer |
31-
| Ilya Ganelin | ilganeli | PPMC |
31+
| Ilya Ganelin | ilganeli | PMC |
3232
| Alan Gates | gates | Mentor |
3333
| P. Taylor Goetz | ptgoetz | Mentor |
3434
| Tushar Gosavi | tushar | Committer |
3535
| Priyanka Gugale | priyag | Committer |
36-
| Gaurav Gupta | gauravgopi123 | PPMC |
36+
| Gaurav Gupta | gauravgopi123 | PMC |
3737
| Sandesh Hegde | sandesh | Committer |
3838
| Siyuan Hua | hsy541 | Committer |
39-
| Pramod Immaneni | pramod | PPMC |
40-
| Amol Kekre | akekre | PPMC |
39+
| Pramod Immaneni | pramod | PMC |
40+
| Amol Kekre | akekre | PMC |
4141
| Chinmay Kolhatkar | chinmay | Committer |
4242
| Anuj Lal | anujlal | Committer |
4343
| Dongming Liang | d9liang | Committer |
4444
| Justin Mclean | jmclean | Mentor |
4545
| Adi Mishra | apmishra | Committer |
46-
| Chetan Narsude | chetan | PPMC |
46+
| Chetan Narsude | chetan | PMC |
4747
| Chris Nauroth | cnauroth | Mentor |
4848
| Sasha Parfenov | sashap | Committer |
4949
| Andy Perlitch | andyp | Committer |
5050
| Shubham Pathak | shubham | Committer |
5151
| Ashwin Putta | ashwinchandrap | Committer |
5252
| Munagala Ramanath | ramapex | Committer |
53-
| Vlad Rozov | vrozov | PPMC |
53+
| Vlad Rozov | vrozov | PMC |
5454
| Hitesh Shah | hitesh | Mentor |
5555
| Atri Sharma | atri | Committer |
5656
| Chandni Singh | csingh | Committer |
5757
| Ashish Tadose | ashishtadose | Committer |
5858
| Aniruddha Thombare | aniruddha | Committer |
5959
| Jessica Wang | jessicawang | Committer |
60-
| Thomas Weise | thw | PPMC |
61-
| David Yan | davidyan | PPMC |
62-
| Brennon York | boyork | PPMC |
60+
| Thomas Weise | thw | PMC |
61+
| David Yan | davidyan | PMC |
62+
| Brennon York | boyork | PMC |
6363

0 commit comments

Comments
 (0)