From 7f441b9ef370b73fa5532909f44bcecf0fe66296 Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Tue, 20 Feb 2024 10:47:10 +0100
Subject: [PATCH] jetty-9.4.53: trying to explicitly require geronimo JTA 1.1.1
 by gateway bundle

---
 java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF       | 3 ++-
 .../definitions/race-analysis-p2-remote.target                 | 2 --
 pom.xml                                                        | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
index 7aeed74c81b..d2a5f15a23d 100644
--- a/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
@@ -20,7 +20,8 @@ Import-Package: com.sap.sailing.server,
  org.json.simple.parser,
  org.osgi.framework;version="1.3.0",
  org.osgi.util.tracker;version="1.3.1"
-Require-Bundle: org.eclipse.osgi,
+Require-Bundle: org.apache.geronimo.specs.geronimo-jta_1.1_spec;bundle-version="1.1.1",
+ org.eclipse.osgi,
  com.sap.sailing.domain,
  com.sap.sailing.expeditionconnector,
  com.sap.sailing.declination,
diff --git a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
index 2aa6f263cf0..abc5a60db54 100755
--- a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
+++ b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
@@ -358,9 +358,7 @@
 <plugin id="org.objectweb.asm.util.source"/>
 <plugin id="org.objectweb.asm.analysis"/>
 <plugin id="org.objectweb.asm.analysis.source"/>
-<!-- The following seems redundant when javax.transaction comes with the JDK until Java8; it may be necessary for Java>8 maybe
 <plugin id="org.apache.geronimo.specs.geronimo-jta_1.1_spec"/>
--->
 <plugin id="org.mortbay.jasper.apache-el"/>
 <plugin id="org.mortbay.jasper.apache-jsp"/>
 <plugin id="org.eclipse.jetty.apache-jsp"/>
diff --git a/pom.xml b/pom.xml
index cb228c6ae7e..87d402e3b58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
             <name>!ldi.releaseBuild</name>
           </property>
         </activation>
-        <!-- The repository declarations are only active when running ion a non Lean DI environment.
+        <!-- The repository declarations are only active when running in a non Lean DI environment.
              On Lean DI we are not allowed to define our own repositories because everything must be hosted in SAP's Nexus server. -->
         <repositories>
           <repository>