Revert "Upgrade JGit to 5.3.4.201908231101-r"
This reverts commit 068dc28e19
.
Reason for revert: The JGit upgrade broke the build.
Bug: Issue 11373
Change-Id: I1992d275da6c6013f72b45114134cf79d326b9d1
This commit is contained in:
@@ -34,12 +34,9 @@ import com.google.gerrit.testing.ConfigSuite;
|
|||||||
import com.google.inject.Injector;
|
import com.google.inject.Injector;
|
||||||
import com.google.inject.Module;
|
import com.google.inject.Module;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import org.eclipse.jgit.errors.ConfigInvalidException;
|
|
||||||
import org.eclipse.jgit.lib.Config;
|
import org.eclipse.jgit.lib.Config;
|
||||||
import org.eclipse.jgit.lib.StoredConfig;
|
|
||||||
import org.eclipse.jgit.storage.file.FileBasedConfig;
|
import org.eclipse.jgit.storage.file.FileBasedConfig;
|
||||||
import org.eclipse.jgit.util.FS;
|
import org.eclipse.jgit.util.FS;
|
||||||
import org.eclipse.jgit.util.SystemReader;
|
import org.eclipse.jgit.util.SystemReader;
|
||||||
@@ -172,16 +169,6 @@ public abstract class StandaloneSiteTest {
|
|||||||
public int getTimezone(long when) {
|
public int getTimezone(long when) {
|
||||||
return oldSystemReader.getTimezone(when);
|
return oldSystemReader.getTimezone(when);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public StoredConfig getUserConfig() throws IOException, ConfigInvalidException {
|
|
||||||
return oldSystemReader.getUserConfig();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public StoredConfig getSystemConfig() throws IOException, ConfigInvalidException {
|
|
||||||
return oldSystemReader.getSystemConfig();
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
return oldSystemReader;
|
return oldSystemReader;
|
||||||
}
|
}
|
||||||
|
@@ -15,13 +15,10 @@
|
|||||||
package com.google.gerrit.server.util.time;
|
package com.google.gerrit.server.util.time;
|
||||||
|
|
||||||
import com.google.common.annotations.VisibleForTesting;
|
import com.google.common.annotations.VisibleForTesting;
|
||||||
import java.io.IOException;
|
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
import java.util.function.LongSupplier;
|
import java.util.function.LongSupplier;
|
||||||
import org.eclipse.jgit.errors.ConfigInvalidException;
|
|
||||||
import org.eclipse.jgit.lib.Config;
|
import org.eclipse.jgit.lib.Config;
|
||||||
import org.eclipse.jgit.lib.StoredConfig;
|
|
||||||
import org.eclipse.jgit.storage.file.FileBasedConfig;
|
import org.eclipse.jgit.storage.file.FileBasedConfig;
|
||||||
import org.eclipse.jgit.util.FS;
|
import org.eclipse.jgit.util.FS;
|
||||||
import org.eclipse.jgit.util.SystemReader;
|
import org.eclipse.jgit.util.SystemReader;
|
||||||
@@ -107,16 +104,6 @@ public class TimeUtil {
|
|||||||
public int getTimezone(long when) {
|
public int getTimezone(long when) {
|
||||||
return delegate.getTimezone(when);
|
return delegate.getTimezone(when);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public StoredConfig getUserConfig() throws IOException, ConfigInvalidException {
|
|
||||||
return delegate.getUserConfig();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public StoredConfig getSystemConfig() throws IOException, ConfigInvalidException {
|
|
||||||
return delegate.getSystemConfig();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private TimeUtil() {}
|
private TimeUtil() {}
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
load("//tools/bzl:maven_jar.bzl", "MAVEN_CENTRAL", "maven_jar")
|
load("//tools/bzl:maven_jar.bzl", "MAVEN_CENTRAL", "maven_jar")
|
||||||
|
|
||||||
_JGIT_VERS = "5.3.4.201908231101-r"
|
_JGIT_VERS = "5.3.1.201904271842-r"
|
||||||
|
|
||||||
_DOC_VERS = _JGIT_VERS # Set to _JGIT_VERS unless using a snapshot
|
_DOC_VERS = _JGIT_VERS # Set to _JGIT_VERS unless using a snapshot
|
||||||
|
|
||||||
@@ -40,25 +40,25 @@ def jgit_maven_repos():
|
|||||||
name = "jgit-lib",
|
name = "jgit-lib",
|
||||||
artifact = "org.eclipse.jgit:org.eclipse.jgit:" + _JGIT_VERS,
|
artifact = "org.eclipse.jgit:org.eclipse.jgit:" + _JGIT_VERS,
|
||||||
repository = _JGIT_REPO,
|
repository = _JGIT_REPO,
|
||||||
sha1 = "9946eb0d678c964e3625f0e1a7e1b6570f8cd3b2",
|
sha1 = "dba85014483315fa426259bc1b8ccda9373a624b",
|
||||||
)
|
)
|
||||||
maven_jar(
|
maven_jar(
|
||||||
name = "jgit-servlet",
|
name = "jgit-servlet",
|
||||||
artifact = "org.eclipse.jgit:org.eclipse.jgit.http.server:" + _JGIT_VERS,
|
artifact = "org.eclipse.jgit:org.eclipse.jgit.http.server:" + _JGIT_VERS,
|
||||||
repository = _JGIT_REPO,
|
repository = _JGIT_REPO,
|
||||||
sha1 = "72a27084a3d94259a4db9cdd5d5216f336cd5ada",
|
sha1 = "3287341fca859340a00b51cb5dd3b78b8e532b39",
|
||||||
)
|
)
|
||||||
maven_jar(
|
maven_jar(
|
||||||
name = "jgit-archive",
|
name = "jgit-archive",
|
||||||
artifact = "org.eclipse.jgit:org.eclipse.jgit.archive:" + _JGIT_VERS,
|
artifact = "org.eclipse.jgit:org.eclipse.jgit.archive:" + _JGIT_VERS,
|
||||||
repository = _JGIT_REPO,
|
repository = _JGIT_REPO,
|
||||||
sha1 = "6c172f339a0e3b8ec41f1110c633e0f95fb50366",
|
sha1 = "3585027e83fb44a5de2c10ae9ddbf976593bf080",
|
||||||
)
|
)
|
||||||
maven_jar(
|
maven_jar(
|
||||||
name = "jgit-junit",
|
name = "jgit-junit",
|
||||||
artifact = "org.eclipse.jgit:org.eclipse.jgit.junit:" + _JGIT_VERS,
|
artifact = "org.eclipse.jgit:org.eclipse.jgit.junit:" + _JGIT_VERS,
|
||||||
repository = _JGIT_REPO,
|
repository = _JGIT_REPO,
|
||||||
sha1 = "0a0cecab312275f1a9a5d6a051db71158b4b22c7",
|
sha1 = "3d9ba7e610d6ab5d08dcb1e4ba448b592a34de77",
|
||||||
)
|
)
|
||||||
|
|
||||||
def jgit_dep(name):
|
def jgit_dep(name):
|
||||||
|
Reference in New Issue
Block a user