From c512028d55b65541d66ff5e4c7f534d9c93673ae Mon Sep 17 00:00:00 2001
From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>
Date: Thu, 30 May 2024 11:27:12 +0200
Subject: [PATCH 1/2] revert jctools to 4.0.1

---
 apm-agent-core/pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apm-agent-core/pom.xml b/apm-agent-core/pom.xml
index 54b981fcf2..282b846b0e 100644
--- a/apm-agent-core/pom.xml
+++ b/apm-agent-core/pom.xml
@@ -56,7 +56,9 @@
         <dependency>
             <groupId>org.jctools</groupId>
             <artifactId>jctools-core</artifactId>
-            <version>4.0.3</version>
+            <!-- 4.0.2 and 4.0.3 should be avoided as they don't support java 7
+                see https://github.com/JCTools/JCTools/issues/392 -->
+            <version>4.0.1</version>
         </dependency>
         <dependency>
             <groupId>com.googlecode.concurrentlinkedhashmap</groupId>

From 1a0ec6a89b50ec26b1464f2566efec2dd7a15810 Mon Sep 17 00:00:00 2001
From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>
Date: Thu, 30 May 2024 11:29:08 +0200
Subject: [PATCH 2/2] update changelog

---
 CHANGELOG.asciidoc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index c98b6f6a22..f87aaa5350 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -34,6 +34,10 @@ Use subheadings with the "=====" level for adding notes for unreleased changes:
 [[release-notes-1.x]]
 === Java Agent version 1.x
 
+[float]
+===== Bug fixes
+* Restore compatibility with Java 7 - {pull}3657[#3657]
+
 [[release-notes-1.50.0]]
 ==== 1.50.0 - 2024/05/28