Merge branch 'stable-6.9' into stable-6.10stable-6.10

* stable-6.9:
  MergeToolTest: update expected error from the tool
  Add dash license check for 3rd party dependencies
  Prepare 5.13.5-SNAPSHOT builds
  JGit v5.13.4.202507202350-r
  AmazonS3: Do not accept DOCTYPE and entities
  ManifestParser: Do not accept DOCTYPE and entities
  AdvertisedRequestValidator: fix WantNotValidException caused by race
  Prepare 5.13.4-SNAPSHOT builds
  Fix packaging build

Change-Id: Id42981e23f88ffcfb565a9d3418e6a8899bad0bc

3 files changed, 28 insertions, 2 deletions

diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index 63cdb92419..789963a059 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -30,7 +30,7 @@
 
   <properties>
     <java.version>11</java.version>
-    <tycho-version>4.0.8</tycho-version>
+    <tycho-version>4.0.13</tycho-version>
     <target-platform>jgit-4.32</target-platform>
     <project.build.outputTimestamp>${git.commit.time}</project.build.outputTimestamp>
   </properties>
@@ -189,6 +189,19 @@
               </rules>
             </configuration>
           </execution>
+          <execution>
+            <id>enforce-java</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireJavaVersion>
+                  <version>17</version>
+                </requireJavaVersion>
+              </rules>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java
index 6a95f9a2d3..6339831a40 100644
--- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java
+++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java
@@ -93,7 +93,7 @@ public class MergeToolTest extends ToolTestCase {
 
 		createMergeConflict();
 
-		String araxisErrorLine = "compare: unrecognized option `-wait' @ error/compare.c/CompareImageCommand/1123.";
+		String araxisErrorLine = "compare-im6.q16: unrecognized option `-wait' @ error/compare.c/CompareImageCommand/1131.";
 		String[] expectedErrorOutput = { araxisErrorLine, araxisErrorLine, };
 		runAndCaptureUsingInitRaw(Arrays.asList(expectedErrorOutput),
 				MERGE_TOOL, "--no-prompt");
diff --git a/pom.xml b/pom.xml
index bb60ee05d3..0762920c6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -404,6 +404,19 @@
               </rules>
             </configuration>
           </execution>
+          <execution>
+            <id>enforce-java</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireJavaVersion>
+                  <version>17</version>
+                </requireJavaVersion>
+              </rules>
+            </configuration>
+          </execution>
         </executions>
       </plugin>