Skip to content

Commit c31096b

Browse files
committed
use JGit 7.5.0 & GraalVM for JDK 25
1 parent 99ab397 commit c31096b

10 files changed

Lines changed: 30 additions & 24 deletions

File tree

.github/workflows/gradle-build.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
branches: [ main ]
66
pull_request:
77
branches: [ main ]
8+
# Manually triggered via the Actions UI
9+
workflow_dispatch:
810

911
jobs:
1012
build:
@@ -13,16 +15,16 @@ jobs:
1315
strategy:
1416
matrix:
1517
os: [ubuntu-latest, windows-latest]
16-
java-version: [17, 21]
18+
java-version: [17, 21, 25]
1719
graalvm-distribution: ['graalvm-community']
1820
fail-fast: false
1921

2022
steps:
2123
- name: Git checkout
22-
uses: actions/checkout@v4
24+
uses: actions/checkout@v6
2325

2426
- name: Verify Gradle Wrapper
25-
uses: gradle/actions/wrapper-validation@v3
27+
uses: gradle/actions/wrapper-validation@v5
2628

2729
- name: Set up GraalVM ${{ matrix.graalvm-distribution }} for Java ${{ matrix.java-version }}
2830
uses: graalvm/setup-graalvm@v1
@@ -43,4 +45,9 @@ jobs:
4345
- name: Build with Gradle Wrapper (Windows)
4446
run: .\gradlew.bat --no-daemon --info nativeCompile
4547
if: runner.os == 'Windows'
48+
env:
49+
# Needed for Windows; to resolve issue with temp folder during native image build, due to
50+
# relativization problem when different drives are used, such as in GHA runners.
51+
# https://github.com/graalvm/native-build-tools/issues/754
52+
GRADLE_OPTS: -Djava.io.tmpdir=${{ runner.temp }}
4653

.github/workflows/maven-build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
branches: [ main ]
66
pull_request:
77
branches: [ main ]
8+
# Manually triggered via the Actions UI
9+
workflow_dispatch:
810

911
jobs:
1012
build:
@@ -13,13 +15,13 @@ jobs:
1315
strategy:
1416
matrix:
1517
os: [ubuntu-latest, windows-latest]
16-
java-version: [17, 21]
18+
java-version: [17, 21, 25]
1719
graalvm-distribution: ['graalvm-community']
1820
fail-fast: false
1921

2022
steps:
2123
- name: Git checkout
22-
uses: actions/checkout@v4
24+
uses: actions/checkout@v6
2325

2426
- name: Set up GraalVM ${{ matrix.graalvm-distribution }} for Java ${{ matrix.java-version }}
2527
uses: graalvm/setup-graalvm@v1
@@ -43,14 +45,14 @@ jobs:
4345

4446
- name: Package Linux artifact
4547
if: runner.os == 'Linux'
46-
uses: actions/upload-artifact@v4
48+
uses: actions/upload-artifact@v6
4749
with:
4850
name: JGitHttpServer ${{ runner.os }} native image with SubstrateVM for Java ${{ matrix.java-version }}
4951
path: target/JGitHttpServer
5052

5153
- name: Package Windows artifacts
5254
if: runner.os == 'Windows'
53-
uses: actions/upload-artifact@v4
55+
uses: actions/upload-artifact@v6
5456
with:
5557
name: JGitHttpServer ${{ runner.os }} native image with SubstrateVM for Java ${{ matrix.java-version }}
5658
path: target/JGitHttpServer.exe

.mvn/wrapper/maven-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
# under the License.
1717
wrapperVersion=3.3.2
1818
distributionType=only-script
19-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
plugins {
22
id 'application'
3-
id 'org.graalvm.buildtools.native' version '0.10.6'
3+
id 'org.graalvm.buildtools.native' version '0.11.3'
44
}
55

66
tasks.wrapper {
7-
gradleVersion = '8.14.2'
7+
gradleVersion = '9.2.1'
88
distributionType = Wrapper.DistributionType.ALL
99
}
1010

1111
group = 'com.github.chirontt.jgit'
1212
description = "JGit HTTP server's native executable built by GraalVM"
13-
version = '7.3.0'
13+
version = '7.5.0'
1414

1515
ext {
1616
mainClassName = 'com.github.chirontt.gitserver.JGitHttpServer'
17-
jgitReleaseVersion = '7.3.0.202506031305-r'
18-
jettyVersion = '12.0.22'
17+
jgitReleaseVersion = '7.5.0.202512021534-r'
18+
jettyVersion = '12.1.5'
1919
slf4jVersion = '2.0.17'
2020
}
2121

gradle/wrapper/gradle-wrapper.jar

1.83 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.github.chirontt.jgit</groupId>
66
<artifactId>jgit.http.server.native</artifactId>
7-
<version>7.3.0</version>
7+
<version>7.5.0</version>
88
<packaging>jar</packaging>
99

1010
<name>JGitHttpServer</name> <!-- name of the resulting native executable -->
@@ -13,10 +13,10 @@
1313
<properties>
1414
<maven.compiler.release>17</maven.compiler.release>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
<jgit.release.version>7.3.0.202506031305-r</jgit.release.version>
17-
<jetty.version>12.0.22</jetty.version>
16+
<jgit.release.version>7.5.0.202512021534-r</jgit.release.version>
17+
<jetty.version>12.1.5</jetty.version>
1818
<slf4j.version>2.0.17</slf4j.version>
19-
<native.maven.plugin.version>0.10.6</native.maven.plugin.version>
19+
<native.maven.plugin.version>0.11.3</native.maven.plugin.version>
2020
<!-- main class name for exec:exec plugin task -->
2121
<exec.mainClass>com.github.chirontt.gitserver.JGitHttpServer</exec.mainClass>
2222
<!-- default values for server port, path to git repos, and path to LFS storage -->

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ private static void setUpLfsServlets(List<Path> repos, ServletContextHandler con
159159
}
160160
try {
161161
//set up the LFS file locking servlet for this repo
162+
// MemoryLfsLockManager lockManager = new MemoryLfsLockManager(repoPath);
162163
FileLfsLockManager lockManager = new FileLfsLockManager(Paths.get(lfsPath, repoName), repoPath);
163164
context.addServlet(new ServletHolder(new LfsFileLockingServlet(lockManager, repoPath)),
164165
"/" + repoName + FILE_LOCKING_API_PATH);

0 commit comments

Comments
 (0)