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

Jump to bottom

build(deps): bump slf4j.version from 1.7.36 to 2.0.0 #1730

Merged
merged 4 commits into from
Sep 15, 2022
Merged

build(deps): bump slf4j.version from 1.7.36 to 2.0.0 #1730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cc8bf3
build(deps): bump slf4j.version from 1.7.36 to 2.0.0
dependabot[bot] Aug 22, 2022
6c65d2d
Merge branch 'master' into dependabot/maven/slf4j.version-2.0.0
velo Sep 1, 2022
e417115
Merge branch 'master' into dependabot/maven/slf4j.version-2.0.0
velo Sep 14, 2022
5ca20fc
Update package names for slf4j 2
velo Sep 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<guava.version>31.1-jre</guava.version>
<googlehttpclient.version>1.42.2</googlehttpclient.version>
<gson.version>2.9.1</gson.version>
<slf4j.version>1.7.36</slf4j.version>
<slf4j.version>2.0.0</slf4j.version>
<bouncy.version>1.70</bouncy.version>
<json.version>20220320</json.version>

Expand Down
12 changes: 6 additions & 6 deletions slf4j/src/test/java/feign/slf4j/Slf4jLoggerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@
*/
package feign.slf4j;

import java.util.Collection;
import java.util.Collections;
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.LoggerFactory;
import org.slf4j.impl.RecordingSimpleLogger;
import feign.Feign;
import feign.Logger;
import feign.Request;
import feign.Request.HttpMethod;
import feign.RequestTemplate;
import feign.Response;
import feign.Util;
import java.util.Collection;
import java.util.Collections;
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.LoggerFactory;
import org.slf4j.simple.RecordingSimpleLogger;

@SuppressWarnings("deprecation")
public class Slf4jLoggerTest {
Expand Down
6 changes: 3 additions & 3 deletions ...org/slf4j/impl/RecordingSimpleLogger.java → ...g/slf4j/simple/RecordingSimpleLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
package org.slf4j.impl;
package org.slf4j.simple;

import org.junit.rules.TestRule;
import org.junit.runner.Description;
Expand All @@ -20,8 +20,8 @@
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import static org.junit.Assert.assertEquals;
import static org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY;
import static org.slf4j.impl.SimpleLogger.SHOW_THREAD_NAME_KEY;
import static org.slf4j.simple.SimpleLogger.DEFAULT_LOG_LEVEL_KEY;
import static org.slf4j.simple.SimpleLogger.SHOW_THREAD_NAME_KEY;

/**
* A testing utility to allow control over {@link org.slf4j.impl.SimpleLogger}. In some cases,
Expand Down