Skip to content

Commit 83dc4e3

Browse files
committed
Update for 7.1.0.202411261347-r
- update Java version to 17 - adapt Main class to changed signing APIs
1 parent 5861a5a commit 83dc4e3

File tree

6 files changed

+27
-27
lines changed

6 files changed

+27
-27
lines changed

.classpath

+2-18
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" output="target/classes" path="src">
3+
<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
44
<attributes>
55
<attribute name="optional" value="true"/>
66
<attribute name="maven.pomderived" value="true"/>
77
</attributes>
88
</classpathentry>
9-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
9+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
1010
<attributes>
1111
<attribute name="maven.pomderived" value="true"/>
1212
</attributes>
@@ -16,21 +16,5 @@
1616
<attribute name="maven.pomderived" value="true"/>
1717
</attributes>
1818
</classpathentry>
19-
<classpathentry kind="src" path="target/generated-sources/annotations">
20-
<attributes>
21-
<attribute name="optional" value="true"/>
22-
<attribute name="maven.pomderived" value="true"/>
23-
<attribute name="ignore_optional_problems" value="true"/>
24-
<attribute name="m2e-apt" value="true"/>
25-
</attributes>
26-
</classpathentry>
27-
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
28-
<attributes>
29-
<attribute name="optional" value="true"/>
30-
<attribute name="maven.pomderived" value="true"/>
31-
<attribute name="ignore_optional_problems" value="true"/>
32-
<attribute name="m2e-apt" value="true"/>
33-
</attributes>
34-
</classpathentry>
3519
<classpathentry kind="output" path="target/classes"/>
3620
</classpath>

.project

+11
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,15 @@
2020
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2121
<nature>org.eclipse.jdt.core.javanature</nature>
2222
</natures>
23+
<filteredResources>
24+
<filter>
25+
<id>1733244779460</id>
26+
<name></name>
27+
<type>30</type>
28+
<matcher>
29+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
30+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
31+
</matcher>
32+
</filter>
33+
</filteredResources>
2334
</projectDescription>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
encoding/src=UTF-8

.settings/org.eclipse.jdt.core.prefs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
eclipse.preferences.version=1
2-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
3-
org.eclipse.jdt.core.compiler.compliance=11
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
3+
org.eclipse.jdt.core.compiler.compliance=17
44
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
55
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
66
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
77
org.eclipse.jdt.core.compiler.processAnnotations=disabled
8-
org.eclipse.jdt.core.compiler.release=disabled
9-
org.eclipse.jdt.core.compiler.source=11
8+
org.eclipse.jdt.core.compiler.release=enabled
9+
org.eclipse.jdt.core.compiler.source=17
1010
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
1111
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
1212
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<name>jgit maven build test</name>
99

1010
<properties>
11-
<java.version>11</java.version>
12-
<jgit-version>7.0.0.202409031743-r</jgit-version>
11+
<java.version>17</java.version>
12+
<jgit-version>7.1.0.202411261347-r</jgit-version>
1313
</properties>
1414

1515
<build>
@@ -41,7 +41,7 @@
4141
</snapshots>
4242
<id>jgit-oss-staging</id>
4343
<name>JGit OSS staging repository</name>
44-
<url>https://oss.sonatype.org/content/repositories/orgeclipsejgit-1205</url>
44+
<url>https://oss.sonatype.org/content/repositories/orgeclipsejgit-1206</url>
4545
<layout>default</layout>
4646
</repository>
4747
</repositories>

src/org/eclipse/jgit/build/test/Main.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
import java.nio.file.Files;
55

66
import org.eclipse.jgit.lfs.Lfs;
7-
import org.eclipse.jgit.lib.GpgSigner;
7+
import org.eclipse.jgit.lib.GpgConfig.GpgFormat;
88
import org.eclipse.jgit.lib.Repository;
9+
import org.eclipse.jgit.lib.Signer;
10+
import org.eclipse.jgit.lib.Signers;
911
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
1012
import org.eclipse.jgit.transport.SshSessionFactory;
1113

@@ -15,7 +17,8 @@ public static void main(String[] args) throws IOException {
1517
Repository db = FileRepositoryBuilder.create(Files.createTempDirectory("jgit-build-test").toFile());
1618
Lfs lfs = new Lfs(db);
1719
System.out.println(lfs.getLfsObjDir());
18-
GpgSigner signer = GpgSigner.getDefault();
20+
21+
Signer signer = Signers.get(GpgFormat.OPENPGP);
1922
System.out.println(signer.getClass().getCanonicalName());
2023
SshSessionFactory sshFactory = SshSessionFactory.getInstance();
2124
System.out.println(sshFactory.getClass().getCanonicalName());

0 commit comments

Comments
 (0)