move VersionUtil.getCoreVersionBySelfDeclaredProperties to CoreVersionUtil

Signed-off-by: ceki <[email protected]>

Author: ceki

logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java

@@ -18,6 +18,7 @@
 import ch.qos.logback.core.joran.spi.JoranException;
 import ch.qos.logback.core.spi.ContextAware;
 import ch.qos.logback.core.spi.ContextAwareImpl;
+import ch.qos.logback.core.util.CoreVersionUtil;
 import ch.qos.logback.core.util.Loader;
 import ch.qos.logback.core.util.StatusListenerConfigHelper;
 import ch.qos.logback.core.util.VersionUtil;
@@ -101,7 +102,7 @@ public void autoConfig(ClassLoader classLoader) throws JoranException {
 
     private void checkVersions() {
         try {
-            String coreVersion = VersionUtil.getCoreVersionBySelfDeclaredProperties();
+            String coreVersion = CoreVersionUtil.getCoreVersionBySelfDeclaredProperties();
             String classicVersion = ClassicVersionUtil.getVersionBySelfDeclaredProperties();
             VersionUtil.checkForVersionEquality(loggerContext, coreVersion, classicVersion, "logback-core", "logback-classic");
         }  catch(NoClassDefFoundError e) {

logback-core/src/main/java/ch/qos/logback/core/util/CoreVersionUtil.java

@@ -14,5 +14,27 @@
 
 package ch.qos.logback.core.util;
 
+import ch.qos.logback.core.CoreConstants;
+
+/**
+ * Utility class for retrieving version information of the "logback-core" module.
+ *
+ * @since 1.5.26
+ */
 public class CoreVersionUtil {
+    /**
+     * Retrieves the version of the "logback-core" module using a properties file
+     * associated with the module.
+     *
+     * <p>The method locates and reads a properties file named "logback-core-version.properties"
+     * in the package of the {@code CoreConstants.class}. It then extracts the version
+     * information using the key "logback-core-version".
+     * </p>
+     *
+     * @return the version of the "logback-core" module as a string, or null if the version cannot be determined
+     * @since 1.5.26
+     */
+    static public String getCoreVersionBySelfDeclaredProperties() {
+        return VersionUtil.getArtifactVersionBySelfDeclaredProperties(CoreConstants.class, "logback-core");
+    }
 }

logback-core/src/main/java/ch/qos/logback/core/util/VersionUtil.java

@@ -15,7 +15,6 @@
 package ch.qos.logback.core.util;
 
 import ch.qos.logback.core.Context;
-import ch.qos.logback.core.CoreConstants;
 import ch.qos.logback.core.status.InfoStatus;
 import ch.qos.logback.core.status.WarnStatus;
 
@@ -97,7 +96,7 @@ static private String getVersionOfClassByModule(Class<?> aClass) {
     /**
      * Retrieves the version of a module using a properties file associated with the module.
      *
-     * <p>Unfortunately, this code cannot be called by depender modules. It needs to be copy-pasted.</p>
+     * <p>Unfortunately, this code cannot be called by other modules. It needs to be duplicated.</p>
      *
      * <p>The method looks for a properties file with a name derived from the <code>moduleName</code> parameter,
      * in the same location, e.g. package, as the <code>aClass</code> parameter. It attempts to load the properties file
@@ -111,6 +110,8 @@ static private String getVersionOfClassByModule(Class<?> aClass) {
      * @param aClass the class used to locate the resource file, the properties file is expected to be in the same package
      * @param moduleName the name of the module, which is used to construct the properties file name and the key
      * @return the version of the module as a string, or null if the version cannot be determined
+     *
+     * @since 1.5.26
      */
     static public String getArtifactVersionBySelfDeclaredProperties(Class<?> aClass, String moduleName) {
         Properties props = new Properties();
@@ -130,22 +131,6 @@ static public String getArtifactVersionBySelfDeclaredProperties(Class<?> aClass,
         }
     }
 
-    /**
-     * Retrieves the version of the "logback-core" module using a properties file
-     * associated with the module.
-     *
-     * <p>The method locates and reads a properties file named "logback-core-version.properties"
-     * in the package of the {@code CoreConstants.class}. It then extracts the version
-     * information using the key "logback-core-version".
-     * </p>
-     *
-     * @return the version of the "logback-core" module as a string, or null if the version cannot be determined
-     * @since 1.5.26
-     */
-    static public String getCoreVersionBySelfDeclaredProperties() {
-        return getArtifactVersionBySelfDeclaredProperties(CoreConstants.class, "logback-core");
-    }
-
 
     // dependency synonym dependee
     // depender synonym dependent