Skip to content

Commit

Permalink
use JGit 7.1.0 version
Browse files Browse the repository at this point in the history
  • Loading branch information
chirontt committed Feb 16, 2025
1 parent 6aab098 commit 606f290
Show file tree
Hide file tree
Showing 11 changed files with 354 additions and 576 deletions.
117 changes: 0 additions & 117 deletions .mvn/wrapper/MavenWrapperDownloader.java

This file was deleted.

Binary file removed .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
9 changes: 5 additions & 4 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
20 changes: 9 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
plugins {
id 'application'
id 'org.graalvm.buildtools.native' version '0.10.2'
id 'org.graalvm.buildtools.native' version '0.10.5'
}

tasks.wrapper {
gradleVersion = '8.8'
gradleVersion = '8.12.1'
distributionType = Wrapper.DistributionType.ALL
}

group = 'com.github.chirontt'
version = '6.10.0'
version = '7.1.0'
description = 'JGit PGM native executable built by GraalVM'

ext {
mainClassName = 'com.github.chirontt.jgit.graalvm.NativeMain'
jgitReleaseVersion = '6.10.0.202406032230-r'
commonsCompressVersion = '1.26.1'
slf4jVersion = '2.0.13'
xzVersion = '1.9'
jgitReleaseVersion = '7.1.0.202411261347-r'
slf4jVersion = '2.0.16'
xzVersion = '1.10'
graalvmVersion = '22.3.5'
currentPlatform = getCurrentPlatform()
}
Expand All @@ -43,11 +42,8 @@ compileJava {

dependencies {
implementation("org.eclipse.jgit:org.eclipse.jgit.pgm:$jgitReleaseVersion") {
//exclude vulnerable transitive dependency versions
exclude group: 'org.apache.commons', module: 'commons-compress'
exclude group: 'org.slf4j', module: '*'
}
implementation "org.apache.commons:commons-compress:$commonsCompressVersion"
implementation "org.slf4j:slf4j-simple:$slf4jVersion"

//optional, but required by GraalVM native-image build
Expand Down Expand Up @@ -115,7 +111,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 {
Expand Down Expand Up @@ -163,6 +159,8 @@ graalvmNative {

//packages/classes to be re-initialized at native image run time
def runTimeReInitClasses = [
'org.apache.sshd.common.random.JceRandom:rerun',
'org.apache.sshd.common.random.JceRandom$Cache:rerun',
//all BouncyCastle classes are required to be initialized at build time
//(specified in the BouncyCastleFeature class), but due to SecureRandom seeding
//in their static initialization blocks, some BouncyCastle classes need be
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 4 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down Expand Up @@ -84,7 +86,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
Loading

0 comments on commit 606f290

Please sign in to comment.