Skip to content

Commit 8d91af7

Browse files
committed
use JGit 7.5.0 & GraalVM for JDK 25
1 parent ad194bb commit 8d91af7

File tree

9 files changed

+36
-25
lines changed

9 files changed

+36
-25
lines changed

.github/workflows/gradle-build.yml

Lines changed: 12 additions & 5 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: ['liberica']
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
@@ -48,10 +50,15 @@ jobs:
4850
- name: Build with Gradle Wrapper (Windows)
4951
run: .\gradlew.bat --no-daemon --info nativeCompile
5052
if: runner.os == 'Windows'
53+
env:
54+
# Needed for Windows; to resolve issue with temp folder during native image build, due to
55+
# relativization problem when different drives are used, such as in GHA runners.
56+
# https://github.com/graalvm/native-build-tools/issues/754
57+
GRADLE_OPTS: -Djava.io.tmpdir=${{ runner.temp }}
5158

5259
- name: Package Linux artifacts
5360
if: runner.os == 'Linux'
54-
uses: actions/upload-artifact@v4
61+
uses: actions/upload-artifact@v6
5562
with:
5663
name: jgit ${{ runner.os }} native image with SubstrateVM for Java ${{ matrix.java-version }}
5764
path: |
@@ -60,7 +67,7 @@ jobs:
6067
6168
- name: Package Windows artifacts
6269
if: runner.os == 'Windows'
63-
uses: actions/upload-artifact@v4
70+
uses: actions/upload-artifact@v6
6471
with:
6572
name: jgit ${{ runner.os }} native image with SubstrateVM for Java ${{ matrix.java-version }}
6673
path: |

.github/workflows/maven-build.yml

Lines changed: 4 additions & 2 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: ['liberica']
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

.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: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
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'
12-
version = '7.3.0'
12+
version = '7.5.0'
1313
description = 'JGit PGM native executable built by GraalVM'
1414

1515
ext {
1616
mainClassName = 'com.github.chirontt.jgit.graalvm.NativeMain'
17-
jgitReleaseVersion = '7.3.0.202506031305-r'
17+
jgitReleaseVersion = '7.5.0.202512021534-r'
1818
slf4jVersion = '2.0.17'
19-
xzVersion = '1.10'
19+
xzVersion = '1.11'
2020
graalvmVersion = '22.3.5'
2121
currentPlatform = getCurrentPlatform()
2222
}
@@ -136,12 +136,18 @@ graalvmNative {
136136
def buildTimeInitClasses = [
137137
'com.google.gson',
138138
'com.sun.beans.introspect.ClassInfo',
139+
'com.sun.beans.introspect.ClassInfo$1',
139140
'com.sun.beans.introspect.PropertyInfo',
141+
'com.sun.beans.util.Cache$Kind$1',
142+
'com.sun.beans.util.Cache$Kind$2',
143+
'com.sun.beans.util.Cache$Kind$3',
140144
'java.beans.Introspector',
145+
'java.beans.Introspector$1',
141146
'org.apache.sshd',
142147
'org.eclipse.jetty',
143148
'org.eclipse.jgit',
144149
'org.slf4j',
150+
'sun.security.jgss.GSSManagerImpl',
145151
]
146152

147153
//packages/classes to be initialized at native image run time

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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

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

1010
<name>jgit</name> <!-- name of the resulting native executable -->
@@ -13,11 +13,11 @@
1313
<properties>
1414
<maven.compiler.release>17</maven.compiler.release>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
<native.maven.plugin.version>0.10.6</native.maven.plugin.version>
17-
<jgit.release.version>7.3.0.202506031305-r</jgit.release.version>
16+
<native.maven.plugin.version>0.11.3</native.maven.plugin.version>
17+
<jgit.release.version>7.5.0.202512021534-r</jgit.release.version>
1818
<slf4j.version>2.0.17</slf4j.version>
1919
<graalvm.version>22.3.5</graalvm.version>
20-
<xz.version>1.10</xz.version>
20+
<xz.version>1.11</xz.version>
2121
<jgit.mainClass>com.github.chirontt.jgit.graalvm.NativeMain</jgit.mainClass>
2222
<jgit.args></jgit.args>
2323
<!-- system properties for the application when run by exec:exec command;
@@ -30,7 +30,7 @@
3030
</feature.classes>
3131
<!-- packages/classes to be initialized at native image build time -->
3232
<build.time.init>
33-
com.google.gson,com.sun.beans.introspect.ClassInfo,com.sun.beans.introspect.PropertyInfo,java.beans.Introspector,org.apache.sshd,org.eclipse.jetty,org.eclipse.jgit,org.slf4j
33+
com.google.gson,com.sun.beans.introspect.ClassInfo,com.sun.beans.introspect.ClassInfo$1,com.sun.beans.introspect.PropertyInfo,com.sun.beans.util.Cache$Kind$1,com.sun.beans.util.Cache$Kind$2,com.sun.beans.util.Cache$Kind$3,java.beans.Introspector,java.beans.Introspector$1,org.apache.sshd,org.eclipse.jetty,org.eclipse.jgit,org.slf4j,sun.security.jgss.GSSManagerImpl
3434
</build.time.init>
3535
<!-- packages/classes to be initialized at native image run time -->
3636
<run.time.init>

0 commit comments

Comments
 (0)