Pull request #7043: REPORT-81596 slf4j的包依赖需要调整为third包的

Merge in CORE/base-third from ~MAKSIM/base-third:release/11.0 to release/11.0 * commit 'd7baaf5b1323808e6235c68d0b3c1f54f03d28ce': REPORT-81596 slf4j的包依赖需要调整为third包的
2 years ago · 101fff43e3
33 changed files with 66 additions and 66 deletions
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/api/CommitCommand.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/api/CommitCommand.java
@ -73,8 +73,8 @@ import com.fr.third.eclipse.jgit.treewalk.FileTreeIterator;
 import com.fr.third.eclipse.jgit.treewalk.TreeWalk;
 import com.fr.third.eclipse.jgit.treewalk.TreeWalk.OperationType;
 import com.fr.third.eclipse.jgit.util.ChangeIdUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * A class used to execute a {@code Commit} command. It has setters for all
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/dircache/DirCacheCheckout.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/dircache/DirCacheCheckout.java
@ -75,8 +75,8 @@ import com.fr.third.eclipse.jgit.util.IntList;
 import com.fr.third.eclipse.jgit.util.RawParseUtils;
 import com.fr.third.eclipse.jgit.util.SystemReader;
 import com.fr.third.eclipse.jgit.util.io.EolStreamTypeUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * This class handles checking out one or two trees merging with the index.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/ignore/FastIgnoreRule.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/ignore/FastIgnoreRule.java
@ -19,8 +19,8 @@ import java.text.MessageFormat;
 import com.fr.third.eclipse.jgit.errors.InvalidPatternException;
 import com.fr.third.eclipse.jgit.ignore.internal.PathMatcher;
 import com.fr.third.eclipse.jgit.internal.JGitText;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * "Fast" (compared with IgnoreRule) git ignore rule implementation supporting
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/ignore/IgnoreNode.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/ignore/IgnoreNode.java
@ -23,8 +23,8 @@ import java.util.List;
 import com.fr.third.eclipse.jgit.annotations.Nullable;
 import com.fr.third.eclipse.jgit.errors.InvalidPatternException;
 import com.fr.third.eclipse.jgit.internal.JGitText;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Represents a bundle of ignore rules inherited from a base directory.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/diffmergetool/ToolException.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/diffmergetool/ToolException.java
@ -12,8 +12,8 @@ package com.fr.third.eclipse.jgit.internal.diffmergetool;

 import com.fr.third.eclipse.jgit.util.FS.ExecutionResult;
 import com.fr.third.eclipse.jgit.util.SystemReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Tool exception for differentiation.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/FileRepository.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/FileRepository.java
@ -66,8 +66,8 @@ import com.fr.third.eclipse.jgit.util.IO;
 import com.fr.third.eclipse.jgit.util.RawParseUtils;
 import com.fr.third.eclipse.jgit.util.StringUtils;
 import com.fr.third.eclipse.jgit.util.SystemReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Represents a Git repository. A repository holds all objects and refs used for
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/FileSnapshot.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/FileSnapshot.java
@ -28,8 +28,8 @@ import java.util.concurrent.TimeUnit;
 import com.fr.third.eclipse.jgit.annotations.NonNull;
 import com.fr.third.eclipse.jgit.util.FS;
 import com.fr.third.eclipse.jgit.util.FS.FileStoreAttributes;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Caches when a file was last read, making it possible to detect future edits.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/GC.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/GC.java
@ -87,8 +87,8 @@ import com.fr.third.eclipse.jgit.treewalk.filter.TreeFilter;
 import com.fr.third.eclipse.jgit.util.FileUtils;
 import com.fr.third.eclipse.jgit.util.GitDateParser;
 import com.fr.third.eclipse.jgit.util.SystemReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * A garbage collector for git
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/LockFile.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/LockFile.java
@ -36,8 +36,8 @@ import com.fr.third.eclipse.jgit.lib.ObjectId;
 import com.fr.third.eclipse.jgit.util.FS;
 import com.fr.third.eclipse.jgit.util.FS.LockToken;
 import com.fr.third.eclipse.jgit.util.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Git style file locking and replacement.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/LooseObjects.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/LooseObjects.java
@ -28,8 +28,8 @@ import com.fr.third.eclipse.jgit.lib.Constants;
 import com.fr.third.eclipse.jgit.lib.ObjectId;
 import com.fr.third.eclipse.jgit.lib.ObjectLoader;
 import com.fr.third.eclipse.jgit.util.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Traditional file system based loose objects handler.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/Pack.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/Pack.java
@ -59,8 +59,8 @@ import com.fr.third.eclipse.jgit.lib.ObjectLoader;
 import com.fr.third.eclipse.jgit.util.LongList;
 import com.fr.third.eclipse.jgit.util.NB;
 import com.fr.third.eclipse.jgit.util.RawParseUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * A Git version 2 pack file representation. A pack file contains Git objects in
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/PackDirectory.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/PackDirectory.java
@ -45,8 +45,8 @@ import com.fr.third.eclipse.jgit.lib.ConfigConstants;
 import com.fr.third.eclipse.jgit.lib.ObjectId;
 import com.fr.third.eclipse.jgit.lib.ObjectLoader;
 import com.fr.third.eclipse.jgit.util.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Traditional file system packed objects directory handler.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectory.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectory.java
@ -77,8 +77,8 @@ import com.fr.third.eclipse.jgit.util.IO;
 import com.fr.third.eclipse.jgit.util.RawParseUtils;
 import com.fr.third.eclipse.jgit.util.RefList;
 import com.fr.third.eclipse.jgit.util.RefMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Traditional file system based {@link com.fr.third.eclipse.jgit.lib.RefDatabase}.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectoryRename.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/RefDirectoryRename.java
@ -23,8 +23,8 @@ import com.fr.third.eclipse.jgit.lib.RefUpdate;
 import com.fr.third.eclipse.jgit.lib.RefUpdate.Result;
 import com.fr.third.eclipse.jgit.revwalk.RevWalk;
 import com.fr.third.eclipse.jgit.util.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Rename any reference stored by {@link RefDirectory}.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/transport/http/NetscapeCookieFile.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/transport/http/NetscapeCookieFile.java
@ -39,8 +39,8 @@ import com.fr.third.eclipse.jgit.storage.file.FileBasedConfig;
 import com.fr.third.eclipse.jgit.util.FileUtils;
 import com.fr.third.eclipse.jgit.util.IO;
 import com.fr.third.eclipse.jgit.util.RawParseUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Wraps all cookies persisted in a <strong>Netscape Cookie File Format</strong>
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/lib/GpgSignatureVerifierFactory.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/lib/GpgSignatureVerifierFactory.java
@ -13,8 +13,8 @@ import java.util.Iterator;
 import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;

-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * A {@code GpgSignatureVerifierFactory} creates {@link GpgSignatureVerifier} instances.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/lib/GpgSigner.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/lib/GpgSigner.java
@ -17,8 +17,8 @@ import com.fr.third.eclipse.jgit.annotations.NonNull;
 import com.fr.third.eclipse.jgit.annotations.Nullable;
 import com.fr.third.eclipse.jgit.api.errors.CanceledException;
 import com.fr.third.eclipse.jgit.transport.CredentialsProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Creates GPG signatures for Git objects.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/lib/Repository.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/lib/Repository.java
@ -67,8 +67,8 @@ import com.fr.third.eclipse.jgit.util.FileUtils;
 import com.fr.third.eclipse.jgit.util.IO;
 import com.fr.third.eclipse.jgit.util.RawParseUtils;
 import com.fr.third.eclipse.jgit.util.SystemReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Represents a Git repository.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/lib/RepositoryCache.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/lib/RepositoryCache.java
@ -27,8 +27,8 @@ import com.fr.third.eclipse.jgit.lib.internal.WorkQueue;
 import com.fr.third.eclipse.jgit.util.FS;
 import com.fr.third.eclipse.jgit.util.IO;
 import com.fr.third.eclipse.jgit.util.RawParseUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Cache of active {@link com.fr.third.eclipse.jgit.lib.Repository} instances.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/transport/HttpConfig.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/transport/HttpConfig.java
@ -27,8 +27,8 @@ import com.fr.third.eclipse.jgit.lib.Config;
 import com.fr.third.eclipse.jgit.lib.StoredConfig;
 import com.fr.third.eclipse.jgit.util.StringUtils;
 import com.fr.third.eclipse.jgit.util.SystemReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * A representation of the "http.*" config values in a git
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/transport/PacketLineIn.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/transport/PacketLineIn.java
@ -25,8 +25,8 @@ import com.fr.third.eclipse.jgit.internal.JGitText;
 import com.fr.third.eclipse.jgit.lib.MutableObjectId;
 import com.fr.third.eclipse.jgit.util.IO;
 import com.fr.third.eclipse.jgit.util.RawParseUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Read Git style pkt-line formatting from an input stream.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/transport/PacketLineOut.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/transport/PacketLineOut.java
@ -19,8 +19,8 @@ import java.io.OutputStream;

 import com.fr.third.eclipse.jgit.lib.Constants;
 import com.fr.third.eclipse.jgit.util.RawParseUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Write Git style pkt-line formatting to an output stream.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/transport/SideBandInputStream.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/transport/SideBandInputStream.java
@ -28,8 +28,8 @@ import com.fr.third.eclipse.jgit.internal.JGitText;
 import com.fr.third.eclipse.jgit.lib.ProgressMonitor;
 import com.fr.third.eclipse.jgit.util.IO;
 import com.fr.third.eclipse.jgit.util.RawParseUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Unmultiplexes the data portion of a side-band channel.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/transport/TransportHttp.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/transport/TransportHttp.java
@ -109,8 +109,8 @@ import com.fr.third.eclipse.jgit.util.SystemReader;
 import com.fr.third.eclipse.jgit.util.TemporaryBuffer;
 import com.fr.third.eclipse.jgit.util.io.DisabledOutputStream;
 import com.fr.third.eclipse.jgit.util.io.UnionInputStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Transport over HTTP and FTP protocols.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/FS.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/FS.java
@ -78,8 +78,8 @@ import com.fr.third.eclipse.jgit.treewalk.FileTreeIterator.FileEntry;
 import com.fr.third.eclipse.jgit.treewalk.FileTreeIterator.FileModeStrategy;
 import com.fr.third.eclipse.jgit.treewalk.WorkingTreeIterator.Entry;
 import com.fr.third.eclipse.jgit.util.ProcessResult.Status;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Abstraction to support various file system operations not in Java.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/FS_POSIX.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/FS_POSIX.java
@ -42,8 +42,8 @@ import com.fr.third.eclipse.jgit.errors.ConfigInvalidException;
 import com.fr.third.eclipse.jgit.internal.JGitText;
 import com.fr.third.eclipse.jgit.lib.Repository;
 import com.fr.third.eclipse.jgit.lib.StoredConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Base FS for POSIX based systems
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/FS_Win32.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/FS_Win32.java
@ -29,8 +29,8 @@ import com.fr.third.eclipse.jgit.errors.CommandFailedException;
 import com.fr.third.eclipse.jgit.treewalk.FileTreeIterator.FileEntry;
 import com.fr.third.eclipse.jgit.treewalk.FileTreeIterator.FileModeStrategy;
 import com.fr.third.eclipse.jgit.treewalk.WorkingTreeIterator.Entry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;


 /**
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/FS_Win32_Cygwin.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/FS_Win32_Cygwin.java
@ -23,8 +23,8 @@ import java.util.List;
 import com.fr.third.eclipse.jgit.api.errors.JGitInternalException;
 import com.fr.third.eclipse.jgit.errors.CommandFailedException;
 import com.fr.third.eclipse.jgit.lib.Repository;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * FS implementation for Cygwin on Windows
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/FileUtils.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/FileUtils.java
@ -49,8 +49,8 @@ import java.util.stream.Stream;
 import com.fr.third.eclipse.jgit.internal.JGitText;
 import com.fr.third.eclipse.jgit.lib.Constants;
 import com.fr.third.eclipse.jgit.util.FS.Attributes;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * File Utilities
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/HttpSupport.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/HttpSupport.java
@ -36,8 +36,8 @@ import javax.net.ssl.TrustManager;
 import com.fr.third.eclipse.jgit.internal.JGitText;
 import com.fr.third.eclipse.jgit.transport.http.HttpConnection;
 import com.fr.third.eclipse.jgit.transport.http.NoCheckX509TrustManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Extra utilities to support usage of HTTP.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/Monitoring.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/Monitoring.java
@ -24,8 +24,8 @@ import javax.management.ObjectName;
 import com.fr.third.eclipse.jgit.annotations.Nullable;
 import com.fr.third.eclipse.jgit.errors.ConfigInvalidException;
 import com.fr.third.eclipse.jgit.lib.ConfigConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Enables monitoring JGit via JMX
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/SystemReader.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/SystemReader.java
@ -41,8 +41,8 @@ import com.fr.third.eclipse.jgit.lib.StoredConfig;
 import com.fr.third.eclipse.jgit.storage.file.FileBasedConfig;
 import com.fr.third.eclipse.jgit.util.time.MonotonicClock;
 import com.fr.third.eclipse.jgit.util.time.MonotonicSystemClock;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Interface to read values from the system.
--- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/sha1/SHA1.java
+++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/sha1/SHA1.java
@ -23,8 +23,8 @@ import com.fr.third.eclipse.jgit.lib.MutableObjectId;
 import com.fr.third.eclipse.jgit.lib.ObjectId;
 import com.fr.third.eclipse.jgit.util.NB;
 import com.fr.third.eclipse.jgit.util.SystemReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fr.third.slf4j.Logger;
+import com.fr.third.slf4j.LoggerFactory;

 /**
 * Pure Java implementation of SHA-1 from FIPS 180-1 / RFC 3174.