Skip to content

Commit e83403e

Browse files
committed
prepare release 1.4.0
Signed-off-by: Ceki Gulcu <[email protected]>
1 parent e2c0cc6 commit e83403e

File tree

7 files changed

+24
-20
lines changed

7 files changed

+24
-20
lines changed

logback-access/pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>ch.qos.logback</groupId>
1010
<artifactId>logback-parent</artifactId>
11-
<version>1.4.0-SNAPSHOT</version>
11+
<version>1.4.0</version>
1212
</parent>
1313

1414
<artifactId>logback-access</artifactId>
@@ -78,8 +78,6 @@
7878
<optional>true</optional>
7979
</dependency>
8080

81-
82-
8381
</dependencies>
8482

8583
<build>

logback-classic/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>ch.qos.logback</groupId>
1010
<artifactId>logback-parent</artifactId>
11-
<version>1.4.0-SNAPSHOT</version>
11+
<version>1.4.0</version>
1212
</parent>
1313

1414
<artifactId>logback-classic</artifactId>
@@ -111,7 +111,6 @@
111111
<dependency>
112112
<groupId>com.icegreen</groupId>
113113
<artifactId>greenmail</artifactId>
114-
<version>2.0.0-alpha-1</version>
115114
<scope>test</scope>
116115
</dependency>
117116

logback-classic/src/main/java/ch/qos/logback/classic/jul/LevelChangePropagator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private void propagate(Logger logger, Level level) {
6161
addInfo("Propagating " + level + " level on " + logger + " onto the JUL framework");
6262
java.util.logging.Logger julLogger = JULHelper.asJULLogger(logger);
6363
// prevent garbage collection of jul loggers whose level we set
64-
// see also http://jira.qos.ch/browse/LBCLASSIC-256
64+
// see also http://jira.qos.ch/browse//LOGBACK-404
6565
julLoggerSet.add(julLogger);
6666
java.util.logging.Level julLevel = JULHelper.asJULLevel(level);
6767
julLogger.setLevel(julLevel);

logback-classic/src/test/java/ch/qos/logback/classic/jul/LevelChangePropagatorTest.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
import org.junit.Before;
2222
import org.junit.Test;
2323

24-
import static org.junit.Assert.assertEquals;
25-
import static org.junit.Assert.assertThrows;
24+
import static org.junit.Assert.*;
2625

2726
public class LevelChangePropagatorTest {
2827
int rand = RandomUtil.getPositiveInt();
@@ -44,6 +43,8 @@ void checkLevelChange(String loggerName, Level level) {
4443
assertEquals(julLevel, julLogger.getLevel());
4544
}
4645

46+
47+
4748
@Test
4849
public void smoke() {
4950
checkLevelChange("a", Level.INFO);
@@ -68,6 +69,19 @@ public void gc() {
6869
assertEquals(julLevel, julLogger.getLevel());
6970
}
7071

72+
// https://jira.qos.ch/browse/LOGBACK-1612
73+
@Test
74+
public void jonathan() {
75+
Level level = Level.INFO;
76+
Logger logger = loggerContext.getLogger("aaa");
77+
logger.setLevel(level);
78+
79+
java.util.logging.Logger julLogger = JULHelper.asJULLogger(logger);
80+
java.util.logging.Level julLevel = JULHelper.asJULLevel(level);
81+
82+
assertFalse(julLogger.isLoggable(java.util.logging.Level.CONFIG));
83+
}
84+
7185
@Test
7286
public void julHelperAsJulLevelRejectsNull() {
7387
Exception e = assertThrows(IllegalArgumentException.class, () -> {

logback-core/pom.xml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>ch.qos.logback</groupId>
1010
<artifactId>logback-parent</artifactId>
11-
<version>1.4.0-SNAPSHOT</version>
11+
<version>1.4.0</version>
1212
</parent>
1313

1414
<artifactId>logback-core</artifactId>
@@ -41,17 +41,10 @@
4141
<optional>true</optional>
4242
</dependency>
4343

44-
<dependency>
45-
<groupId>jakarta.activation</groupId>
46-
<artifactId>jakarta.activation-api</artifactId>
47-
<scope>compile</scope>
48-
<optional>true</optional>
49-
</dependency>
50-
5144
<dependency>
5245
<groupId>com.sun.mail</groupId>
5346
<artifactId>jakarta.mail</artifactId>
54-
<scope>runtime</scope>
47+
<scope>compile</scope>
5548
<optional>true</optional>
5649
</dependency>
5750

logback-examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>ch.qos.logback</groupId>
1010
<artifactId>logback-parent</artifactId>
11-
<version>1.4.0-SNAPSHOT</version>
11+
<version>1.4.0</version>
1212
</parent>
1313

1414
<artifactId>logback-examples</artifactId>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<groupId>ch.qos.logback</groupId>
99
<artifactId>logback-parent</artifactId>
10-
<version>1.4.0-SNAPSHOT</version>
10+
<version>1.4.0</version>
1111
<packaging>pom</packaging>
1212

1313
<name>Logback-Parent</name>
@@ -47,7 +47,7 @@
4747

4848
<properties>
4949
<!-- yyyy-MM-dd'T'HH:mm:ss'Z' -->
50-
<project.build.outputTimestamp>2022-08-09T08:27:00Z</project.build.outputTimestamp>
50+
<project.build.outputTimestamp>2022-08-28T17:20:00Z</project.build.outputTimestamp>
5151
<latest.stable.version>1.2.11</latest.stable.version>
5252
<jdk.version>11</jdk.version>
5353
<maven.compiler.release>${jdk.version}</maven.compiler.release>

0 commit comments

Comments
 (0)