aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2025-07-22 13:53:48 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2025-07-22 13:53:48 +0200
commit6b8eff9847f5ef32b46ab1a847d3fbd7113fec5e (patch)
tree9b48d48f6558dc621f991b71ad7978d0108fa195
parentd9ac2f31e0ac931e57ec11f0ce76eaea8b459c75 (diff)
parent1a64ee9bf9a310eb39f861e733efdb942bfe27da (diff)
downloadjgit-6b8eff9847f5ef32b46ab1a847d3fbd7113fec5e.tar.gz
jgit-6b8eff9847f5ef32b46ab1a847d3fbd7113fec5e.zip
Merge branch 'stable-7.3'
* stable-7.3: 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: I5f3ce2b22ef6b4b25ab25d84e22e5e65f67b9f1b
-rw-r--r--org.eclipse.jgit.packaging/pom.xml13
-rw-r--r--pom.xml13
2 files changed, 26 insertions, 0 deletions
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index 69b57de3d9..74d39560f1 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -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/pom.xml b/pom.xml
index df11d93ba1..2015b48ab1 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>