diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2025-07-22 13:39:18 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2025-07-22 13:39:18 +0200 |
| commit | 3376a472d2b537719dac8e07483abb40def4f419 (patch) | |
| tree | f5d85f66b879cbfc3e69cef84bdcf50e6f215545 | |
| parent | c3f354edc72f37cee1d8439c9e060d7f04eede6d (diff) | |
| parent | 870e993f48ec4c3004a47db59860b84665746b0f (diff) | |
| download | jgit-3376a472d2b537719dac8e07483abb40def4f419.tar.gz jgit-3376a472d2b537719dac8e07483abb40def4f419.zip | |
Merge branch 'stable-7.1' into stable-7.2
* stable-7.1:
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: Idfbe64561451814de41cfce21ba14281bd44d283
| -rw-r--r-- | org.eclipse.jgit.packaging/pom.xml | 15 | ||||
| -rw-r--r-- | pom.xml | 13 |
2 files changed, 27 insertions, 1 deletions
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 8952865a10..9a13ec8cd9 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -30,7 +30,7 @@ <properties> <java.version>17</java.version> - <tycho-version>4.0.11</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> @@ -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> |