Releasing 6.0.0.M1

git-svn-id: https://svn.apache.org/repos/asf/servicemix/website/trunk@1656245 13f79535-47bb-0310-9956-ffa450edef68
apache · Jan 31, 2015 · 08d9a20 · 08d9a20
1 parent 97c070d
commit 08d9a20
Show file tree

Hide file tree

Showing 9 changed files with 215 additions and 3 deletions.
diff --git a/src/main/scala/org/apache/servicemix/website/Helper.scala b/src/main/scala/org/apache/servicemix/website/Helper.scala
@@ -114,7 +114,8 @@ object Helper {
   val location : ReleaseArtifact => String = _ match {
     case ReleaseArtifact(Release(version, _), _, _, _) if version.startsWith("3") => "servicemix-3"
     case ReleaseArtifact(Release(version, _), _, _, _) if version.startsWith("4") => "servicemix-4"
-    case _ => "servicemix-5"
+    case ReleaseArtifact(Release(version, _), _, _, _) if version.startsWith("5") => "servicemix-5"
+    case _ => "servicemix-6"
   }
 
   val versionOf : ReleaseArtifact => String = _.release.version

diff --git a/src/main/webapp/community/releases-schedule.page b/src/main/webapp/community/releases-schedule.page
@@ -14,6 +14,6 @@ h2. ServiceMix
 | servicemix-5.2.x | 2.3.9 | 2.14.1 | 5.10.0 | 3.0.2 | 5 / 6 / 7 | Transition Stable between 5.1.x and 5.4.x/In Maintenance | 5.2.0 | 5.2.1 |  |
 | servicemix-5.3.x | 2.4.1 | 2.13.3 | 5.10.0 | 2.7.13 | 7 / 8 | Transition Stable between 5.1.x and 5.4.x/In Maintenance | 5.3.1 | 5.3.2 |  |
 | servicemix-5.4.x | 2.4.1 | 2.14.1 | 5.10.0 | 3.0.2 | 7 / 8 | Development | 5.4.0 | 5.4.1 |  |
-| master (6.0.x) | 3.0.3 | 2.14.1 | 5.10.0 | 3.0.2 | 6 / 7 / 8| Development |  | 6.0.0 |  |
+| master (6.0.x) | 3.0.3 | 2.14.1 | 5.10.0 | 3.0.2 | 6 / 7 / 8| Development | 6.0.0.M1 | 6.0.0.M2 |  |
 
 Please refer the [Karaf Releases Schedule|http://karaf.apache.org/index/community/releases-schedule.html] for more details.
diff --git a/src/main/webapp/downloads.page b/src/main/webapp/downloads.page
@@ -9,6 +9,7 @@ The latest release is the [ServiceMix 5.4.0 Release|/downloads/servicemix-5.4.0.
 
 h2. Other Releases
 
+* [Apache ServiceMix 6.0.0.M1|/downloads/servicemix-6.0.0.M1.html]
 * [Apache ServiceMix 5.3.1|/downloads/servicemix-5.3.1.html] 
 * [Apache ServiceMix 5.2.0|/downloads/servicemix-5.2.0.html]
 * [Apache ServiceMix 5.1.4|/downloads/servicemix-5.1.4.html]

diff --git a/src/main/webapp/downloads/_servicemix6.scaml b/src/main/webapp/downloads/_servicemix6.scaml
@@ -0,0 +1,65 @@
+-@ val version: String
+-@ val archive: Boolean = false
+
+-
+  import org.apache.servicemix.website.Release
+  import org.apache.servicemix.website.Helper._
+  implicit val release = Release(version, archive)
+
+%div#downloads
+  - if (isSnapshot(release))
+    %div.alert
+      %p.title
+        This is a development snapshot for an upcoming Apache ServiceMix release.
+        Feel free to use it for testing purposes or to get a sneak preview of new features.
+        For production use, you should download
+        %a{:href => {uri("/downloads.html")}} our latest release
+        instead
+
+  %table
+    %tbody
+      %tr.default
+        %td.first
+          %p.title Default assembly
+          %p Our default assembly is the best way to get started with Apache ServiceMix.
+        %td.links
+          %p.title
+            %a(href="#{download(zip)}")
+              Apache ServiceMix #{version} (zip)
+          - if (isRelease(release))
+            %p.keys
+              %a(href="#{pgp(zip)}") [PGP]
+              %a(href="#{sha1(zip)}") [SHA1]
+              %a(href="#{md5(zip)}") [MD5]
+      - if (isRelease(release))
+        %tr
+          %td.first
+            %p.title Source assembly
+            %p Use this if you want to build Apache ServiceMix from source yourself
+          %td.links
+            %p.title
+              %a(href="#{download(source,zip)}")
+                Apache ServiceMix Sources #{version} (zip)
+            %p.keys
+              %a(href="#{pgp(source,zip)}") [PGP]
+              %a(href="#{sha1(source,zip)}") [SHA1]
+              %a(href="#{md5(source,zip)}") [MD5]
+      %tr
+        %td.first
+          %p.title Documentation
+          %p Links to the documentation pages for this version
+        %td.links
+          %p.title
+            %a{:href => {docs("index.html")}}
+              Documentation for Apache ServiceMix #{release.majorMinorX}
+          %p
+            %a{:href => {docs("quickstart/index.html")}} [Quickstart]
+            %a{:href => {docs("activemq/index.html")}} [ActiveMQ]
+            %a{:href => {docs("activiti/index.html")}} [Activiti]
+            %a{:href => {docs("camel/index.html")}} [Camel]
+
+  %div.info
+    %p.title The above URLs use redirection
+    %p
+      The above URLs use the Apache Mirror system to redirect you to a suitable downloads for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari browsers). If the download doesn't seem to work for you from the above URL then try using
+      %a(href="http://www.mozilla.com/en-US/firefox/") FireFox
diff --git a/src/main/webapp/downloads/servicemix-6.0.0.M1.page b/src/main/webapp/downloads/servicemix-6.0.0.M1.page
@@ -0,0 +1,121 @@
+---
+title: ServiceMix 6.0.0.M1
+--- name:notes pipeline:conf
+
+h2. OSGi components list
+Components included in this release:
+
+This release packages the following dependencies:
+* Version [3.0.2|http://karaf.apache.org/index/community/download/karaf-3.0.2-release.html] of [Apache Karaf|http://karaf.apache.org/]
+* Version [5.10.0|http://activemq.apache.org/activemq-5100-release.html] of [ActiveMQ|http://activemq.apache.org]
+* Version [2.14.1|http://camel.apache.org/camel-2141-release.html] of [Camel|http://camel.apache.org]
+* Version [3.0.2|https://cxf.apache.org/cxf-302-release-notes.html] of [CXF|http://cxf.apache.org]
+
+h2. Release notes
+
+h3. Sub-task
+    * [SM-2303|http://issues.apache.org/jira/browse/SM-2303] - ActiveMQ web console not installable after upgrade to 5.9.1 
+
+h3. Bug
+    * [SM-2244|http://issues.apache.org/jira/browse/SM-2244] - Uninstall activiti feature results in error
+    * [SM-2256|http://issues.apache.org/jira/browse/SM-2256] - Unable to shutdown container when JMS appender is configured
+    * [SM-2267|http://issues.apache.org/jira/browse/SM-2267] - Provide working configuration for activemq-web-console
+    * [SM-2269|http://issues.apache.org/jira/browse/SM-2269] - ActiveMQ quick start doesn't work due to the missing activemq component
+    * [SM-2271|http://issues.apache.org/jira/browse/SM-2271] - Can't install hibernate-envers in SMX5
+    * [SM-2277|http://issues.apache.org/jira/browse/SM-2277] - activiti-camel thrown ActivitiException when put document in delivery folder
+    * [SM-2279|http://issues.apache.org/jira/browse/SM-2279] - The jndi feature can not be installed
+    * [SM-2280|http://issues.apache.org/jira/browse/SM-2280] - Activiti test case fails after upgrade to 5.15.1
+    * [SM-2282|http://issues.apache.org/jira/browse/SM-2282] - Installation of the eventadmin feature fails
+    * [SM-2286|http://issues.apache.org/jira/browse/SM-2286] - Intermittent test failure in ActivitiExamplesTest.testActivitiCamelExample
+    * [SM-2304|http://issues.apache.org/jira/browse/SM-2304] - activemq:bstat fails with error "Attribute Uptime can not be found"
+    * [SM-2305|http://issues.apache.org/jira/browse/SM-2305] - Access to ActiveMQ web console fails
+    * [SM-2309|http://issues.apache.org/jira/browse/SM-2309] - Add itest for camel-cxf-rest example
+    * [SM-2317|http://issues.apache.org/jira/browse/SM-2317] - activemq:browse no more working
+    * [SM-2318|http://issues.apache.org/jira/browse/SM-2318] - Can't install Hibernate 3
+    * [SM-2319|http://issues.apache.org/jira/browse/SM-2319] - Connector feature not in sync with transaction
+    * [SM-2322|http://issues.apache.org/jira/browse/SM-2322] - !<history-number> executes wrong history entry
+    * [SM-2324|http://issues.apache.org/jira/browse/SM-2324] - Use JcaPooledConnectionFactory instead of XaPooledConnectionFactory
+    * [SM-2326|http://issues.apache.org/jira/browse/SM-2326] - Route deployed in deploy directory using activemq does not start after ServiceMix restart 
+    * [SM-2337|http://issues.apache.org/jira/browse/SM-2337] - Can't install release bundles from a custom repository
+    * [SM-2346|http://issues.apache.org/jira/browse/SM-2346] - Can not resolve feature: camel-avro
+    * [SM-2361|http://issues.apache.org/jira/browse/SM-2361] - cxf feature should be present as a boot feature
+    * [SM-2376|http://issues.apache.org/jira/browse/SM-2376] - Incorrect javax.annotation version for java7
+    * [SM-2377|http://issues.apache.org/jira/browse/SM-2377] - Java8 packages related to JavaFX are missing
+    * [SM-2396|http://issues.apache.org/jira/browse/SM-2396] - CXF WSN sample installation fails
+    * [SM-2422|http://issues.apache.org/jira/browse/SM-2422] - Multiple JMS connection factories found for amq-broker
+
+h3. Improvement
+    * [SM-2293|http://issues.apache.org/jira/browse/SM-2293] - Enable optional imports OBR resolution
+    * [SM-2298|http://issues.apache.org/jira/browse/SM-2298] - Add a CXF SOAP with Camel example
+    * [SM-2299|http://issues.apache.org/jira/browse/SM-2299] - Add itest for cxf-wsn example
+    * [SM-2327|http://issues.apache.org/jira/browse/SM-2327] - Improve camel-cxf-rest example
+    * [SM-2341|http://issues.apache.org/jira/browse/SM-2341] - Improve WS-Security demos
+    * [SM-2388|http://issues.apache.org/jira/browse/SM-2388] - Add "update-strategy" to camel-blueprint example
+
+h3. New Feature
+    * [SM-2288|http://issues.apache.org/jira/browse/SM-2288] - Add drools feature
+    * [SM-2381|http://issues.apache.org/jira/browse/SM-2381] - Web Script Console Plugin
+
+h3. Task
+    * [SM-2223|http://issues.apache.org/jira/browse/SM-2223] - Incorrect Information on Remote-debugging ServiceMix in Eclipse
+    * [SM-2229|http://issues.apache.org/jira/browse/SM-2229] - Upgrade to activiti version 5.15.1
+    * [SM-2245|http://issues.apache.org/jira/browse/SM-2245] - Upgrade to Pax Exam 3.5.0
+    * [SM-2270|http://issues.apache.org/jira/browse/SM-2270] - Merge ServiceMix archetypes with ServiceMix code base
+    * [SM-2274|http://issues.apache.org/jira/browse/SM-2274] - Upgrade to Camel 2.13.0
+    * [SM-2276|http://issues.apache.org/jira/browse/SM-2276] - Upgrade to Karaf 3.0.1
+    * [SM-2281|http://issues.apache.org/jira/browse/SM-2281] - Upgrade to Karaf 2.3.5
+    * [SM-2283|http://issues.apache.org/jira/browse/SM-2283] - Align some versions duplicated after the Activiti upgrade
+    * [SM-2292|http://issues.apache.org/jira/browse/SM-2292] - Upgrade to Camel 2.13.1
+    * [SM-2294|http://issues.apache.org/jira/browse/SM-2294] - Cleanup nonexisting cxf dependencies from dependency management
+    * [SM-2295|http://issues.apache.org/jira/browse/SM-2295] - Change the target/source level in compiler plugin to 1.6
+    * [SM-2296|http://issues.apache.org/jira/browse/SM-2296] - Add the boot features to the system repository
+    * [SM-2306|http://issues.apache.org/jira/browse/SM-2306] - Update the README file
+    * [SM-2307|http://issues.apache.org/jira/browse/SM-2307] - Add itest for camel-cxf-soap example
+    * [SM-2308|http://issues.apache.org/jira/browse/SM-2308] - Add itest for camel-drools-blueprint example
+    * [SM-2312|http://issues.apache.org/jira/browse/SM-2312] - Remove placeholder configuration from the activemq-camel blueprint 
+    * [SM-2313|http://issues.apache.org/jira/browse/SM-2313] - Trying to get person with unknown end with error in camel-cxf-soap example
+    * [SM-2314|http://issues.apache.org/jira/browse/SM-2314] - Trying to get person with unknown end with error in camel-cxf-rest example
+    * [SM-2315|http://issues.apache.org/jira/browse/SM-2315] - activemq:dstat fails after any messagin operation is performed
+    * [SM-2316|http://issues.apache.org/jira/browse/SM-2316] - Problems when reinstalling the drools examples
+    * [SM-2321|http://issues.apache.org/jira/browse/SM-2321] - Upgrade to Karaf 3.0.2
+    * [SM-2328|http://issues.apache.org/jira/browse/SM-2328] - Upgrade to ActiveMQ 5.10.0
+    * [SM-2332|http://issues.apache.org/jira/browse/SM-2332] - Remove Alfresco repository from org.ops4j.pax.url.mvn.cfg
+    * [SM-2340|http://issues.apache.org/jira/browse/SM-2340] - Upgrade to Camel 2.13.2
+    * [SM-2354|http://issues.apache.org/jira/browse/SM-2354] - Upgrade to maven-bundle-plugin 2.5.0
+    * [SM-2359|http://issues.apache.org/jira/browse/SM-2359] - Upgrade to Pax Exam 4.1.0
+    * [SM-2362|http://issues.apache.org/jira/browse/SM-2362] - Require JDK 7 for build
+    * [SM-2367|http://issues.apache.org/jira/browse/SM-2367] - Upgrade to Felix BundleRepository 2.0.2 
+    * [SM-2368|http://issues.apache.org/jira/browse/SM-2368] - Upgrade to Camel 2.14.0 and CXF 3.0.2
+    * [SM-2372|http://issues.apache.org/jira/browse/SM-2372] - Upgrade to Pax Exam 4.2.0
+    * [SM-2380|http://issues.apache.org/jira/browse/SM-2380] - Create a overview page with servicemix roadmap
+    * [SM-2392|http://issues.apache.org/jira/browse/SM-2392] - Upgrade to Pax Exam 4.3.0
+    * [SM-2393|http://issues.apache.org/jira/browse/SM-2393] - Upgrade to Activiti 5.16.4
+    * [SM-2398|http://issues.apache.org/jira/browse/SM-2398] - Upgrade maven plugins
+    * [SM-2399|http://issues.apache.org/jira/browse/SM-2399] - Upgrade to Apache POM 15 
+    * [SM-2400|http://issues.apache.org/jira/browse/SM-2400] - Upgrade to Felix maven-bundle-plugin 2.5.3
+    * [SM-2402|http://issues.apache.org/jira/browse/SM-2402] - Use correct cxf.codegen-plugin version
+    * [SM-2403|http://issues.apache.org/jira/browse/SM-2403] - Upgrade to maven-surefire-plugin 2.18
+    * [SM-2409|http://issues.apache.org/jira/browse/SM-2409] - Upgrade to Pax Exam 4.4.0
+    * [SM-2411|http://issues.apache.org/jira/browse/SM-2411] - Upgrade to Camel 2.14.1
+    * [SM-2421|http://issues.apache.org/jira/browse/SM-2421] - Upgrade to ActiveMQ 5.10.1
+    * [SM-2424|http://issues.apache.org/jira/browse/SM-2424] - Release Apache ServiceMix 6.0.0.M1
+
+h3. Test
+    * [SM-2255|http://issues.apache.org/jira/browse/SM-2255] - Intermittent test failure in StatsTest
+
+h2. SCM tag
+
+Tag {{servicemix-6.0.0.M1}} is available in [Git|https://git-wip-us.apache.org/repos/asf?p=servicemix.git;a=tag;h=refs/tags/servicemix-6.0.0.M1] (commit id d65fb6093df416228e020da69d7337be4993f99f)
+
+h2. Changelog
+
+For a more detailed view of new features and bug fixes, see the [changelog|https://issues.apache.org/jira/browse/SM/fixforversion/12326661]
+
+--- name:content pipeline:ssp
+<%@ val notes : String %>
+
+<h2>Downloads : Apache ServiceMix 6.0.0.M1</h2>
+
+<% render("/downloads/_servicemix6.scaml", Map("version" -> "6.0.0.M1")) %>
+
+<%= unescape(notes) %>
diff --git a/src/main/webapp/downloads/servicemix-6.0.0.page b/src/main/webapp/downloads/servicemix-6.0.0.page
@@ -13,6 +13,6 @@ An overview of outstanding JIRA issues for this release can be found at [https:/
 
 <h2>Downloads : Apache ServiceMix 6.0.0-SNAPSHOT</h2>
 
-<% render("/downloads/_servicemix5.scaml", Map("version" -> "6.0.0-SNAPSHOT")) %>
+<% render("/downloads/_servicemix6.scaml", Map("version" -> "6.0.0-SNAPSHOT")) %>
 
 <%= unescape(notes) %>
diff --git a/src/main/webapp/index.page b/src/main/webapp/index.page
@@ -28,6 +28,7 @@ Applications for ServiceMix can be built using:
 {column}
 {column}
 {center}
+*[Download ServiceMix 6.0.0.M1|/downloads/servicemix-6.0.0.M1.html]*
 *[Download ServiceMix 5.4.0|/downloads.html]*
 [!/images/servicemix-box.jpg|width=256!|/downloads.html]
 {center}

diff --git a/src/main/webapp/news/recent.page b/src/main/webapp/news/recent.page
@@ -2,6 +2,7 @@
 title: Apache ServiceMix Recent News
 --- pipeline:conf
 
+{include:servicemix-600M1-released}
 {include:servicemix-540-released}
 {include:servicemix-531-released}
 {include:servicemix-520-released}

diff --git a/src/main/webapp/news/servicemix-600M1-released.page b/src/main/webapp/news/servicemix-600M1-released.page
@@ -0,0 +1,22 @@
+---
+title: ServiceMix 6.0.0.M1 Released
+--- pipeline:conf
+
+h2. ServiceMix 6.0.0.M1 released
+
+The ServiceMix team is pleased to announce the availability of Apache ServiceMix 6.0.0.M1.
+
+!! This is a technology preview release of Apache ServiceMix, and should NOT be considered production ready !!
+
+Apache ServiceMix 6.0.0 will be the first release based on Karaf 3.0.x, which includes numerous new features.
+Apache ServiceMix 6.0.0.M1 is the first preview release of the new 6.0.x line. We ask that users provide the 
+community with their feed back so that the full Apache ServiceMix 6.0.0 release can be as feature complete and stable as possible.
+
+Major dependency versions for this release:
+* Activiti 5.16.4
+* Apache ActiveMQ 5.10.0
+* Apache Camel 2.14.1
+* Apache CXF 3.0.2
+* Apache Karaf 3.0.2
+
+For more information, please see the [release notes|/downloads/servicemix-6.0.0.M1]