You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2022/04/12 16:32:41 UTC

[jmeter] 02/02: Revert "Update ActiveMQ to 5.17.0"

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit e457b35cbc92af2a28dc73f5028cb0f142bba227
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Tue Apr 12 18:31:48 2022 +0200

    Revert "Update ActiveMQ to 5.17.0"
    
    This reverts commit 76d1de31243a942591a107f6d58e030daa1e4d55.
    
    Seems, that Java 9+ is needed. JMeter has to be able to run
    with Java 8.
---
 checksum.xml      | 1 -
 gradle.properties | 4 ++--
 xdocs/changes.xml | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/checksum.xml b/checksum.xml
index 0a6f0a06c2..f0b151d799 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -88,7 +88,6 @@
     <trusted-key id='67631bc0568801c3' group='io.github.microutils' />
     <trusted-key id='602ec18d20c4661c' group='io.github.x-stream' />
     <trusted-key id='6425559c47cc79c4' group='javax.activation' />
-    <trusted-key id='6425559c47cc79c4' group='javax.annotation' />
     <trusted-key id='6425559c47cc79c4' group='javax.mail' />
     <trusted-key id='6425559c47cc79c4' group='javax.servlet' />
     <trusted-key id='4044edf1bb73efea' group='jaxen' />
diff --git a/gradle.properties b/gradle.properties
index 4cbbdfc605..6caea8bcf3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -57,7 +57,7 @@ org.sonarqube.version=3.0
 
 # Dependencies
 accessors-smart.version=2.4.8
-activemq.version=5.17.0
+activemq.version=5.16.4
 apache-rat.version=0.13
 apiguardian-api.version=1.1.0
 asm.version=9.2
@@ -130,7 +130,7 @@ rsyntaxtextarea.version=3.1.6
 Saxon-HE.version=11.2
 slf4j.version=1.7.36
 spock-core.version=2.0-M2-groovy-3.0
-springframework.version=5.3.18
+springframework.version=4.3.17.RELEASE
 svgSalamander.version=1.1.2.4
 tika.version=1.28.1
 xalan.version=2.7.2
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 7534a8d46b..321ee336dd 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -171,7 +171,7 @@ however, the profile can't be updated while the test is running.
   <li><bug>65232</bug>Hide splash screen when an error is displayed because the test plan could not be parsed.</li>
   <li>Updated Groovy to 3.0.9 (from 3.0.7).</li>
   <li>Updated Darklaf to 2.7.3 (from 2.5.4).</li>
-  <li>Updated Apache ActiveMQ to 15.7.0 (from 15.6.0).</li>
+  <li>Updated Apache ActiveMQ to 15.6.4 (from 15.6.0).</li>
   <li>Updated Asm to 9.2 (from 9.1).</li>
   <li>Updated Bouncycastle to 1.69 (from 1.67).</li>
   <li>Updated Caffeine to 2.9.3 (from 2.8.8).</li>