rename EnvUtil.ourVersion as logbackVersion

ceki · ceki · commit 417db916b734 · 2022-08-22T22:29:06.000+02:00
Signed-off-by: Ceki Gulcu &lt;ceki@qos.ch&gt;
diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java b/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java
@@ -78,7 +78,7 @@ public void autoConfig() throws JoranException {
     }
 
     public void autoConfig(ClassLoader classLoader) throws JoranException {
-        String versionStr = EnvUtil.ourVersion();
+        String versionStr = EnvUtil.logbackVersion();
         loggerContext.getStatusManager().add(new InfoStatus(CoreConstants.LOGBACK_CLASSIC_VERSION_MESSAGE + versionStr, loggerContext));
         StatusListenerConfigHelper.installIfAsked(loggerContext);
         List<Configurator> configuratorList = ClassicEnvUtil.loadFromServiceLoader(Configurator.class, classLoader);
diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/util/EnvUtilTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/util/EnvUtilTest.java
@@ -13,7 +13,7 @@ public class EnvUtilTest {
     // is added when creating the jar.
     @Test
     public void versionTest() {
-        String versionStr = EnvUtil.ourVersion();
+        String versionStr = EnvUtil.logbackVersion();
         assertNotNull(versionStr);
         assertTrue(versionStr.startsWith("1.3"));
     }
diff --git a/logback-core/src/main/java/ch/qos/logback/core/util/EnvUtil.java b/logback-core/src/main/java/ch/qos/logback/core/util/EnvUtil.java
@@ -13,8 +13,6 @@
  */
 package ch.qos.logback.core.util;
 
-import ch.qos.logback.core.CoreConstants;
-
 /**
  * @author Ceki G&uuml;lc&uuml;
  */
@@ -31,7 +29,7 @@ private EnvUtil() {
      * @since 1.3.0
      * @return current version or null if missing version data
      */
-    static public String ourVersion() {
+    static public String logbackVersion() {
         Package pkg = EnvUtil.class.getPackage();
         if(pkg == null) {
             return null;

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public void autoConfig() throws JoranException {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`public void autoConfig(ClassLoader classLoader) throws JoranException {`
`81`		`- String versionStr = EnvUtil.ourVersion();`
	`81`	`+ String versionStr = EnvUtil.logbackVersion();`
`82`	`82`	`loggerContext.getStatusManager().add(new InfoStatus(CoreConstants.LOGBACK_CLASSIC_VERSION_MESSAGE + versionStr, loggerContext));`
`83`	`83`	`StatusListenerConfigHelper.installIfAsked(loggerContext);`
`84`	`84`	`List<Configurator> configuratorList = ClassicEnvUtil.loadFromServiceLoader(Configurator.class, classLoader);`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class EnvUtilTest {`
`13`	`13`	`// is added when creating the jar.`
`14`	`14`	`@Test`
`15`	`15`	`public void versionTest() {`
`16`		`- String versionStr = EnvUtil.ourVersion();`
	`16`	`+ String versionStr = EnvUtil.logbackVersion();`
`17`	`17`	`assertNotNull(versionStr);`
`18`	`18`	`assertTrue(versionStr.startsWith("1.3"));`
`19`	`19`	`}`