Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4.x: Upgrade jgit to 6.7.0 #7586

Merged
merged 1 commit into from
Sep 14, 2023
Merged

4.x: Upgrade jgit to 6.7.0 #7586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions config/git/src/test/java/io/helidon/config/git/GitConfigSourceBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2022 Oracle and/or its affiliates.
* Copyright (c) 2017, 2023 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -18,8 +18,8 @@

import java.io.File;
import java.io.IOException;
import java.lang.reflect.Method;
import java.net.URI;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.Duration;
import java.util.Map;
Expand All @@ -40,6 +40,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.io.TempDir;
import org.junit.rules.TestName;

import static io.helidon.config.PollingStrategies.regular;
import static io.helidon.config.testing.ValueNodeMatcher.valueNode;
Expand All @@ -60,6 +61,17 @@ public class GitConfigSourceBuilderTest extends RepositoryTestCase {

@BeforeEach
public void setUp(TestInfo testInfo) throws Exception {
String testMethodName = testInfo.getTestMethod()
.map(Method::getName)
.orElse(this.getClass().getName());
/* Hack to let us re-use setup from jgit 6's LocalDiskRepositoryTestCase */
super.currentTest = new TestName() {
@Override
public String getMethodName() {
return testMethodName;
}
};

super.setUp();

git = new Git(db);
Expand Down
2 changes: 1 addition & 1 deletion dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<version.lib.jaxb-runtime>4.0.3</version.lib.jaxb-runtime>
<version.lib.jedis>3.6.3</version.lib.jedis>
<version.lib.jersey>3.1.3</version.lib.jersey>
<version.lib.jgit>5.11.1.202105131744-r</version.lib.jgit>
<version.lib.jgit>6.7.0.202309050840-r</version.lib.jgit>
<version.lib.junit>5.9.3</version.lib.junit>
<version.lib.kafka>3.4.0</version.lib.kafka>
<version.lib.log4j>2.18.0</version.lib.log4j>
Expand Down