Releasing Apache ServiceMix 6.0.3 and 6.1.1
git-svn-id: https://svn.apache.org/repos/asf/servicemix/website/trunk@1736382 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/webapp/community/releases-schedule.page b/src/main/webapp/community/releases-schedule.page
index 372e423..9643ed2 100644
--- a/src/main/webapp/community/releases-schedule.page
+++ b/src/main/webapp/community/releases-schedule.page
@@ -16,8 +16,8 @@
| servicemix-5.4.x | 2.4.4 | 2.14.4 | 5.11.4 | 3.0.5 | 5 | 7 / 8 | EOL/NotActive | 5.4.3 | | |
| servicemix-5.5.x | 2.4.4 | 2.15.5 | 5.12.3 | 3.0.6 | 5 | 7 / 8 | Previous Stable/In Maintenance | 5.5.3 | 5.5.4 | |
| servicemix-5.6.x | 2.4.4 | 2.16.2 | 5.12.3 | 3.1.4 | 5 | 7 / 8 | Development | 5.6.0 | 5.6.1 | |
-| servicemix-6.0.x | 3.0.6 | 2.15.5 | 5.12.3 | 3.0.6 | 4.3 (partial 5 support) | 6 / 7 / 8| Current Stable/In Maintenance | 6.0.2 | 6.0.3 | 28.02.2016 |
-| servicemix-6.1.x | 3.0.6 | 2.16.2 | 5.12.3 | 3.1.4 | 4.3 (partial 5 support) | 7 / 8| Development | 6.1.0 | 6.1.1 | 28.02.2016 |
-| master (7.0.x) | 4.0.4 | 2.16.2 | 5.13.1 | 3.1.4 | 5 | 7 / 8| Development | 7.0.0.M1 | 7.0.0.M2 | |
+| servicemix-6.0.x | 3.0.6 | 2.15.5 | 5.12.3 | 3.0.6 | 4.3 (partial 5 support) | 6 / 7 / 8| Current Stable/In Maintenance | 6.0.3 | 6.0.4 | |
+| servicemix-6.1.x | 3.0.6 | 2.16.2 | 5.12.3 | 3.1.4 | 4.3 (partial 5 support) | 7 / 8| Development | 6.1.1 | 6.1.2 | |
+| master (7.0.x) | 4.0.4 | 2.16.2 | 5.13.1 | 3.1.4 | 5 | 7 / 8| Development | 7.0.0.M1 | 7.0.0.M2 | 15.04.2016 |
Please refer the [Karaf Releases Schedule|http://karaf.apache.org/download.html#container-schedule] for more details.
diff --git a/src/main/webapp/downloads.page b/src/main/webapp/downloads.page
index 6163a98..53aaa62 100644
--- a/src/main/webapp/downloads.page
+++ b/src/main/webapp/downloads.page
@@ -9,8 +9,8 @@
h2. Other Releases
-* [Apache ServiceMix 6.1.0|/downloads/servicemix-6.1.0.html]
-* [Apache ServiceMix 6.0.2|/downloads/servicemix-6.0.2.html]
+* [Apache ServiceMix 6.1.1|/downloads/servicemix-6.1.1.html]
+* [Apache ServiceMix 6.0.3|/downloads/servicemix-6.0.3.html]
* [Apache ServiceMix 5.6.0|/downloads/servicemix-5.6.0.html]
* [Apache ServiceMix 5.5.3|/downloads/servicemix-5.5.3.html]
* [Apache ServiceMix 5.4.3|/downloads/servicemix-5.4.3.html]
@@ -20,8 +20,8 @@
We have development snapshots available for
* [Apache ServiceMix 7.0.0-SNAPSHOT|/downloads/servicemix-7.0.0.html]
-* [Apache ServiceMix 6.1.1-SNAPSHOT|/downloads/servicemix-6.1.1.html]
-* [Apache ServiceMix 6.0.3-SNAPSHOT|/downloads/servicemix-6.0.3.html]
+* [Apache ServiceMix 6.1.2-SNAPSHOT|/downloads/servicemix-6.1.2.html]
+* [Apache ServiceMix 6.0.4-SNAPSHOT|/downloads/servicemix-6.0.4.html]
* [Apache ServiceMix 5.6.1-SNAPSHOT|/downloads/servicemix-5.6.1.html]
* [Apache ServiceMix 5.5.4-SNAPSHOT|/downloads/servicemix-5.5.4.html]
@@ -29,6 +29,8 @@
An archive of previous releases can be found [here|http://archive.apache.org/dist/servicemix/].
+* [Apache ServiceMix 6.1.0|/downloads/servicemix-6.1.0.html]
+* [Apache ServiceMix 6.0.2|/downloads/servicemix-6.0.2.html]
* [Apache ServiceMix 6.0.1|/downloads/servicemix-6.0.1.html]
* [Apache ServiceMix 6.0.0|/downloads/servicemix-6.0.0.html]
* [Apache ServiceMix 6.0.0.M2|/downloads/servicemix-6.0.0.M2.html]
diff --git a/src/main/webapp/downloads/servicemix-6.0.2.page b/src/main/webapp/downloads/servicemix-6.0.2.page
index 4a0f648..8739ecd 100644
--- a/src/main/webapp/downloads/servicemix-6.0.2.page
+++ b/src/main/webapp/downloads/servicemix-6.0.2.page
@@ -38,6 +38,6 @@
<h2>Downloads : Apache ServiceMix 6.0.2</h2>
-<% render("/downloads/_servicemix6.scaml", Map("version" -> "6.0.2")) %>
+<% render("/downloads/_servicemix6.scaml", Map("version" -> "6.0.2", "archive" -> true)) %>
<%= unescape(notes) %>
diff --git a/src/main/webapp/downloads/servicemix-6.0.3.page b/src/main/webapp/downloads/servicemix-6.0.3.page
index 0f9aacd..aef1807 100644
--- a/src/main/webapp/downloads/servicemix-6.0.3.page
+++ b/src/main/webapp/downloads/servicemix-6.0.3.page
@@ -1,18 +1,57 @@
---
-title: ServiceMix 6.0.3-SNAPSHOT
+title: ServiceMix 6.0.3
--- 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.6|http://karaf.apache.org/index/community/download/karaf-3.0.6-release.html] 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.15.5|http://camel.apache.org/camel-2155-release.html] of [Camel|http://camel.apache.org]
+* Version [3.0.6|https://cxf.apache.org/cxf-306-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/12333989]
+h2. Release notes
+
+h3. Bug
+ * [SM-2848|http://issues.apache.org/jira/browse/SM-2848] - cxf-wsn-client client fails due to wrong slf4j version
+ * [SM-2850|http://issues.apache.org/jira/browse/SM-2850] - JMSAppenderTest.testReconnectToBroker fails
+ * [SM-2854|http://issues.apache.org/jira/browse/SM-2854] - Doclint for Javadoc fails on JDK 8
+ * [SM-2864|http://issues.apache.org/jira/browse/SM-2864] - Update example README.txt files for new Karaf commands
+
+h3. Improvement
+ * [SM-2395|http://issues.apache.org/jira/browse/SM-2395] - Download pages should correctly refer the documentation pages
+
+h3. Task
+ * [SM-2778|http://issues.apache.org/jira/browse/SM-2778] - Upgrade to Apache ActiveMQ 5.12.2
+ * [SM-2779|http://issues.apache.org/jira/browse/SM-2779] - Release Apache ServiceMix 6.0.3
+ * [SM-2806|http://issues.apache.org/jira/browse/SM-2806] - Ensure ServiceMix uses Apache Commons Collections 3.2.2
+ * [SM-2808|http://issues.apache.org/jira/browse/SM-2808] - Avoid warnings about 'parent.relativePath' during the maven build
+ * [SM-2858|http://issues.apache.org/jira/browse/SM-2858] - Upgrade to Apache ActiveMQ 5.12.3
+ * [SM-2861|http://issues.apache.org/jira/browse/SM-2861] - Upgrade to Apache Karaf 3.0.6
+
+{tip}
+This release affects applications using ObjectMessages. Please refer to [this page|http://activemq.apache.org/objectmessage.html] for more information.
+{tip}
+
+{tip}
+This release affects applications using Java object de-serialisation with Apache Camel's XStream. Please refer to [this page|http://camel.apache.org/xstream] for more information.
+{tip}
+
+h2. SCM tag
+
+Tag {{servicemix-6.0.3}} is available in [Git|https://git-wip-us.apache.org/repos/asf?p=servicemix.git;a=tag;h=refs/tags/servicemix-6.0.3] (commit id cef22e848d47da2c8947147cbff223ac2968bafb)
+
+h2. Changelog
+
+For a more detailed view of new features and bug fixes, see the [changelog|https://issues.apache.org/jira/browse/SM/fixforversion/12333989]
+
--- name:content pipeline:ssp
<%@ val notes : String %>
-<h2>Downloads : Apache ServiceMix 6.0.3-SNAPSHOT</h2>
+<h2>Downloads : Apache ServiceMix 6.0.3</h2>
-<% render("/downloads/_servicemix6.scaml", Map("version" -> "6.0.3-SNAPSHOT")) %>
+<% render("/downloads/_servicemix6.scaml", Map("version" -> "6.0.3")) %>
<%= unescape(notes) %>
diff --git a/src/main/webapp/downloads/servicemix-6.0.4.page b/src/main/webapp/downloads/servicemix-6.0.4.page
new file mode 100644
index 0000000..8141a1b
--- /dev/null
+++ b/src/main/webapp/downloads/servicemix-6.0.4.page
@@ -0,0 +1,18 @@
+---
+title: ServiceMix 6.0.4-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/12334376]
+
+--- name:content pipeline:ssp
+<%@ val notes : String %>
+
+<h2>Downloads : Apache ServiceMix 6.0.4-SNAPSHOT</h2>
+
+<% render("/downloads/_servicemix6.scaml", Map("version" -> "6.0.4-SNAPSHOT")) %>
+
+<%= unescape(notes) %>
diff --git a/src/main/webapp/downloads/servicemix-6.1.0.page b/src/main/webapp/downloads/servicemix-6.1.0.page
index 6c1ae40..e9e98ab 100644
--- a/src/main/webapp/downloads/servicemix-6.1.0.page
+++ b/src/main/webapp/downloads/servicemix-6.1.0.page
@@ -36,6 +36,6 @@
<h2>Downloads : Apache ServiceMix 6.1.0</h2>
-<% render("/downloads/_servicemix6.scaml", Map("version" -> "6.1.0")) %>
+<% render("/downloads/_servicemix6.scaml", Map("version" -> "6.1.0", "archive" -> true)) %>
<%= unescape(notes) %>
diff --git a/src/main/webapp/downloads/servicemix-6.1.1.page b/src/main/webapp/downloads/servicemix-6.1.1.page
index 2d4b29f..9fcdf55 100644
--- a/src/main/webapp/downloads/servicemix-6.1.1.page
+++ b/src/main/webapp/downloads/servicemix-6.1.1.page
@@ -1,18 +1,71 @@
---
-title: ServiceMix 6.1.1-SNAPSHOT
+title: ServiceMix 6.1.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 [3.0.6|http://karaf.apache.org/index/community/download/karaf-3.0.6-release.html] 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.2|http://camel.apache.org/camel-2162-release.html] of [Camel|http://camel.apache.org]
+* Version [3.1.4|https://cxf.apache.org/cxf-314-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/12333877]
+h2. Release notes
+
+h3. Bug
+ * [SM-2251|http://issues.apache.org/jira/browse/SM-2251] - Intermittent test failure in JMSAppenderTest
+ * [SM-2824|http://issues.apache.org/jira/browse/SM-2824] - Missing dependencies in system folder
+ * [SM-2848|http://issues.apache.org/jira/browse/SM-2848] - cxf-wsn-client client fails due to wrong slf4j version
+ * [SM-2850|http://issues.apache.org/jira/browse/SM-2850] - JMSAppenderTest.testReconnectToBroker fails
+ * [SM-2851|http://issues.apache.org/jira/browse/SM-2851] - Some itests fail accidentally with NPE
+ * [SM-2854|http://issues.apache.org/jira/browse/SM-2854] - Doclint for Javadoc fails on JDK 8
+ * [SM-2864|http://issues.apache.org/jira/browse/SM-2864] - Update example README.txt files for new Karaf commands
+
+h3. Improvement
+ * [SM-2395|http://issues.apache.org/jira/browse/SM-2395] - Download pages should correctly refer the documentation pages
+
+h3. Task
+ * [SM-2751|http://issues.apache.org/jira/browse/SM-2751] - Release Apache ServiceMix 6.1.1
+ * [SM-2752|http://issues.apache.org/jira/browse/SM-2752] - Upgrade to depends-maven-plugin 1.3.1
+ * [SM-2753|http://issues.apache.org/jira/browse/SM-2753] - Use maven properties like `${project.build.outputDirectory}` instead of `target/classes`
+ * [SM-2763|http://issues.apache.org/jira/browse/SM-2763] - Upgrade to Activiti 5.19.0.1
+ * [SM-2778|http://issues.apache.org/jira/browse/SM-2778] - Upgrade to Apache ActiveMQ 5.12.2
+ * [SM-2803|http://issues.apache.org/jira/browse/SM-2803] - Refactor the assembly creation
+ * [SM-2806|http://issues.apache.org/jira/browse/SM-2806] - Ensure ServiceMix uses Apache Commons Collections 3.2.2
+ * [SM-2807|http://issues.apache.org/jira/browse/SM-2807] - Upgrade to Apache POM 17
+ * [SM-2808|http://issues.apache.org/jira/browse/SM-2808] - Avoid warnings about 'parent.relativePath' during the maven build
+ * [SM-2819|http://issues.apache.org/jira/browse/SM-2819] - Upgrade to Pax Exam 4.8.0
+ * [SM-2821|http://issues.apache.org/jira/browse/SM-2821] - Upgrade to Apache Camel 2.16.2
+ * [SM-2822|http://issues.apache.org/jira/browse/SM-2822] - Upgrade Maven-bundle-plugin to version 3.0.1
+ * [SM-2826|http://issues.apache.org/jira/browse/SM-2826] - Upgrade to ServiceMix Specs 2.6.0
+ * [SM-2844|http://issues.apache.org/jira/browse/SM-2844] - Upgrade to Activiti 5.19.0.2
+ * [SM-2849|http://issues.apache.org/jira/browse/SM-2849] - Upgrade to Jackson 2.6.3
+ * [SM-2858|http://issues.apache.org/jira/browse/SM-2858] - Upgrade to Apache ActiveMQ 5.12.3
+ * [SM-2861|http://issues.apache.org/jira/browse/SM-2861] - Upgrade to Apache Karaf 3.0.6
+
+{tip}
+This release affects applications using ObjectMessages. Please refer to [this page|http://activemq.apache.org/objectmessage.html] for more information.
+{tip}
+
+{tip}
+This release affects applications using Java object de-serialisation with Apache Camel's XStream. Please refer to [this page|http://camel.apache.org/xstream] for more information.
+{tip}
+
+h2. SCM tag
+
+Tag {{servicemix-6.1.1}} is available in [Git|https://git-wip-us.apache.org/repos/asf?p=servicemix.git;a=tag;h=refs/tags/servicemix-6.1.1] (commit id a5a22f10387df8fd3e8e253e6cf31d3f0f19b239)
+
+h2. Changelog
+
+For a more detailed view of new features and bug fixes, see the [changelog|https://issues.apache.org/jira/browse/SM/fixforversion/12333877]
+
--- name:content pipeline:ssp
<%@ val notes : String %>
-<h2>Downloads : Apache ServiceMix 6.1.1-SNAPSHOT</h2>
+<h2>Downloads : Apache ServiceMix 6.1.1</h2>
-<% render("/downloads/_servicemix6.scaml", Map("version" -> "6.1.1-SNAPSHOT")) %>
+<% render("/downloads/_servicemix6.scaml", Map("version" -> "6.1.1")) %>
<%= unescape(notes) %>
diff --git a/src/main/webapp/downloads/servicemix-6.1.2.page b/src/main/webapp/downloads/servicemix-6.1.2.page
new file mode 100644
index 0000000..c6bd62a
--- /dev/null
+++ b/src/main/webapp/downloads/servicemix-6.1.2.page
@@ -0,0 +1,18 @@
+---
+title: ServiceMix 6.1.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/12334244]
+
+--- name:content pipeline:ssp
+<%@ val notes : String %>
+
+<h2>Downloads : Apache ServiceMix 6.1.2-SNAPSHOT</h2>
+
+<% render("/downloads/_servicemix6.scaml", Map("version" -> "6.1.2-SNAPSHOT")) %>
+
+<%= unescape(notes) %>
diff --git a/src/main/webapp/index.page b/src/main/webapp/index.page
index 5fe2b4e..03ee074 100644
--- a/src/main/webapp/index.page
+++ b/src/main/webapp/index.page
@@ -29,8 +29,8 @@
{column}
{center}
*[Download ServiceMix 7.0.0.M1|/downloads.html]*
-*[Download ServiceMix 6.1.0|/downloads/servicemix-6.1.0.html]*
-*[Download ServiceMix 6.0.2|/downloads/servicemix-6.0.2.html]*
+*[Download ServiceMix 6.1.1|/downloads/servicemix-6.1.1.html]*
+*[Download ServiceMix 6.0.3|/downloads/servicemix-6.0.3.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 34b19db..1c0d4dd 100644
--- a/src/main/webapp/news.page
+++ b/src/main/webapp/news.page
@@ -8,6 +8,9 @@
h2. Older news items
+* [ServiceMix 5.5.3 Release | servicemix-553-released]
+* [ServiceMix 5.4.3 Release | servicemix-543-released]
+* [ServiceMix 7.0.0.M1 Release | servicemix-700M1-released]
* [ServiceMix 6.0.2 Release | servicemix-602-released]
* [ServiceMix 5.5.2 Release | servicemix-552-released]
* [ServiceMix 6.1.0 Release | servicemix-610-released]
diff --git a/src/main/webapp/news/recent.page b/src/main/webapp/news/recent.page
index 8db1e00..aaaf9be 100644
--- a/src/main/webapp/news/recent.page
+++ b/src/main/webapp/news/recent.page
@@ -2,9 +2,8 @@
title: Apache ServiceMix Recent News
--- pipeline:conf
+{include:servicemix-611-released}
+{include:servicemix-603-released}
{include:community_news_march_2016}
{include:servicemix-560-released}
-{include:servicemix-553-released}
-{include:servicemix-543-released}
-{include:servicemix-700M1-released}
diff --git a/src/main/webapp/news/servicemix-603-released.page b/src/main/webapp/news/servicemix-603-released.page
new file mode 100644
index 0000000..ca3b7df
--- /dev/null
+++ b/src/main/webapp/news/servicemix-603-released.page
@@ -0,0 +1,18 @@
+---
+title: ServiceMix 6.0.3 Released
+--- pipeline:conf
+
+h2. ServiceMix 6.0.3 released
+
+The ServiceMix team is pleased to announce the availability of Apache ServiceMix 6.0.3.
+This new patch release includes few bug fixes and picks up new versions of Apache ActiveMQ
+and Apache Karaf.
+
+Major dependency versions for this release:
+* Activiti 5.17.0
+* Apache ActiveMQ 5.12.3
+* Apache Camel 2.15.5
+* Apache CXF 3.0.6
+* Apache Karaf 3.0.6
+
+For more information, please see the [release notes|/downloads/servicemix-6.0.3]
diff --git a/src/main/webapp/news/servicemix-611-released.page b/src/main/webapp/news/servicemix-611-released.page
new file mode 100644
index 0000000..90fb616
--- /dev/null
+++ b/src/main/webapp/news/servicemix-611-released.page
@@ -0,0 +1,18 @@
+---
+title: ServiceMix 6.1.1 Released
+--- pipeline:conf
+
+h2. ServiceMix 6.1.1 released
+
+The ServiceMix team is pleased to announce the availability of Apache ServiceMix 6.1.1.
+This new patch release includes few bug fixes and picks up new versions of Apache ActiveMQ,
+Apache Camel and Apache Karaf.
+
+Major dependency versions for this release:
+* Activiti 5.19.0.2
+* Apache ActiveMQ 5.12.3
+* Apache Camel 2.16.2
+* Apache CXF 3.1.4
+* Apache Karaf 3.0.6
+
+For more information, please see the [release notes|/downloads/servicemix-6.1.1]
