Merge branch 'apexcore-553' of github.com:mx4web/apex-site
diff --git a/gulpfile.js b/gulpfile.js
index 8bf19e2..61f23d2 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -177,7 +177,7 @@
         });
 
         var apiRequest = {
-          jql: 'project = ' + project.name + ' AND labels in (roadmap) AND fixVersion in (EMPTY, unreleasedVersions())',
+          jql: 'project = ' + project.name + ' AND labels in (roadmap) AND resolution = Unresolved AND fixVersion in (EMPTY, unreleasedVersions())',
           startAt: 0,
           maxResults: 1000,
           fields: ['summary','priority','status','fixVersions','description']
@@ -447,4 +447,4 @@
 gulp.task('watch', function() {
   gulp.watch('./src/less/*.less', ['less']);
   gulp.watch(['./src/pages/*.html', './src/partials/*.handlebars', './src/md/*.md'], ['html']);
-});
\ No newline at end of file
+});
diff --git a/releases.json b/releases.json
index 906f15c..799d319 100644
--- a/releases.json
+++ b/releases.json
@@ -2,16 +2,16 @@
   "core": {
     "src": [
       {
+        "version": "3.5.0",
+        "docs": "3.5",
+        "repo": "apex-core",
+        "date": 1481089442000
+      },
+      {
         "version": "3.4.0",
         "docs": "3.4",
         "repo": "apex-core",
         "date": 1462902111000
-      },
-      {
-        "version": "3.2.1-incubating",
-        "docs": "3.2",
-        "repo": "apex-core",
-        "date": 1461193940000
       }
     ]
   },
diff --git a/roadmap.json b/roadmap.json
index 3a6bcb2..845bd37 100644
--- a/roadmap.json
+++ b/roadmap.json
@@ -5,37 +5,6 @@
     "jiras": [
       {
         "expand": "operations,editmeta,changelog,transitions,renderedFields",
-        "id": "12919288",
-        "self": "https://issues.apache.org/jira/rest/api/2/issue/12919288",
-        "key": "APEXCORE-119",
-        "fields": {
-          "summary": "Add Support For A New Type Of (Distributed) Operator",
-          "description": "This JIRA Proposes support for a new type of distributed operator. Currently when an operator is partitioned there is no platform supported mechanism through which partitions can talk to each other. A Distributed operator would have an easy to use platform supported mechanism through which operators in a partitioning can exchange information with each other. Eventually Distributed operators would support running plain old single threaded java code transparently across partitions.\r\n\r\nIn summary the goals would be to do the following:\r\n\r\n1 - provide a platform supported fault tolerant mechanism through which operators in a partitioning can talk to each other.\r\n2 - provide a platform supported way to run plain old single threaded java code accross all the partitions of a Distributed operator\r\n\r\nThe benefits of implementing this would be huge:\r\n\r\n1 - Using distributed operators we could support large in memory fault tolerant data structures (graphs, maps, arrays) in a fault tolerant way. Like Spark's RDD's but better.\r\n2 - Plain old java code could be used to access and manipulate the data structures, without the user having the learn complex API's like with Spark.\r\n\r\nAn implementation proposal and presentation are coming soon.",
-          "fixVersions": [],
-          "priority": {
-            "self": "https://issues.apache.org/jira/rest/api/2/priority/3",
-            "iconUrl": "https://issues.apache.org/jira/images/icons/priorities/major.png",
-            "name": "Major",
-            "id": "3"
-          },
-          "status": {
-            "self": "https://issues.apache.org/jira/rest/api/2/status/1",
-            "description": "The issue is open and ready for the assignee to start work on it.",
-            "iconUrl": "https://issues.apache.org/jira/images/icons/statuses/open.png",
-            "name": "Open",
-            "id": "1",
-            "statusCategory": {
-              "self": "https://issues.apache.org/jira/rest/api/2/statuscategory/2",
-              "id": 2,
-              "key": "new",
-              "colorName": "blue-gray",
-              "name": "New"
-            }
-          }
-        }
-      },
-      {
-        "expand": "operations,editmeta,changelog,transitions,renderedFields",
         "id": "12919332",
         "self": "https://issues.apache.org/jira/rest/api/2/issue/12919332",
         "key": "APEXCORE-163",
@@ -67,42 +36,11 @@
       },
       {
         "expand": "operations,editmeta,changelog,transitions,renderedFields",
-        "id": "12919371",
-        "self": "https://issues.apache.org/jira/rest/api/2/issue/12919371",
-        "key": "APEXCORE-202",
-        "fields": {
-          "summary": "Integration with Samoa",
-          "description": "Apache Samoa[https://samoa.incubator.apache.org/] is an abstraction of a collections of streaming machine learning Algorithm. By far, it has integration with Samza, Storm and flink, It is a good start point for Apex to support streaming ML.",
-          "fixVersions": [],
-          "priority": {
-            "self": "https://issues.apache.org/jira/rest/api/2/priority/3",
-            "iconUrl": "https://issues.apache.org/jira/images/icons/priorities/major.png",
-            "name": "Major",
-            "id": "3"
-          },
-          "status": {
-            "self": "https://issues.apache.org/jira/rest/api/2/status/1",
-            "description": "The issue is open and ready for the assignee to start work on it.",
-            "iconUrl": "https://issues.apache.org/jira/images/icons/statuses/open.png",
-            "name": "Open",
-            "id": "1",
-            "statusCategory": {
-              "self": "https://issues.apache.org/jira/rest/api/2/statuscategory/2",
-              "id": 2,
-              "key": "new",
-              "colorName": "blue-gray",
-              "name": "New"
-            }
-          }
-        }
-      },
-      {
-        "expand": "operations,editmeta,changelog,transitions,renderedFields",
         "id": "12919400",
         "self": "https://issues.apache.org/jira/rest/api/2/issue/12919400",
         "key": "APEXCORE-231",
         "fields": {
-          "summary": "Ability to configure attributes dynamically",
+          "summary": "Ability to change attributes at runtime",
           "description": "The Apex engine supports many platform level attributes like operator memory, application window count, container jvm options etc. Today these can only be set at application launch time and cannot be changed once the application is running.\r\n\r\nThis issue is to add the ability to change the attributes dynamically even as the application is running. The mechanics of an user requesting the attribute change can be similar to how a user requests property change via the command line client.\r\n\r\nSince each attribute is different the actual backend implementation to affect the changes will most likely be custom handling for different attributes but during the implementation process  hopefully some common themes emerge and some amount of reuse possible.",
           "fixVersions": [],
           "priority": {
@@ -226,7 +164,7 @@
         "self": "https://issues.apache.org/jira/rest/api/2/issue/12919404",
         "key": "APEXCORE-235",
         "fields": {
-          "summary": "Explicit support for batch processing",
+          "summary": "Improve support for batch processing",
           "description": "Apex can be used for real-time and batch processing as it stands, but there are some aspects of batch processing that can be better supported through explicit constructs. This ticket can serve as umbrella for various features.",
           "fixVersions": [],
           "priority": {
@@ -343,37 +281,6 @@
             }
           }
         }
-      },
-      {
-        "expand": "operations,editmeta,changelog,transitions,renderedFields",
-        "id": "13005178",
-        "self": "https://issues.apache.org/jira/rest/api/2/issue/13005178",
-        "key": "APEXCORE-536",
-        "fields": {
-          "summary": "Upgrade Hadoop dependency",
-          "description": "Currently Apex depends on Hadoop 2.2 and runs on all later 2.x version. Hadoop 2.2 is quite old, most Apex users have more recent Hadoop installs. Latest distro releases are based on 2.6 and 2.7. There are several important features that were added in Hadoop since 2.2 that Apex should be able to leverage.",
-          "fixVersions": [],
-          "priority": {
-            "self": "https://issues.apache.org/jira/rest/api/2/priority/3",
-            "iconUrl": "https://issues.apache.org/jira/images/icons/priorities/major.png",
-            "name": "Major",
-            "id": "3"
-          },
-          "status": {
-            "self": "https://issues.apache.org/jira/rest/api/2/status/1",
-            "description": "The issue is open and ready for the assignee to start work on it.",
-            "iconUrl": "https://issues.apache.org/jira/images/icons/statuses/open.png",
-            "name": "Open",
-            "id": "1",
-            "statusCategory": {
-              "self": "https://issues.apache.org/jira/rest/api/2/statuscategory/2",
-              "id": 2,
-              "key": "new",
-              "colorName": "blue-gray",
-              "name": "New"
-            }
-          }
-        }
       }
     ],
     "versions": [
@@ -404,15 +311,15 @@
       {
         "self": "https://issues.apache.org/jira/rest/api/2/version/12335725",
         "id": "12335725",
-        "name": "3.4.1",
+        "name": "3.5.1",
         "archived": false,
         "released": false,
         "projectId": 12318823
       },
       {
-        "self": "https://issues.apache.org/jira/rest/api/2/version/12335724",
-        "id": "12335724",
-        "name": "3.5.0",
+        "self": "https://issues.apache.org/jira/rest/api/2/version/12338818",
+        "id": "12338818",
+        "name": "3.6.0",
         "archived": false,
         "released": false,
         "projectId": 12318823
@@ -433,68 +340,6 @@
     "jiras": [
       {
         "expand": "operations,editmeta,changelog,transitions,renderedFields",
-        "id": "12926159",
-        "self": "https://issues.apache.org/jira/rest/api/2/issue/12926159",
-        "key": "APEXMALHAR-1811",
-        "fields": {
-          "summary": "Add Non-Equality Join Condition",
-          "description": "Add new condition for non-equality join predicate (for example, user.zipcode != authzn.zipcode)",
-          "fixVersions": [],
-          "priority": {
-            "self": "https://issues.apache.org/jira/rest/api/2/priority/3",
-            "iconUrl": "https://issues.apache.org/jira/images/icons/priorities/major.png",
-            "name": "Major",
-            "id": "3"
-          },
-          "status": {
-            "self": "https://issues.apache.org/jira/rest/api/2/status/1",
-            "description": "The issue is open and ready for the assignee to start work on it.",
-            "iconUrl": "https://issues.apache.org/jira/images/icons/statuses/open.png",
-            "name": "Open",
-            "id": "1",
-            "statusCategory": {
-              "self": "https://issues.apache.org/jira/rest/api/2/statuscategory/2",
-              "id": 2,
-              "key": "new",
-              "colorName": "blue-gray",
-              "name": "New"
-            }
-          }
-        }
-      },
-      {
-        "expand": "operations,editmeta,changelog,transitions,renderedFields",
-        "id": "12926152",
-        "self": "https://issues.apache.org/jira/rest/api/2/issue/12926152",
-        "key": "APEXMALHAR-1818",
-        "fields": {
-          "summary": "Integrate Calcite to support SQL",
-          "description": "Once we have ability to generate a subdag, we should take a look at integrating Calcite into Apex. The operator that enables populate DAG, should use Calcite to generate the DAG, given a SQL query.",
-          "fixVersions": [],
-          "priority": {
-            "self": "https://issues.apache.org/jira/rest/api/2/priority/3",
-            "iconUrl": "https://issues.apache.org/jira/images/icons/priorities/major.png",
-            "name": "Major",
-            "id": "3"
-          },
-          "status": {
-            "self": "https://issues.apache.org/jira/rest/api/2/status/3",
-            "description": "This issue is being actively worked on at the moment by the assignee.",
-            "iconUrl": "https://issues.apache.org/jira/images/icons/statuses/inprogress.png",
-            "name": "In Progress",
-            "id": "3",
-            "statusCategory": {
-              "self": "https://issues.apache.org/jira/rest/api/2/statuscategory/4",
-              "id": 4,
-              "key": "indeterminate",
-              "colorName": "yellow",
-              "name": "In Progress"
-            }
-          }
-        }
-      },
-      {
-        "expand": "operations,editmeta,changelog,transitions,renderedFields",
         "id": "12926128",
         "self": "https://issues.apache.org/jira/rest/api/2/issue/12926128",
         "key": "APEXMALHAR-1843",
@@ -588,37 +433,6 @@
       },
       {
         "expand": "operations,editmeta,changelog,transitions,renderedFields",
-        "id": "12969033",
-        "self": "https://issues.apache.org/jira/rest/api/2/issue/12969033",
-        "key": "APEXMALHAR-2089",
-        "fields": {
-          "summary": "Apache Beam support",
-          "description": "Apex should provide a runner for Beam. This ticket is a proxy for BEAM-261 as the implementation should probably live in the Beam repository.\r\n",
-          "fixVersions": [],
-          "priority": {
-            "self": "https://issues.apache.org/jira/rest/api/2/priority/3",
-            "iconUrl": "https://issues.apache.org/jira/images/icons/priorities/major.png",
-            "name": "Major",
-            "id": "3"
-          },
-          "status": {
-            "self": "https://issues.apache.org/jira/rest/api/2/status/1",
-            "description": "The issue is open and ready for the assignee to start work on it.",
-            "iconUrl": "https://issues.apache.org/jira/images/icons/statuses/open.png",
-            "name": "Open",
-            "id": "1",
-            "statusCategory": {
-              "self": "https://issues.apache.org/jira/rest/api/2/statuscategory/2",
-              "id": 2,
-              "key": "new",
-              "colorName": "blue-gray",
-              "name": "New"
-            }
-          }
-        }
-      },
-      {
-        "expand": "operations,editmeta,changelog,transitions,renderedFields",
         "id": "12985430",
         "self": "https://issues.apache.org/jira/rest/api/2/issue/12985430",
         "key": "APEXMALHAR-2130",
@@ -627,9 +441,9 @@
           "description": "This feature is used for supporting windowing.\r\n\r\nThe storage needs to have the following features:\r\n1. Spillable key value storage (integrate with APEXMALHAR-2026)\r\n2. Upon checkpoint, it saves a snapshot for the entire data set with the checkpointing window id.  This should be done incrementally (ManagedState) to avoid wasting space with unchanged data\r\n3. When recovering, it takes the recovery window id and restores to that snapshot\r\n4. When a window is committed, all windows with a lower ID should be purged from the store.\r\n5. It should implement the WindowedStorage and WindowedKeyedStorage interfaces, and because of 2 and 3, we may want to add methods to the WindowedStorage interface so that the implementation of WindowedOperator can notify the storage of checkpointing, recovering and committing of a window.\r\n",
           "fixVersions": [
             {
-              "self": "https://issues.apache.org/jira/rest/api/2/version/12338174",
-              "id": "12338174",
-              "name": "3.6.0",
+              "self": "https://issues.apache.org/jira/rest/api/2/version/12338771",
+              "id": "12338771",
+              "name": "3.7.0",
               "archived": false,
               "released": false
             }
@@ -745,17 +559,9 @@
         "projectId": 12318824
       },
       {
-        "self": "https://issues.apache.org/jira/rest/api/2/version/12335827",
-        "id": "12335827",
-        "name": "3.5.1",
-        "archived": false,
-        "released": false,
-        "projectId": 12318824
-      },
-      {
-        "self": "https://issues.apache.org/jira/rest/api/2/version/12338174",
-        "id": "12338174",
-        "name": "3.6.0",
+        "self": "https://issues.apache.org/jira/rest/api/2/version/12338771",
+        "id": "12338771",
+        "name": "3.7.0",
         "archived": false,
         "released": false,
         "projectId": 12318824
diff --git a/src/md/announcements-latest.md b/src/md/announcements-latest.md
index dbb5bef..63886a9 100644
--- a/src/md/announcements-latest.md
+++ b/src/md/announcements-latest.md
@@ -1,23 +1,23 @@
 # Announcements
 
+## Apache Apex Core release 3.5.0
+
+Dec 10, 2016.  The Apache Apex community is pleased to announce release [3.5.0](/downloads.html) of the Core.
+
+Changes: https://github.com/apache/apex-core/blob/v3.5.0/CHANGELOG.md
+
+## Apache Apex Malhar Library release 3.6.0
+
+Dec 02, 2016.  The Apache Apex community is pleased to announce release [3.6.0](/downloads.html) of the Malhar Library.
+
+Changes: https://github.com/apache/apex-malhar/blob/v3.5.0/CHANGELOG.md
+
 ## Apache Apex Malhar Library release 3.5.0
 
 Sep 05, 2016.  The Apache Apex community is pleased to announce release [3.5.0](/downloads.html) of the Malhar Library.
 
 Changes: https://github.com/apache/apex-malhar/blob/v3.5.0/CHANGELOG.md
 
-## Apache Apex Malhar Library release 3.4.0
-
-May 25, 2016.  The Apache Apex community is pleased to announce release [3.4.0](/downloads.html) of the Malhar Library.
-
-Changes: https://github.com/apache/apex-malhar/blob/v3.4.0/CHANGELOG.md
-
-## Apache Apex Core release 3.4.0
-
-May 12, 2016.  The Apache Apex community is pleased to announce release [3.4.0](/downloads.html) of the Core.
-
-Changes: https://github.com/apache/apex-core/blob/v3.4.0/CHANGELOG.md
-
 ## Apache Apex announced as Top-Level Project
 
 Apr 25, 2016.  The Apache Software Foundation (ASF) announced today that Apache Apex has graduated from the Apache Incubator to become a Top-Level Project (TLP), signifying that the project's community and products have been well-governed under the ASF's meritocratic process and principles. 
diff --git a/src/md/docs.md b/src/md/docs.md
index eed5824..ded7bd9 100644
--- a/src/md/docs.md
+++ b/src/md/docs.md
@@ -2,9 +2,7 @@
 
 - **[Apache Apex Core Documentation](/docs/apex/)** including overviews of the product, security, application development, operators and the commandline tool.
 - **[Apache Apex Malhar Documentation](/docs/malhar/)** for the operator library including a diagrammatic taxonomy and some in-depth tutorials for selected operators (such as Kafka Input).
-- **<a href="https://www.datatorrent.com/docs/apidocs/" rel="nofollow">Java API documentation</a>** for both the platform and the operator library.
-
-Documentation for previous releases is available in [Downloads](/downloads.html).
+- **[Java API documentation](/downloads.html)** for recent releases is available under [Downloads](/downloads.html).
 
 ### Writing Apache Apex Applications
 
diff --git a/src/pages/downloads.html b/src/pages/downloads.html
index a0ae899..ea270d5 100644
--- a/src/pages/downloads.html
+++ b/src/pages/downloads.html
@@ -28,27 +28,27 @@
           {{releaseDate version.date}}
         </td>
         <td>
-          <a href="http://www.apache.org/dyn/closer.lua/apex/apache-apex-core-{{ version.version }}/apex-{{ version.version }}-source-release.zip">apex-{{ version.version }}-source-release.zip</a><br>
+          <a href="http://www.apache.org/dyn/closer.lua/apex/apache-apex-core-{{ version.version }}/apache-apex-core-{{ version.version }}-source-release.zip">apex-{{ version.version }}-source-release.zip</a><br>
           <small>
             (
-              <a href="https://dist.apache.org/repos/dist/release/apex/apache-apex-core-{{ version.version }}/apex-{{ version.version }}-source-release.zip.asc">pgp</a>,
-              <a href="https://dist.apache.org/repos/dist/release/apex/apache-apex-core-{{ version.version }}/apex-{{ version.version }}-source-release.zip.md5">md5</a>,
-              <a href="https://dist.apache.org/repos/dist/release/apex/apache-apex-core-{{ version.version }}/apex-{{ version.version }}-source-release.zip.sha">sha1</a>
+              <a href="https://dist.apache.org/repos/dist/release/apex/apache-apex-core-{{ version.version }}/apache-apex-core-{{ version.version }}-source-release.zip.asc">pgp</a>,
+              <a href="https://dist.apache.org/repos/dist/release/apex/apache-apex-core-{{ version.version }}/apache-apex-core-{{ version.version }}-source-release.zip.md5">md5</a>,
+              <a href="https://dist.apache.org/repos/dist/release/apex/apache-apex-core-{{ version.version }}/apache-apex-core-{{ version.version }}-source-release.zip.sha">sha1</a>
             )
           </small>
         </td>
         <td>
-          <a href="http://www.apache.org/dyn/closer.lua/apex/apache-apex-core-{{ version.version }}/apex-{{ version.version }}-source-release.tar.gz">apex-{{ version.version }}-source-release.tar.gz</a><br>
+          <a href="http://www.apache.org/dyn/closer.lua/apex/apache-apex-core-{{ version.version }}/apache-apex-core-{{ version.version }}-source-release.tar.gz">apex-{{ version.version }}-source-release.tar.gz</a><br>
           <small>
             (
-              <a href="https://dist.apache.org/repos/dist/release/apex/apache-apex-core-{{ version.version }}/apex-{{ version.version }}-source-release.tar.gz.asc">pgp</a>,
-              <a href="https://dist.apache.org/repos/dist/release/apex/apache-apex-core-{{ version.version }}/apex-{{ version.version }}-source-release.tar.gz.md5">md5</a>,
-              <a href="https://dist.apache.org/repos/dist/release/apex/apache-apex-core-{{ version.version }}/apex-{{ version.version }}-source-release.tar.gz.sha">sha1</a>
+              <a href="https://dist.apache.org/repos/dist/release/apex/apache-apex-core-{{ version.version }}/apache-apex-core-{{ version.version }}-source-release.tar.gz.asc">pgp</a>,
+              <a href="https://dist.apache.org/repos/dist/release/apex/apache-apex-core-{{ version.version }}/apache-apex-core-{{ version.version }}-source-release.tar.gz.md5">md5</a>,
+              <a href="https://dist.apache.org/repos/dist/release/apex/apache-apex-core-{{ version.version }}/apache-apex-core-{{ version.version }}-source-release.tar.gz.sha">sha1</a>
             )
           </small>
         </td>
         <td>
-          <a href="/docs/apex-{{ version.docs }}">apex-{{ version.docs }}</a><br>
+          <a href="/docs/apex-{{ version.docs }}">user documentation</a><br>
         </td>
       </tr>
       {{/each}}