This is an automated email from the ASF dual-hosted git repository.
mattrpav pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-website.git
The following commit(s) were added to refs/heads/main by this push:
new a899bc1d5 [AMQ-9328] Website updates for ActiveMQ 6 release
a899bc1d5 is described below
commit a899bc1d5f9857f9d563a6ba8c68af13e4c8b8d1
Author: Matt Pavlovich <m...@hyte.io>
AuthorDate: Wed Nov 8 09:52:03 2023 -0600
[AMQ-9328] Website updates for ActiveMQ 6 release
---
src/_includes/nav.html | 2 +-
src/components/classic/documentation.md | 4 ++--
src/components/classic/download/index.md | 2 +-
src/components/classic/index.md | 2 +-
src/components/classic/security.md | 2 +-
src/how-does-activemq-compare-to-artemis.md | 3 +--
src/index.html | 8 +++----
src/jms2.md | 10 +++++---
src/new-features-in-60.md | 36 ++++++++++++++++++++++++++++-
src/security-advisories.md | 2 +-
src/source.md | 2 +-
11 files changed, 55 insertions(+), 18 deletions(-)
diff --git a/src/_includes/nav.html b/src/_includes/nav.html
index f6c20f641..fc6bb7f72 100644
--- a/src/_includes/nav.html
+++ b/src/_includes/nav.html
@@ -17,7 +17,7 @@
<div class="row">
<div class="col-12">
<ul class="multi-column-dropdown">
- <li class="nav-item"><a
class="dropdown-item" href="{{site.baseurl}}/components/classic">ActiveMQ
"Classic"</a></li>
+ <li class="nav-item"><a
class="dropdown-item" href="{{site.baseurl}}/components/classic">ActiveMQ
Classic</a></li>
<li class="nav-item"><a
class="dropdown-item" href="{{site.baseurl}}/components/artemis/">ActiveMQ
Artemis</a></li>
<li class="nav-item"><a
class="dropdown-item" href="{{site.baseurl}}/components/nms">NMS
Clients</a></li>
<li class="nav-item"><a
class="dropdown-item" href="{{site.baseurl}}/components/cms">CMS Client</a></li>
diff --git a/src/components/classic/documentation.md
b/src/components/classic/documentation.md
index 25e40945f..1b2cf753f 100644
--- a/src/components/classic/documentation.md
+++ b/src/components/classic/documentation.md
@@ -1,6 +1,6 @@
---
layout: default_md
-title: ActiveMQ 5 Documentation
+title: ActiveMQ Documentation
title-class: page-title-activemq5
type: activemq5
---
@@ -17,7 +17,7 @@ type: activemq5
* [Community](../../community)
* [Features](../../features)
* [Connectivity](../../connectivity)
-* [Using ActiveMQ 5](../../using-activemq-5)
+* [Using ActiveMQ](../../using-activemq-5)
* [Tools](../../tools)
* [Support](../../support)
* [Developers](../../developers)
diff --git a/src/components/classic/download/index.md
b/src/components/classic/download/index.md
index 6f360bbd6..eea64b444 100644
--- a/src/components/classic/download/index.md
+++ b/src/components/classic/download/index.md
@@ -1,6 +1,6 @@
---
layout: default_md
-title: ActiveMQ 5 Download
+title: ActiveMQ Download
title-class: page-title-activemq5
type: activemq5
---
diff --git a/src/components/classic/index.md b/src/components/classic/index.md
index 7cbec2a7a..bb8224678 100644
--- a/src/components/classic/index.md
+++ b/src/components/classic/index.md
@@ -8,7 +8,7 @@ project_color: pink
Apache ActiveMQ® is the most popular and powerful open source messaging
and [Integration Patterns](../../enterprise-integration-patterns) server.
-Apache ActiveMQ is fast, supports many [Cross Language Clients and
Protocols](../../cross-language-clients), comes with easy to use [Enterprise
Integration Patterns](../../enterprise-integration-patterns) and many [advanced
features](../../features) while fully supporting [JMS 1.1 & JMS
2.0](http://java.sun.com/products/jms/) and J2EE 1.4+\. Apache ActiveMQ is
released under the [Apache](http://www.apache.org/) [2.0
License](http://www.apache.org/licenses/LICENSE-2.0)
+Apache ActiveMQ is fast, supports many [Cross Language Clients and
Protocols](../../cross-language-clients), comes with easy to use [Enterprise
Integration Patterns](../../enterprise-integration-patterns) and many [advanced
features](../../features) while supporting [Jakarta Messaging 3.1, JMS 2.0, and
JMS 1.1](http://java.sun.com/products/jms/) and J2EE 1.4+\. Apache ActiveMQ is
released under the [Apache](http://www.apache.org/) [2.0
License](http://www.apache.org/licenses/LICENSE-2.0)
Grab yourself a [download](../../download), review our [Getting Started
Guide](../../getting-started), surf our [FAQ](../../faq), or start
[contributing](../../contributing).
diff --git a/src/components/classic/security.md
b/src/components/classic/security.md
index 1e609bda3..f4e7814a4 100644
--- a/src/components/classic/security.md
+++ b/src/components/classic/security.md
@@ -5,7 +5,7 @@ title-class: page-title-activemq5
type: activemq5
---
-Details of security problems fixed in released versions of Apache ActiveMQ 5.x
are detailed below.
+Details of security problems fixed in released versions of Apache ActiveMQ 6.x
and 5.x are detailed below.
See the main [Security Advisories](../../security-advisories) page for details
for other components and general information such as reporting new security
issues.
diff --git a/src/how-does-activemq-compare-to-artemis.md
b/src/how-does-activemq-compare-to-artemis.md
index a16d6614f..47d8cd865 100644
--- a/src/how-does-activemq-compare-to-artemis.md
+++ b/src/how-does-activemq-compare-to-artemis.md
@@ -10,5 +10,4 @@ type: activemq5
[Artemis](components/artemis) is the codename used for the HornetQ code that
was donated to the Apache Foundation.
-Artemis will eventually become the successor to ActiveMQ 5.x as ActiveMQ 6.x.
-
+Artemis may eventually become the successor to ActiveMQ 6.x/5.x. ActiveMQ 6.x
is a modernization of ActiveMQ 5.x with support for Jakarta EE.
diff --git a/src/index.html b/src/index.html
index e8bc35f15..d455341dd 100644
--- a/src/index.html
+++ b/src/index.html
@@ -53,13 +53,13 @@ layout: default
<div class="col-lg-6 col-md-auto">
<div class="card card-pink">
<div class="card-body">
- <h4 class="card-title text-pink">ActiveMQ "Classic"</h4>
+ <h4 class="card-title text-pink">ActiveMQ Classic</h4>
<p>Long established, endlessly pluggable architecture serving many
generations of applications.</p>
<ul>
- <li>JMS 1.1 with full client implementation including JNDI</li>
+ <li>Jakarta 3.1, JMS 2.0, and JMS 1.1 with full client
implementation including JNDI</li>
<li>High availability using shared storage</li>
<li>Familiar JMS-based addressing model</li>
- <li>"Network of brokers" for distributing load</li>
+ <li>Network of brokers for distributing load</li>
<li>KahaDB & JDBC options for persistence</li>
</ul>
<a style="margin-top: 10px" href="{{site.baseurl}}/components/classic"
class="btn btn-secondary">Find out more<i class="fa-info-circle fa
btn-icon"></i></a>
@@ -78,7 +78,7 @@ layout: default
<li>Simple & powerful protocol agnostic addressing model</li>
<li>Flexible clustering for distributing load</li>
<li>Advanced journal implementations for low-latency persistence as
well as JDBC</li>
- <li>High feature parity with ActiveMQ "Classic" to ease
migration</li>
+ <li>High feature parity with ActiveMQ Classic to ease migration</li>
<li>Asynchronous mirroring for disaster recovery</li>
<li>Data Driven Load Balance</li>
</ul>
diff --git a/src/jms2.md b/src/jms2.md
index 0b38e5445..e0ab268d0 100644
--- a/src/jms2.md
+++ b/src/jms2.md
@@ -23,7 +23,7 @@ Support for JMS 2.0 also enables building upon this for
transition to Jakarta Me
* Required for Spring 6
* Required for Jakarta EE 9 + 10.
* JMS API Java package name-change only
- * ActiveMQ package names do not change
+ * ActiveMQ package names do not change
This allows for a dependency-update-only approach to the transition without
having to re-code going forward!
@@ -53,7 +53,11 @@ To use the Jakarta transition client available with ActiveMQ
5.18.x in Maven:
<version>${activemq.version}</version>
</dependency>
-Note: Spring bean definitions do not change for Jakarta support:
+Note: With ActiveMQ 6.0, the activemq-client-jakarta module is removed as it
is no longer needed.
+
+### Spring bean usage
+
+Spring bean definitions do not change for Jakarta support.
<bean class="org.apache.activemq.ActiveMQConnectionFactory">
@@ -72,7 +76,7 @@ JIRA|Status|Target Version|Completed Version|Feature|Notes
[AMQ-8322](https://issues.apache.org/jira/browse/AMQ-8322) | merged | 5.18.0 |
5.18.0 | JMSProducer | Produce messages
[AMQ-8321](https://issues.apache.org/jira/browse/AMQ-8321) | merged | 5.18.0 |
5.18.0 | GetBody/isBodyAssignable | Support for checking body type using a
Class<?>
[AMQ-8325](https://issues.apache.org/jira/browse/AMQ-8325) | merged | 6.0.0,
5.18.3 | | XA Connection methods | Updated methods when using XA Transactions
-[AMQ-8464](https://issues.apache.org/jira/browse/AMQ-8464) | merged | 6.0.0,
5.18.3 | | JMSConsumer | .receiveBody(Class<T>) methods
+[AMQ-8464](https://issues.apache.org/jira/browse/AMQ-8464) | PR
[#1046](https://github.com/apache/activemq/pull/1046) | 6.1.0, 5.18.4 | |
JMSConsumer | .receiveBody(Class<T>) methods
[AMQ-8320](https://issues.apache.org/jira/browse/AMQ-8320) | PR
[#982](https://github.com/apache/activemq/pull/982)| 6.1.0, 5.18.4 | | Delivery
Delay | Support for Message DeliveryDelay feature
[AMQ-8324](https://issues.apache.org/jira/browse/AMQ-8324) | PR
[#1045](https://github.com/apache/activemq/pull/1045) | 6.1.0, 5.18.4 | |
JMSProducer features | Completion Listener async send support
[AMQ-8323](https://issues.apache.org/jira/browse/AMQ-8323) | | 6.2.0, 5.18.5 |
| Shared Topic Consumer | Multi-consumer (queue-like) consuming from topic
subscriptions
diff --git a/src/new-features-in-60.md b/src/new-features-in-60.md
index d93048768..3995e3854 100644
--- a/src/new-features-in-60.md
+++ b/src/new-features-in-60.md
@@ -7,6 +7,40 @@ type: activemq5
[Features](features) > [New Features](new-features) > [New Features in
6.0](new-features-in-60)
+ActiveMQ 6 modernizes the ActiveMQ 5 broker engine to support new JDK releases
and provide support for Jakarta EE. This includes support for JMS 2.0 APIs that
are available in Jakarta Messaging 3.1.
-Once [Artemis](components/artemis) reaches a sufficient level of feature
parity with the 5.x code-base it will become ActiveMQ 6. Initial [migration
documentation](components/artemis/migration) is available.
+This release includes performance improvements, enhancements for
observability, and reduction in 3rd-party dependencies.
+### Jakarta 3.1 and JMS 2.0 Support
+
+ActiveMQ 6 supports Jakarta EE namespaces for both client and server. For
details on the transition and the status of support for Jakarta Messaging 3.1
and JMS 2.0 API features, see the [Jakarta/JMS 2 transition page](jms2).
+
+### Requirements
+
+ActiveMQ 6 requires JDK 17 and uses Spring 6 on the broker-side for
configuration.
+
+### New Features
+
+* Jakarta EE namespace support
+* Shared user and password store for messaging and web components (shared JAAS
Realm)
+* Docker image improvements
+* New JMX attributes on Connection
+* Queue expiry check is skipped when queue is paused
+* Jakarta Messaging 3.1/JMS 2.0 support updates: XA transaction and consumer
receiveBody(Class<T>) methods
+* Reduce inflight transaction memory footprint in KahaDB
+* Includes security fix for CVE-2023-46604
+
+### Key Dependency updates
+
+* JDK 17, 21 supported
+* Spring 6
+* Jetty 11.x
+* Apache Camel 4.x
+* Jolokia 2.x
+
+### Deprecated and Removed features
+
+* Solaris support
+* 32-bit support has been removed
+* Removed unnecessary dependencies (jetty-continuation, commons-collections)
+* Removed deprecated 4.x era JournalPersistenceAdapter (JDBCPersistenceAdapter
has been default)
diff --git a/src/security-advisories.md b/src/security-advisories.md
index e73805c57..d0dab2897 100644
--- a/src/security-advisories.md
+++ b/src/security-advisories.md
@@ -6,7 +6,7 @@ type: main
---
Details of security problems fixed in released versions of individual Apache
ActiveMQ components are detailed at:
-* [ActiveMQ "Classic"](components/classic/security)
+* [ActiveMQ Classic](components/classic/security)
* [ActiveMQ Artemis](components/artemis/security)
* [ActiveMQ Apollo](security-advisories-apollo)
diff --git a/src/source.md b/src/source.md
index e8c34f2e4..1dce58fad 100644
--- a/src/source.md
+++ b/src/source.md
@@ -4,7 +4,7 @@ title: Source
title-class: page-title-main
type: main
---
-ActiveMQ 5
+ActiveMQ source code
==========
Web Browsing of the git Repo
