diff --git 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 index c25de01d0..565ce4769 100644 --- 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 diff --git 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 index 8694abb38..8334c5f17 100644 --- 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. diff --git 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 index cb3f623de..33ce605aa 100644 --- 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 diff --git 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 index f98b29966..de156f6be 100644 --- 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. diff --git 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 index a4510354c..35536849b 100644 --- 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. diff --git 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 index 67cddbbea..5290bc697 100644 --- 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 diff --git 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 index 1f82337c2..97cabfce8 100644 --- 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. diff --git 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 index 93a05c6e5..812ab484d 100644 --- 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 diff --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 index 1f7384c74..ff11650fa 100644 --- 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. diff --git 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 index dfdfa9c86..47b077e98 100644 --- 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. diff --git 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 index 994df1f39..2cad11814 100644 --- 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 diff --git 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 index 2f028c965..23fb3e44c 100644 --- 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. diff --git 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 index 07be48de1..7970421af 100644 --- 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}. diff --git 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 index 536c35e56..504366c56 100644 --- 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}. diff --git 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 index 76500cdc3..130bcbe3f 100644 --- 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 Netscape Cookie File Format diff --git 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 index d80c725d5..eb97c54ff 100644 --- 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. diff --git 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 index 599469050..46a2ae486 100644 --- 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. diff --git 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 index 6bae6e101..146d11700 100644 --- 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. diff --git 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 index e699bb0b5..799975846 100644 --- 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. diff --git 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 index 647dbe80f..b6e1c0d50 100644 --- 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 diff --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 index 10c817b61..068323a75 100644 --- 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. diff --git 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 index bd7c00ada..88ec1509f 100644 --- 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. diff --git 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 index 2b534a1f4..d67e84495 100644 --- 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. diff --git 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 index 8df0475fe..8d803233a 100644 --- 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. diff --git 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 index 9d20d7a70..2ffed12fb 100644 --- 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. diff --git 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 index ddf438553..ee89615b6 100644 --- 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 diff --git 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 index 5de1a64f2..697d58cf2 100644 --- 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; /** diff --git 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 index deff7b244..ebc82e962 100644 --- 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 diff --git 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 index d6c686fb6..db577c047 100644 --- 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 diff --git 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 index 827385854..84a4d5a1a 100644 --- 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. diff --git 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 index 37f4c7986..81d3811fa 100644 --- 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 diff --git 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 index ed62707a5..98a8447bc 100644 --- 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. diff --git 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 index 0dd29e9de..6c8f843c8 100644 --- 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.