From 417db916b734a5bebf4badbf99a59a7501ac65aa Mon Sep 17 00:00:00 2001
From: Ceki Gulcu <ceki@qos.ch>
Date: Mon, 22 Aug 2022 22:29:06 +0200
Subject: [PATCH] rename EnvUtil.ourVersion as logbackVersion

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
---
 .../java/ch/qos/logback/classic/util/ContextInitializer.java  | 2 +-
 .../test/java/ch/qos/logback/classic/util/EnvUtilTest.java    | 2 +-
 .../src/main/java/ch/qos/logback/core/util/EnvUtil.java       | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

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
index 71ff824ac5..a415f8acbd 100644
--- 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
index a8a908a2b2..c594eb7ade 100644
--- 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
index 27ffeaaf2d..9777b9640f 100644
--- 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;