diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2022-01-05 14:54:39 +0100 |
|---|---|---|
| committer | Thomas Wolf <thomas.wolf@paranor.ch> | 2022-01-05 15:59:09 +0100 |
| commit | f7662a756e325570dd82594613db403a60fd44cb (patch) | |
| tree | e239244d4dca5993370216f995dbff432ff6e4bb /org.eclipse.jgit.pgm | |
| parent | fa82b80c9bce223af71e57151ab62b18bf005064 (diff) | |
| parent | 486afbc08d4689105019f77bf1ca0d1a2fc5ab0f (diff) | |
| download | jgit-f7662a756e325570dd82594613db403a60fd44cb.tar.gz jgit-f7662a756e325570dd82594613db403a60fd44cb.zip | |
Merge branch 'stable-5.13' into stable-6.0
* stable-5.13:
Use slf4j-simple instead of log4j for logging
Update orbit to R20211213173813
Change-Id: I219ef3901c1d908b91bf9c8f00431b22686ff7a5
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.jgit.pgm')
| -rw-r--r-- | org.eclipse.jgit.pgm/build.properties | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit.pgm/pom.xml | 7 | ||||
| -rw-r--r-- | org.eclipse.jgit.pgm/resources/log4j.properties | 6 | ||||
| -rw-r--r-- | org.eclipse.jgit.pgm/resources/simplelogger.properties | 6 |
4 files changed, 8 insertions, 13 deletions
diff --git a/org.eclipse.jgit.pgm/build.properties b/org.eclipse.jgit.pgm/build.properties index 4b38114d09..302dded85a 100644 --- a/org.eclipse.jgit.pgm/build.properties +++ b/org.eclipse.jgit.pgm/build.properties @@ -6,4 +6,4 @@ bin.includes = META-INF/,\ .,\ plugin.properties,\ about.html,\ - resources/log4j.properties + resources/simplelogger.properties diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 28ebaa2cb0..05e0bcc173 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -103,12 +103,7 @@ <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <artifactId>slf4j-simple</artifactId> </dependency> <dependency> diff --git a/org.eclipse.jgit.pgm/resources/log4j.properties b/org.eclipse.jgit.pgm/resources/log4j.properties deleted file mode 100644 index 1496c5a2cf..0000000000 --- a/org.eclipse.jgit.pgm/resources/log4j.properties +++ /dev/null @@ -1,6 +0,0 @@ -log4j.rootLogger=WARN, stderr - -log4j.appender.stderr=org.apache.log4j.ConsoleAppender -log4j.appender.stderr.Target=System.err -log4j.appender.stderr.layout=org.apache.log4j.PatternLayout -log4j.appender.stderr.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
\ No newline at end of file diff --git a/org.eclipse.jgit.pgm/resources/simplelogger.properties b/org.eclipse.jgit.pgm/resources/simplelogger.properties new file mode 100644 index 0000000000..98c19ce01d --- /dev/null +++ b/org.eclipse.jgit.pgm/resources/simplelogger.properties @@ -0,0 +1,6 @@ +org.slf4j.simpleLogger.defaultLogLevel=warn +org.slf4j.simpleLogger.logFile=System.err +org.slf4j.simpleLogger.showDateTime=true +org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss +org.slf4j.simpleLogger.showThreadName=true +org.slf4j.simpleLogger.showLogName=true |