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

XIVY-8973 Streamline slf4j version with Eclipse 2023-09 update #448

Merged
merged 2 commits into from
Jul 2, 2024
Merged

XIVY-8973 Streamline slf4j version with Eclipse 2023-09 update #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e970029
XIVY-8973 Streamline slf4j version with Eclipse 2023-09 update
alexsuter Jul 2, 2024
4702ea0
XIVY-8973 Use SimpleLogger of slf4j from new package
alexsuter Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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 @@ -42,7 +42,7 @@
<java.version>17</java.version>
<maven.version>3.6.3</maven.version>
<!-- version should match ivy Engine sfl4j version! And version in EngineClassLoaderFactory.SLF4J_VERSION -->
<slf4j.version>1.7.36</slf4j.version>
<slf4j.version>2.0.12</slf4j.version>
<site.path>snapshot</site.path>
<other.site.path>release</other.site.path>
<other.site.name>Stable</other.site.name>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/ivyteam/ivy/maven/engine/EngineClassLoaderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public interface OsgiDir {
}

/** must match version in pom.xml */
private static final String SLF4J_VERSION = "1.7.36";
private static final String SLF4J_VERSION = "2.0.12";

private static final List<String> ENGINE_LIB_DIRECTORIES = Arrays.asList(
OsgiDir.INSTALL_AREA + "/" + OsgiDir.LIB_BOOT,
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/ch/ivyteam/ivy/maven/engine/Slf4jSimpleEngineProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Axon Ivy AG
* Copyright (C) 2024 Axon Ivy AG
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
Expand All @@ -19,11 +19,11 @@
import java.util.Arrays;
import java.util.List;

import org.slf4j.impl.SimpleLogger;
import org.slf4j.simple.SimpleLogger;

/**
* Sets the logging properties for the ivy engine.
*
*
* @author Reguel Wermelinger
* @since 6.0.0
*/
Expand Down Expand Up @@ -91,7 +91,7 @@ private static void setDefaultProperty(String property, String value) {
}

/**
* Valid levels as documented in {@link org.slf4j.impl.SimpleLogger}
* Valid levels as documented in {@link org.slf4j.simple.SimpleLogger}
*/
static interface Level {
String TRACE = "trace";
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/ch/ivyteam/ivy/maven/TestSlf4jWarningConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import static org.assertj.core.api.Assertions.assertThat;

import org.junit.Test;
import org.slf4j.impl.SimpleLogger;
import org.slf4j.simple.SimpleLogger;

import ch.ivyteam.ivy.maven.engine.Slf4jSimpleEngineProperties;

Expand Down
Loading