use JGit 7.2.0 and Jetty 12 versions

Author: chirontt

.github/workflows/gradle-build.yml

@@ -19,23 +19,17 @@ jobs:
 
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Verify Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      - name: Cache Gradle packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle-
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: Set up GraalVM ${{ matrix.graalvm-distribution }} for Java ${{ matrix.java-version }}
         uses: graalvm/setup-graalvm@v1
         with:
           java-version: ${{ matrix.java-version }}
           distribution: ${{ matrix.graalvm-distribution }}
+          cache: 'gradle'
 
       - name: Report Java version
         run: |

.github/workflows/maven-build.yml

@@ -19,13 +19,14 @@ jobs:
 
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up GraalVM ${{ matrix.graalvm-distribution }} for Java ${{ matrix.java-version }}
         uses: graalvm/setup-graalvm@v1
         with:
           java-version: ${{ matrix.java-version }}
           distribution: ${{ matrix.graalvm-distribution }}
+          cache: 'maven'
 
       - name: Report Java version
         run: |
@@ -42,14 +43,14 @@ jobs:
 
       - name: Package Linux artifact
         if: runner.os == 'Linux'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: JGitHttpServer ${{ runner.os }} native image with SubstrateVM for Java ${{ matrix.java-version }}
           path: target/JGitHttpServer
 
       - name: Package Windows artifacts
         if: runner.os == 'Windows'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: JGitHttpServer ${{ runner.os }} native image with SubstrateVM for Java ${{ matrix.java-version }}
           path: target/JGitHttpServer.exe

README.md

@@ -1,9 +1,12 @@
 # JGit HTTP Server + GraalVM native image
 
+[![Github Actions Build Status](https://github.com/chirontt/jgit.http.server.native/actions/workflows/gradle-build.yml/badge.svg)](https://github.com/chirontt/jgit.http.server.native/actions/workflows/gradle-build.yml)
+[![Github Actions Build Status](https://github.com/chirontt/jgit.http.server.native/actions/workflows/maven-build.yml/badge.svg)](https://github.com/chirontt/jgit.http.server.native/actions/workflows/maven-build.yml)
+
 Sample project to compile JGit HTTP server, with LFS server support, to native executable
 using GraalVM native-image utility.
 
-[JGit](http://www.eclipse.org/jgit/) is a pure Java implementation of the Git version control system,
+[JGit](https://projects.eclipse.org/projects/technology.jgit) is a pure Java implementation of the Git version control system,
 and is available as a library to be integrated into many projects.
 The JGit [project](https://github.com/eclipse-jgit/jgit) also implements a
 [git server](https://github.com/eclipse-jgit/jgit/tree/master/org.eclipse.jgit.http.server)
@@ -54,21 +57,21 @@ To generate native executable, run the `nativeCompile` task:
 The `nativeCompile` task would take a while to compile the source code and link into an executable file.
 The resulting `JGitHttpServer` file is in:
 
-	build/native-image/JGitHttpServer
+	build/native/nativeCompile/JGitHttpServer
 
 (or if building on a Windows machine:
 
-	build\native-image\JGitHttpServer.exe
+	build\native\nativeCompile\JGitHttpServer.exe
 
 )
 
 which can then be run directly (with parameters):
 
-	./build/native-image/JGitHttpServer 8080 /path/to/repos /path/to/lfs/storage
+	./build/native/nativeCompile/JGitHttpServer 8080 /path/to/repos /path/to/lfs/storage
 
 (or if building on a Windows machine:
 
-	build\native-image\JGitHttpServer.exe 8080 \path\to\repos \path\to\lfs\storage
+	build\native\nativeCompile\JGitHttpServer.exe 8080 \path\to\repos \path\to\lfs\storage
 
 )
 
@@ -88,30 +91,21 @@ To generate native executable, run the `package` task:
 The `package` task would take a while to compile the source code and link into an executable file.
 The resulting `JGitHttpServer` file is in:
 
-	target/native-image/JGitHttpServer
+	target/JGitHttpServer
 
 (or if building on a Windows machine:
 
-	target\native-image\JGitHttpServer.exe
+	target\JGitHttpServer.exe
 
 )
 
 which can then be run directly (with parameters):
 
-	./target/native-image/JGitHttpServer 8080 /path/to/repos /path/to/lfs/storage
+	./target/JGitHttpServer 8080 /path/to/repos /path/to/lfs/storage
 
 (or if building on a Windows machine:
 
-	target\native-image\JGitHttpServer.exe 8080 \path\to\repos \path\to\lfs\storage
+	target\JGitHttpServer.exe 8080 \path\to\repos \path\to\lfs\storage
 
 )
 
-## Compressed native executable
-
-The resulting `JGitHttpServer` executable file, whether produced by Gradle or Maven build scripts,
-can be further reduced in size via compression using the [UPX](https://upx.github.io) utility,
-as described [here](https://medium.com/graalvm/compressed-graalvm-native-images-4d233766a214).
-
-As an example, the resulting `JGitHttpServer.exe` native application file produced in Windows
-is normally 35MB in size, but is compressed to 10MB with the UPX command: `upx --best JGitHttpServer.exe`
-

build.gradle

@@ -1,38 +1,41 @@
 plugins {
     id 'application'
-    id 'org.graalvm.buildtools.native' version '0.10.4'
+    id 'org.graalvm.buildtools.native' version '0.10.6'
 }
 
 tasks.wrapper {
-    gradleVersion = '8.12'
+    gradleVersion = '8.13'
     distributionType = Wrapper.DistributionType.ALL
 }
 
 group = 'com.github.chirontt.jgit'
 description = "JGit HTTP server's native executable built by GraalVM"
-version = '7.1.0'
+version = '7.2.0'
 
 ext {
     mainClassName = 'com.github.chirontt.gitserver.JGitHttpServer'
-    jgitReleaseVersion = '7.1.0.202411261347-r'
-    jettyVersion = '11.0.24'
-    slf4jVersion = '2.0.16'
+    jgitReleaseVersion = '7.2.0.202503040940-r'
+    jettyVersion = '12.0.18'
+    slf4jVersion = '2.0.17'
 }
 
 repositories {
     mavenCentral()
+    maven {
+        url = "https://repo.eclipse.org/content/groups/releases/"
+    }
     mavenLocal()
 }
 
 compileJava {
-    options.release = 11  //use JDK11+ for compiling & running
+    options.release = 17
     options.encoding = 'UTF-8'
 }
 
 dependencies {
     implementation "org.eclipse.jgit:org.eclipse.jgit.http.server:$jgitReleaseVersion"
     implementation "org.eclipse.jgit:org.eclipse.jgit.lfs.server:$jgitReleaseVersion"
-    implementation "org.eclipse.jetty:jetty-servlet:$jettyVersion"
+    implementation "org.eclipse.jetty.ee10:jetty-ee10-servlet:$jettyVersion"
     implementation "org.slf4j:slf4j-simple:$slf4jVersion"
 }
 
@@ -84,7 +87,7 @@ task uberJar(type: Jar) {
         configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
     }
     exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA'
-    duplicatesStrategy 'exclude'
+    duplicatesStrategy = 'exclude'
 }
 
 graalvmNative {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -4,19 +4,19 @@
 
     <groupId>com.github.chirontt.jgit</groupId>
     <artifactId>jgit.http.server.native</artifactId>
-    <version>7.1.0</version>
+    <version>7.2.0</version>
     <packaging>jar</packaging>
 
     <name>JGitHttpServer</name> <!-- name of the resulting native executable -->
     <description>JGit HTTP server's native executable built by GraalVM</description>
 
     <properties>
-        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.release>17</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jgit.release.version>7.1.0.202411261347-r</jgit.release.version>
-        <jetty.version>11.0.24</jetty.version>
-        <slf4j.version>2.0.16</slf4j.version>
-        <native.maven.plugin.version>0.10.4</native.maven.plugin.version>
+        <jgit.release.version>7.2.0.202503040940-r</jgit.release.version>
+        <jetty.version>12.0.18</jetty.version>
+        <slf4j.version>2.0.17</slf4j.version>
+        <native.maven.plugin.version>0.10.6</native.maven.plugin.version>
         <!-- main class name for exec:exec plugin task -->
         <exec.mainClass>com.github.chirontt.gitserver.JGitHttpServer</exec.mainClass>
         <!-- default values for server port, path to git repos, and path to LFS storage -->
@@ -45,6 +45,13 @@
         </run.time.re.init>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>eclipse.releases.repository</id>
+            <url>https://repo.eclipse.org/content/groups/releases/</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
@@ -62,8 +69,8 @@
             <version>${slf4j.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-servlet</artifactId>
             <version>${jetty.version}</version>
         </dependency>
     </dependencies>

pom.xml

@@ -21,12 +21,12 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jgit.http.server.GitServlet;
 import org.eclipse.jgit.lfs.server.fs.FileLfsRepository;
 import org.eclipse.jgit.lfs.server.fs.FileLfsServlet;
@@ -93,7 +93,7 @@ public static void main(String[] args) throws Exception {
         server.addConnector(gitConnector);
 
         ServletContextHandler gitContext = new ServletContextHandler(ServletContextHandler.SESSIONS);
-        gitContext.setVirtualHosts(new String[]{"@git-connector"});
+        gitContext.setVirtualHosts(List.of("@git-connector"));
 
         //set up LFS servlets for each valid git repo under base-path
         List<Path> validRepos = getValidGitRepos(basePath);
@@ -129,7 +129,7 @@ private static void printServerInfo() {
 
     private static URI getBaseURI() {
         try (BufferedReader br = new BufferedReader(new InputStreamReader(
-                Runtime.getRuntime().exec("hostname").getInputStream()))) {
+                Runtime.getRuntime().exec(new String[]{"hostname"}).getInputStream()))) {
             String hostname = br.readLine();
             return new URI("http://" + hostname + ":" + serverPort);
         } catch (IOException e) {

src/main/java/com/github/chirontt/gitserver/JGitHttpServer.java

@@ -100,6 +100,10 @@
   "name":"org.eclipse.jgit.diff.DiffAlgorithm$SupportedAlgorithm",
   "methods":[{"name":"values","parameterTypes":[] }]
 },
+{
+  "name":"org.eclipse.jgit.dircache.DirCache$DirCacheVersion",
+  "methods":[{"name":"values","parameterTypes":[] }]
+},
 {
   "name":"org.eclipse.jgit.gitrepo.internal.RepoText",
   "allDeclaredFields":true,
@@ -215,6 +219,18 @@
   "name":"org.eclipse.jgit.lib.CoreConfig$TrustPackedRefsStat",
   "methods":[{"name":"values","parameterTypes":[] }]
 },
+{
+  "name":"org.eclipse.jgit.lib.CoreConfig$TrustStat",
+  "methods":[{"name":"values","parameterTypes":[] }]
+},
+{
+  "name":"org.eclipse.jgit.lib.GpgConfig$GpgFormat",
+  "methods":[{"name":"values","parameterTypes":[] }]
+},
+{
+  "name":"org.eclipse.jgit.transport.HttpConfig$HttpRedirectMode",
+  "methods":[{"name":"values","parameterTypes":[] }]
+},
 {
   "name":"org.eclipse.jgit.transport.http.apache.internal.HttpApacheText",
   "allDeclaredFields":true,