prepare release 1.4.0

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
qos-ch · Aug 28, 2022 · e83403e · e83403e
1 parent e2c0cc6
commit e83403e
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 20 deletions.
diff --git a/logback-access/pom.xml b/logback-access/pom.xml
@@ -8,7 +8,7 @@
  <parent>
  <groupId>ch.qos.logback</groupId>
  <artifactId>logback-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.0</version>
  </parent>
 
  <artifactId>logback-access</artifactId>
@@ -78,8 +78,6 @@
  <optional>true</optional>
  </dependency>
 
-
-
  </dependencies>
 
  <build>

diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml
@@ -8,7 +8,7 @@
  <parent>
  <groupId>ch.qos.logback</groupId>
  <artifactId>logback-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.0</version>
  </parent>
 
  <artifactId>logback-classic</artifactId>
@@ -111,7 +111,6 @@
  <dependency>
  <groupId>com.icegreen</groupId>
  <artifactId>greenmail</artifactId>
- <version>2.0.0-alpha-1</version>
  <scope>test</scope>
  </dependency>
 

diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/jul/LevelChangePropagator.java b/logback-classic/src/main/java/ch/qos/logback/classic/jul/LevelChangePropagator.java
@@ -61,7 +61,7 @@ private void propagate(Logger logger, Level level) {
  addInfo("Propagating " + level + " level on " + logger + " onto the JUL framework");
  java.util.logging.Logger julLogger = JULHelper.asJULLogger(logger);
  // prevent garbage collection of jul loggers whose level we set
- // see also http://jira.qos.ch/browse/LBCLASSIC-256
+ // see also http://jira.qos.ch/browse//LOGBACK-404
  julLoggerSet.add(julLogger);
  java.util.logging.Level julLevel = JULHelper.asJULLevel(level);
  julLogger.setLevel(julLevel);

diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/jul/LevelChangePropagatorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/jul/LevelChangePropagatorTest.java
@@ -21,8 +21,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.*;
 
 public class LevelChangePropagatorTest {
  int rand = RandomUtil.getPositiveInt();
@@ -44,6 +43,8 @@ void checkLevelChange(String loggerName, Level level) {
  assertEquals(julLevel, julLogger.getLevel());
  }
 
+
+
  @Test
  public void smoke() {
  checkLevelChange("a", Level.INFO);
@@ -68,6 +69,19 @@ public void gc() {
  assertEquals(julLevel, julLogger.getLevel());
  }
 
+ // https://jira.qos.ch/browse/LOGBACK-1612
+ @Test
+ public void jonathan() {
+ Level level = Level.INFO;
+ Logger logger = loggerContext.getLogger("aaa");
+ logger.setLevel(level);
+
+ java.util.logging.Logger julLogger = JULHelper.asJULLogger(logger);
+ java.util.logging.Level julLevel = JULHelper.asJULLevel(level);
+
+ assertFalse(julLogger.isLoggable(java.util.logging.Level.CONFIG));
+ }
+
  @Test
  public void julHelperAsJulLevelRejectsNull() {
  Exception e = assertThrows(IllegalArgumentException.class, () -> {

diff --git a/logback-core/pom.xml b/logback-core/pom.xml
@@ -8,7 +8,7 @@
  <parent>
  <groupId>ch.qos.logback</groupId>
  <artifactId>logback-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.0</version>
  </parent>
 
  <artifactId>logback-core</artifactId>
@@ -41,17 +41,10 @@
  <optional>true</optional>
  </dependency>
 
- <dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
-
  <dependency>
  <groupId>com.sun.mail</groupId>
  <artifactId>jakarta.mail</artifactId>
- <scope>runtime</scope>
+ <scope>compile</scope>
  <optional>true</optional>
  </dependency>
 

diff --git a/logback-examples/pom.xml b/logback-examples/pom.xml
@@ -8,7 +8,7 @@
  <parent>
  <groupId>ch.qos.logback</groupId>
  <artifactId>logback-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.0</version>
  </parent>
 
  <artifactId>logback-examples</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
  <groupId>ch.qos.logback</groupId>
  <artifactId>logback-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.0</version>
  <packaging>pom</packaging>
 
  <name>Logback-Parent</name>
@@ -47,7 +47,7 @@
 
  <properties>
  <!-- yyyy-MM-dd'T'HH:mm:ss'Z' -->
- <project.build.outputTimestamp>2022-08-09T08:27:00Z</project.build.outputTimestamp> 
+ <project.build.outputTimestamp>2022-08-28T17:20:00Z</project.build.outputTimestamp> 
  <latest.stable.version>1.2.11</latest.stable.version>
  <jdk.version>11</jdk.version>
  <maven.compiler.release>${jdk.version}</maven.compiler.release>