Releasing Apache ServiceMix 7.0.1 and 6.1.4
git-svn-id: https://svn.apache.org/repos/asf/servicemix/website/trunk@1796458 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/webapp/WEB-INF/scalate/layouts/default.scaml b/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
index 2015529..4961d02 100644
--- a/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
+++ b/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
@@ -109,7 +109,7 @@
%td#cell-3-2
#footer
#site-footer
- © 2008-2011 The Apache Software Foundation -
+ © 2008-2017 The Apache Software Foundation -
%a(href={uri("/privacy-policy.html")}) Privacy Policy
%br
Apache ServiceMix, ServiceMix, Apache, the Apache feather logo, and the Apache ServiceMix project logo are trademarks of The Apache Software Foundation.
diff --git a/src/main/webapp/community/releases-schedule.page b/src/main/webapp/community/releases-schedule.page
index ebc173e..e8c9591 100644
--- a/src/main/webapp/community/releases-schedule.page
+++ b/src/main/webapp/community/releases-schedule.page
@@ -11,8 +11,8 @@
h3. Active
|| Release Branch || Karaf || Camel || ActiveMQ || CXF || OSGi || Java || Status || Latest Version || Next Version || ETA ||
-| servicemix-6.1.x | 3.0.8 | 2.16.5 | 5.12.3 | 3.1.9 | 5 | 7 / 8 | Current Stable/In Maintenance | 6.1.3 | 6.1.4 | 27.05.2017 |
-| servicemix-7.0.x | 4.0.9 | 2.16.5 | 5.14.5 | 3.1.9 | 5 | 7 / 8 | Current Stable/In Maintenance | 7.0.0 | 7.0.1 | 27.05.2017 |
+| servicemix-6.1.x | 3.0.8 | 2.16.5 | 5.12.3 | 3.1.9 | 5 | 7 / 8 | Current Stable/In Maintenance | 6.1.4 | 6.1.5 | |
+| servicemix-7.0.x | 4.0.9 | 2.16.5 | 5.14.5 | 3.1.9 | 5 | 7 / 8 | Current Stable/In Maintenance | 7.0.1 | 7.0.2 | |
| master (7.1.x) | 4.0.9 | 2.17.5 | 5.14.5 | 3.1.9 | 5 | 7 / 8 | Development | | 7.1.0 | 10.06.2017 |
h3. EOL/Not active
diff --git a/src/main/webapp/downloads.page b/src/main/webapp/downloads.page
index 25d2cef..78c374f 100644
--- a/src/main/webapp/downloads.page
+++ b/src/main/webapp/downloads.page
@@ -3,29 +3,31 @@
--- name:intro pipeline:conf
h1. Download
-The latest release is the [ServiceMix 7.0.0 Release|/downloads/servicemix-7.0.0.html]. We strongly encourage all users to use this release.
+The latest release is the [ServiceMix 7.0.1 Release|/downloads/servicemix-7.0.1.html]. We strongly encourage all users to use this release.
--- name:previous pipeline:conf
h2. Other Releases
-* [Apache ServiceMix 6.1.3|/downloads/servicemix-6.1.3.html]
-* [Apache ServiceMix 5.6.3|/downloads/servicemix-5.6.3.html]
+* [Apache ServiceMix 6.1.4|/downloads/servicemix-6.1.4.html]
h2. Development snapshots
We have development snapshots available for
-* [Apache ServiceMix 7.0.1-SNAPSHOT|/downloads/servicemix-7.0.1.html]
-* [Apache ServiceMix 6.1.4-SNAPSHOT|/downloads/servicemix-6.1.4.html]
+* [Apache ServiceMix 7.1.0-SNAPSHOT|/downloads/servicemix-7.1.0.html]
+* [Apache ServiceMix 7.0.2-SNAPSHOT|/downloads/servicemix-7.0.2.html]
+* [Apache ServiceMix 6.1.5-SNAPSHOT|/downloads/servicemix-6.1.5.html]
h2. Previous Releases
An archive of previous releases can be found [here|http://archive.apache.org/dist/servicemix/].
+* [Apache ServiceMix 7.0.0|/downloads/servicemix-7.0.0.html]
* [Apache ServiceMix 7.0.0.M3|/downloads/servicemix-7.0.0.M3.html]
* [Apache ServiceMix 7.0.0.M2|/downloads/servicemix-7.0.0.M2.html]
* [Apache ServiceMix 7.0.0.M1|/downloads/servicemix-7.0.0.M1.html]
+* [Apache ServiceMix 6.1.3|/downloads/servicemix-6.1.3.html]
* [Apache ServiceMix 6.1.2|/downloads/servicemix-6.1.2.html]
* [Apache ServiceMix 6.1.1|/downloads/servicemix-6.1.1.html]
* [Apache ServiceMix 6.1.0|/downloads/servicemix-6.1.0.html]
@@ -36,6 +38,7 @@
* [Apache ServiceMix 6.0.0|/downloads/servicemix-6.0.0.html]
* [Apache ServiceMix 6.0.0.M2|/downloads/servicemix-6.0.0.M2.html]
* [Apache ServiceMix 6.0.0.M1|/downloads/servicemix-6.0.0.M1.html]
+* [Apache ServiceMix 5.6.3|/downloads/servicemix-5.6.3.html]
* [Apache ServiceMix 5.6.2|/downloads/servicemix-5.6.2.html]
* [Apache ServiceMix 5.6.1|/downloads/servicemix-5.6.1.html]
* [Apache ServiceMix 5.6.0|/downloads/servicemix-5.6.0.html]
@@ -105,6 +108,6 @@
<%= unescape(intro) %>
-<% render("/downloads/_servicemix7.scaml", Map("version" -> "7.0.0")) %>
+<% render("/downloads/_servicemix7.scaml", Map("version" -> "7.0.1")) %>
<%= unescape(previous) %>
diff --git a/src/main/webapp/downloads/servicemix-5.6.3.page b/src/main/webapp/downloads/servicemix-5.6.3.page
index cc077a0..b40d542 100644
--- a/src/main/webapp/downloads/servicemix-5.6.3.page
+++ b/src/main/webapp/downloads/servicemix-5.6.3.page
@@ -40,6 +40,6 @@
<h2>Downloads : Apache ServiceMix 5.6.3</h2>
-<% render("/downloads/_servicemix5.scaml", Map("version" -> "5.6.3")) %>
+<% render("/downloads/_servicemix5.scaml", Map("version" -> "5.6.3", "archive" -> true)) %>
<%= unescape(notes) %>
diff --git a/src/main/webapp/downloads/servicemix-6.1.3.page b/src/main/webapp/downloads/servicemix-6.1.3.page
index 5e651e3..e53b2bb 100644
--- a/src/main/webapp/downloads/servicemix-6.1.3.page
+++ b/src/main/webapp/downloads/servicemix-6.1.3.page
@@ -37,6 +37,6 @@
<h2>Downloads : Apache ServiceMix 6.1.3</h2>
-<% render("/downloads/_servicemix6.scaml", Map("version" -> "6.1.3")) %>
+<% render("/downloads/_servicemix6.scaml", Map("version" -> "6.1.3", "archive" -> true)) %>
<%= unescape(notes) %>
diff --git a/src/main/webapp/downloads/servicemix-6.1.4.page b/src/main/webapp/downloads/servicemix-6.1.4.page
index 7f0cb60..1cfde78 100644
--- a/src/main/webapp/downloads/servicemix-6.1.4.page
+++ b/src/main/webapp/downloads/servicemix-6.1.4.page
@@ -1,18 +1,42 @@
---
-title: ServiceMix 6.1.4-SNAPSHOT
+title: ServiceMix 6.1.4
--- name:notes pipeline:conf
-h2. Helping us...
+h2. OSGi components list
+Components included in this release:
-You can help us by trying out this development snapshot and reporting any problems you encounter on the [mailing lists|/community/mailing-lists]
+This release packages the following dependencies:
+* Version [3.0.8|http://karaf.apache.org/download.html#container-308] of [Apache Karaf|http://karaf.apache.org/]
+* Version [5.12.3|http://activemq.apache.org/activemq-5123-release.html] of [ActiveMQ|http://activemq.apache.org]
+* Version [2.16.5|http://camel.apache.org/camel-2165-release.html] of [Camel|http://camel.apache.org]
+* Version [3.1.9|https://cxf.apache.org/cxf-319-release-notes.html] of [CXF|http://cxf.apache.org]
-An overview of outstanding JIRA issues for this release can be found at [https://issues.apache.org/jira/browse/SM/fixforversion/12337883]
+h2. Release notes
+
+h3. Sub-task
+ * [SM-3223|http://issues.apache.org/jira/browse/SM-3223] - Add notice about usage of non-free json library
+
+h3. Bug
+ * [SM-2493|http://issues.apache.org/jira/browse/SM-2493] - ServiceMix shuts down automatically
+
+h3. Task
+ * [SM-3166|http://issues.apache.org/jira/browse/SM-3166] - Release Apache ServiceMix 6.1.4
+ * [SM-3222|http://issues.apache.org/jira/browse/SM-3222] - ServiceMix should not use non-free json.org
+ * [SM-3228|http://issues.apache.org/jira/browse/SM-3228] - Upgrade to Apache Camel 2.16.5 and Apache CXF 3.1.9
+
+h2. SCM tag
+
+Tag {{servicemix-6.1.4}} is available in [Git|https://git-wip-us.apache.org/repos/asf?p=servicemix.git;a=tag;h=refs/tags/servicemix-6.1.4] (commit id 8407f4eb0cf84369c8674a04813248bd26133f0d)
+
+h2. Changelog
+
+For a more detailed view of new features and bug fixes, see the [changelog|https://issues.apache.org/jira/browse/SM/fixforversion/12337883]
--- name:content pipeline:ssp
<%@ val notes : String %>
-<h2>Downloads : Apache ServiceMix 6.1.4-SNAPSHOT</h2>
+<h2>Downloads : Apache ServiceMix 6.1.4</h2>
-<% render("/downloads/_servicemix6.scaml", Map("version" -> "6.1.4-SNAPSHOT")) %>
+<% render("/downloads/_servicemix6.scaml", Map("version" -> "6.1.4")) %>
<%= unescape(notes) %>
diff --git a/src/main/webapp/downloads/servicemix-6.1.5.page b/src/main/webapp/downloads/servicemix-6.1.5.page
new file mode 100644
index 0000000..cd5bb43
--- /dev/null
+++ b/src/main/webapp/downloads/servicemix-6.1.5.page
@@ -0,0 +1,18 @@
+---
+title: ServiceMix 6.1.5-SNAPSHOT
+--- name:notes pipeline:conf
+
+h2. Helping us...
+
+You can help us by trying out this development snapshot and reporting any problems you encounter on the [mailing lists|/community/mailing-lists]
+
+An overview of outstanding JIRA issues for this release can be found at [https://issues.apache.org/jira/browse/SM/fixforversion/12338756]
+
+--- name:content pipeline:ssp
+<%@ val notes : String %>
+
+<h2>Downloads : Apache ServiceMix 6.1.5-SNAPSHOT</h2>
+
+<% render("/downloads/_servicemix6.scaml", Map("version" -> "6.1.5-SNAPSHOT")) %>
+
+<%= unescape(notes) %>
diff --git a/src/main/webapp/downloads/servicemix-7.0.0.page b/src/main/webapp/downloads/servicemix-7.0.0.page
index 1fb12a7..dc7e4e8 100644
--- a/src/main/webapp/downloads/servicemix-7.0.0.page
+++ b/src/main/webapp/downloads/servicemix-7.0.0.page
@@ -6,7 +6,7 @@
Components included in this release:
This release packages the following dependencies:
-* Version [4.0.8|http://karaf.apache.org/download.html#container-408] of [Apache Karaf|http://karaf.apache.org/]
+* Version [4.0.8|http://karaf.apache.org/archives.html#container-408] of [Apache Karaf|http://karaf.apache.org/]
* Version [5.14.3|http://activemq.apache.org/activemq-5143-release.html] of [ActiveMQ|http://activemq.apache.org]
* Version [2.16.4|http://camel.apache.org/camel-2164-release.html] of [Camel|http://camel.apache.org]
* Version [3.1.5|https://cxf.apache.org/cxf-315-release-notes.html] of [CXF|http://cxf.apache.org]
@@ -40,6 +40,6 @@
<h2>Downloads : Apache ServiceMix 7.0.0</h2>
-<% render("/downloads/_servicemix7.scaml", Map("version" -> "7.0.0")) %>
+<% render("/downloads/_servicemix7.scaml", Map("version" -> "7.0.0", "archive" -> true)) %>
<%= unescape(notes) %>
diff --git a/src/main/webapp/downloads/servicemix-7.0.1.page b/src/main/webapp/downloads/servicemix-7.0.1.page
index 2cc5f58..b934e79 100644
--- a/src/main/webapp/downloads/servicemix-7.0.1.page
+++ b/src/main/webapp/downloads/servicemix-7.0.1.page
@@ -1,18 +1,47 @@
---
-title: ServiceMix 7.0.1-SNAPSHOT
+title: ServiceMix 7.0.1
--- name:notes pipeline:conf
-h2. Helping us...
+h2. OSGi components list
+Components included in this release:
-You can help us by trying out this development snapshot and reporting any problems you encounter on the [mailing lists|/community/mailing-lists]
+This release packages the following dependencies:
+* Version [4.0.9|http://karaf.apache.org/download.html#container-409] of [Apache Karaf|http://karaf.apache.org/]
+* Version [5.14.5|http://activemq.apache.org/activemq-5145-release.html] of [ActiveMQ|http://activemq.apache.org]
+* Version [2.16.5|http://camel.apache.org/camel-2165-release.html] of [Camel|http://camel.apache.org]
+* Version [3.1.9|https://cxf.apache.org/cxf-319-release-notes.html] of [CXF|http://cxf.apache.org]
-An overview of outstanding JIRA issues for this release can be found at [https://issues.apache.org/jira/browse/SM/fixforversion/12333030]
+h2. Release notes
+
+h3. Bug
+ * [SM-3225|http://issues.apache.org/jira/browse/SM-3225] - Examples compile error
+ * [SM-3264|http://issues.apache.org/jira/browse/SM-3264] - Upgrade to Apache Karaf 4.0.9
+
+h3. Improvement
+ * [SM-3303|http://issues.apache.org/jira/browse/SM-3303] - Expose proces configuration to cfg file
+
+h3. Task
+ * [SM-3222|http://issues.apache.org/jira/browse/SM-3222] - ServiceMix should not use non-free json.org
+ * [SM-3226|http://issues.apache.org/jira/browse/SM-3226] - Release Apache ServiceMix 7.0.1
+ * [SM-3228|http://issues.apache.org/jira/browse/SM-3228] - Upgrade to Apache Camel 2.16.5 and Apache CXF 3.1.9
+ * [SM-3268|http://issues.apache.org/jira/browse/SM-3268] - Upgrade to Apache ActiveMQ 5.14.5
+ * [SM-3357|http://issues.apache.org/jira/browse/SM-3357] - Upgrade to depends-maven-plugin 1.4.0
+ * [SM-3358|http://issues.apache.org/jira/browse/SM-3358] - Upgrade to maven-bundle-plugin 3.3.0
+ * [SM-3359|http://issues.apache.org/jira/browse/SM-3359] - Upgrade maven plugin versions and parent pom
+
+h2. SCM tag
+
+Tag {{servicemix-7.0.1}} is available in [Git|https://git-wip-us.apache.org/repos/asf?p=servicemix.git;a=tag;h=refs/tags/servicemix-7.0.1] (commit id d938a2d00cdc301c59146c05d3503a2f1e045ee5)
+
+h2. Changelog
+
+For a more detailed view of new features and bug fixes, see the [changelog|https://issues.apache.org/jira/browse/SM/fixforversion/12333030]
--- name:content pipeline:ssp
<%@ val notes : String %>
-<h2>Downloads : Apache ServiceMix 7.0.1-SNAPSHOT</h2>
+<h2>Downloads : Apache ServiceMix 7.0.1</h2>
-<% render("/downloads/_servicemix7.scaml", Map("version" -> "7.0.1-SNAPSHOT")) %>
+<% render("/downloads/_servicemix7.scaml", Map("version" -> "7.0.1")) %>
<%= unescape(notes) %>
diff --git a/src/main/webapp/downloads/servicemix-7.0.2.page b/src/main/webapp/downloads/servicemix-7.0.2.page
new file mode 100644
index 0000000..d64d20c
--- /dev/null
+++ b/src/main/webapp/downloads/servicemix-7.0.2.page
@@ -0,0 +1,18 @@
+---
+title: ServiceMix 7.0.2-SNAPSHOT
+--- name:notes pipeline:conf
+
+h2. Helping us...
+
+You can help us by trying out this development snapshot and reporting any problems you encounter on the [mailing lists|/community/mailing-lists]
+
+An overview of outstanding JIRA issues for this release can be found at [https://issues.apache.org/jira/browse/SM/fixforversion/12333031]
+
+--- name:content pipeline:ssp
+<%@ val notes : String %>
+
+<h2>Downloads : Apache ServiceMix 7.0.2-SNAPSHOT</h2>
+
+<% render("/downloads/_servicemix7.scaml", Map("version" -> "7.0.2-SNAPSHOT")) %>
+
+<%= unescape(notes) %>
diff --git a/src/main/webapp/downloads/servicemix-7.1.0.page b/src/main/webapp/downloads/servicemix-7.1.0.page
new file mode 100644
index 0000000..e02eb48
--- /dev/null
+++ b/src/main/webapp/downloads/servicemix-7.1.0.page
@@ -0,0 +1,18 @@
+---
+title: ServiceMix 7.1.0-SNAPSHOT
+--- name:notes pipeline:conf
+
+h2. Helping us...
+
+You can help us by trying out this development snapshot and reporting any problems you encounter on the [mailing lists|/community/mailing-lists]
+
+An overview of outstanding JIRA issues for this release can be found at [https://issues.apache.org/jira/browse/SM/fixforversion/12335503]
+
+--- name:content pipeline:ssp
+<%@ val notes : String %>
+
+<h2>Downloads : Apache ServiceMix 7.1.0-SNAPSHOT</h2>
+
+<% render("/downloads/_servicemix7.scaml", Map("version" -> "7.1.0-SNAPSHOT")) %>
+
+<%= unescape(notes) %>
diff --git a/src/main/webapp/index.page b/src/main/webapp/index.page
index b9f1fcf..04bd8ef 100644
--- a/src/main/webapp/index.page
+++ b/src/main/webapp/index.page
@@ -28,8 +28,8 @@
{column}
{column}
{center}
-*[Download ServiceMix 7.0.0|/downloads.html]*
-*[Download ServiceMix 6.1.3|/downloads/servicemix-6.1.3.html]*
+*[Download ServiceMix 7.0.1|/downloads.html]*
+*[Download ServiceMix 6.1.4|/downloads/servicemix-6.1.4.html]*
[!/images/servicemix-box.jpg|width=256!|/downloads.html]
{center}
{html}
diff --git a/src/main/webapp/news.page b/src/main/webapp/news.page
index 743503a..5a9ad42 100644
--- a/src/main/webapp/news.page
+++ b/src/main/webapp/news.page
@@ -8,6 +8,10 @@
h2. Older news items
+* [ServiceMix 5.6.3 Release | servicemix-563-released]
+* [ServiceMix 7.0.0 Release | servicemix-700-released]
+* [ServiceMix 7.0.0.M3 Release | servicemix-700M3-released]
+* [ServiceMix 6.1.3 Release | servicemix-613-released]
* [ServiceMix 6.0.5 Release | servicemix-605-released]
* [ServiceMix 5.6.2 Release | servicemix-562-released]
* [ServiceMix 6.1.2 Release | servicemix-612-released]
diff --git a/src/main/webapp/news/recent.page b/src/main/webapp/news/recent.page
index 034d606..89fd456 100644
--- a/src/main/webapp/news/recent.page
+++ b/src/main/webapp/news/recent.page
@@ -2,8 +2,6 @@
title: Apache ServiceMix Recent News
--- pipeline:conf
+{include:servicemix-701-released}
+{include:servicemix-614-released}
{include:community_news_march_2017}
-{include:servicemix-563-released}
-{include:servicemix-700-released}
-{include:servicemix-700M3-released}
-{include:servicemix-613-released}
diff --git a/src/main/webapp/news/servicemix-614-released.page b/src/main/webapp/news/servicemix-614-released.page
new file mode 100644
index 0000000..0864d73
--- /dev/null
+++ b/src/main/webapp/news/servicemix-614-released.page
@@ -0,0 +1,21 @@
+---
+title: ServiceMix 6.1.4 Released
+--- pipeline:conf
+
+h2. ServiceMix 6.1.4 released
+
+The ServiceMix team is pleased to announce the availability of Apache ServiceMix 6.1.4.
+This new patch release includes few bug fixes and picks up new versions of Apache Camel
+and Apache CXF.
+
+WARNING: this is probably the last scheduled release of ServiceMix 6.x. We encourage users
+to upgrade to more recent ServiceMix versions.
+
+Major dependency versions for this release:
+* Activiti 5.19.0.2
+* Apache ActiveMQ 5.12.3
+* Apache Camel 2.16.5
+* Apache CXF 3.1.9
+* Apache Karaf 3.0.8
+
+For more information, please see the [release notes|/downloads/servicemix-6.1.4]
diff --git a/src/main/webapp/news/servicemix-701-released.page b/src/main/webapp/news/servicemix-701-released.page
new file mode 100644
index 0000000..3d1cf2d
--- /dev/null
+++ b/src/main/webapp/news/servicemix-701-released.page
@@ -0,0 +1,19 @@
+---
+title: ServiceMix 7.0.1 Released
+--- pipeline:conf
+
+h2. ServiceMix 7.0.1 released
+
+The ServiceMix team is pleased to announce the availability of Apache ServiceMix 7.0.1.
+
+This new patch release includes few bug fixes and picks up new versions of Apache Camel,
+Apache CXF, Apache ActiveMQ and Apache Karaf.
+
+Major dependency versions for this release:
+* Activiti 5.19.0.2
+* Apache ActiveMQ 5.14.5
+* Apache Camel 2.16.5
+* Apache CXF 3.1.9
+* Apache Karaf 4.0.9
+
+For more information, please see the [release notes|/downloads/servicemix-7.0.1]
diff --git a/src/main/webapp/site/navigation.page b/src/main/webapp/site/navigation.page
index 9f45ab3..45c1fc7 100644
--- a/src/main/webapp/site/navigation.page
+++ b/src/main/webapp/site/navigation.page
@@ -37,7 +37,7 @@
- [Support]
- [Discussion Forums]
- [Mailing Lists]
-- [Issues|http://issues.apache.org/activemq/browse/SM]
+- [Issues|https://issues.apache.org/jira/browse/SM]
- [IRC]
- [Contributing]
- [Users]
