diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2025-07-22 13:47:04 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2025-07-22 13:47:04 +0200 |
commit | 1a64ee9bf9a310eb39f861e733efdb942bfe27da (patch) | |
tree | 7ba64be9ab625259e528d6401cec2091cc7c81cf | |
parent | 23029d8aede6b5b9fefb408642fc23798d527067 (diff) | |
parent | 3376a472d2b537719dac8e07483abb40def4f419 (diff) | |
download | jgit-1a64ee9bf9a310eb39f861e733efdb942bfe27da.tar.gz jgit-1a64ee9bf9a310eb39f861e733efdb942bfe27da.zip |
Merge branch 'stable-7.2' into stable-7.3stable-7.3
* stable-7.2:
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: I2ccea09ce3c5c2a7a228b30b88bac6134bfb3582
-rw-r--r-- | org.eclipse.jgit.packaging/pom.xml | 13 | ||||
-rw-r--r-- | pom.xml | 13 |
2 files changed, 26 insertions, 0 deletions
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 6a37f0adf7..068712868a 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> @@ -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> |