Tony Mancill pushed to branch master at Debian Java Maintainers / logback
Commits: 17c621cf by tony mancill at 2021-12-23T10:00:53-08:00 New upstream version 1.2.10 - - - - - 8b6b3891 by tony mancill at 2021-12-23T10:00:57-08:00 Update upstream source from tag 'upstream/1.2.10' Update to upstream version '1.2.10' with Debian dir 9f0a7bd17ace7ef02520da10f4329232ed91aad2 - - - - - d3d1d098 by tony mancill at 2021-12-23T10:03:27-08:00 Prepare changelog for upload to unstable - - - - - 8 changed files: - debian/changelog - logback-access/pom.xml - logback-classic/pom.xml - logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java - logback-core/pom.xml - logback-examples/pom.xml - logback-site/pom.xml - pom.xml Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +logback (1:1.2.10-1) unstable; urgency=medium + + * New upstream version 1.2.10 + Corrects an error message when Groovy is used for configuration. + See https://jira.qos.ch/browse/LOGBACK-1601 + + -- tony mancill <[email protected]> Thu, 23 Dec 2021 10:01:01 -0800 + logback (1:1.2.9-1) unstable; urgency=medium * New upstream version 1.2.9 ===================================== logback-access/pom.xml ===================================== @@ -8,7 +8,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.2.9</version> + <version>1.2.10</version> </parent> <artifactId>logback-access</artifactId> ===================================== logback-classic/pom.xml ===================================== @@ -8,7 +8,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.2.9</version> + <version>1.2.10</version> </parent> <artifactId>logback-classic</artifactId> ===================================== logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java ===================================== @@ -43,7 +43,6 @@ import ch.qos.logback.core.util.StatusListenerConfigHelper; */ public class ContextInitializer { - final public static String GROOVY_AUTOCONFIG_FILE = "logback.groovy"; final public static String AUTOCONFIG_FILE = "logback.xml"; final public static String TEST_AUTOCONFIG_FILE = "logback-test.xml"; final public static String CONFIG_FILE_PROPERTY = "logback.configurationFile"; @@ -64,7 +63,7 @@ public class ContextInitializer { configurator.setContext(loggerContext); configurator.doConfigure(url); } else { - throw new LogbackException("Unexpected filename extension of file [" + url.toString() + "]. Should be either .groovy or .xml"); + throw new LogbackException("Unexpected filename extension of file [" + url.toString() + "]. Should be .xml"); } } @@ -116,12 +115,7 @@ public class ContextInitializer { if (url != null) { return url; } - - url = getResource(GROOVY_AUTOCONFIG_FILE, myClassLoader, updateStatus); - if (url != null) { - return url; - } - + return getResource(AUTOCONFIG_FILE, myClassLoader, updateStatus); } ===================================== logback-core/pom.xml ===================================== @@ -8,7 +8,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.2.9</version> + <version>1.2.10</version> </parent> <artifactId>logback-core</artifactId> ===================================== logback-examples/pom.xml ===================================== @@ -8,7 +8,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.2.9</version> + <version>1.2.10</version> </parent> <artifactId>logback-examples</artifactId> ===================================== logback-site/pom.xml ===================================== @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.2.9</version> + <version>1.2.10</version> </parent> <artifactId>logback-site</artifactId> ===================================== pom.xml ===================================== @@ -7,7 +7,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.2.9</version> + <version>1.2.10</version> <packaging>pom</packaging> <name>Logback-Parent</name> View it on GitLab: https://salsa.debian.org/java-team/logback/-/compare/8d10d3622e121efaf41910411e903edd879bdbfd...d3d1d09896e61f76fe93a6dad3b5e23931915b5f -- View it on GitLab: https://salsa.debian.org/java-team/logback/-/compare/8d10d3622e121efaf41910411e903edd879bdbfd...d3d1d09896e61f76fe93a6dad3b5e23931915b5f You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
