diff --git a/core b/core index 6a4d8ad..f420f04 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 6a4d8ad6af6fa97bb9314a80dd43b72ada2e991c +Subproject commit f420f0456ffa1e4d3dc061e0403e687a6fb86d40 diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 981a116..0f448a9 100644 Binary files a/lib/bld/bld-wrapper.jar and b/lib/bld/bld-wrapper.jar differ diff --git a/src/main/java/rife/bld/BldVersion.java b/src/main/java/rife/bld/BldVersion.java index d4a8c0a..5466f68 100644 --- a/src/main/java/rife/bld/BldVersion.java +++ b/src/main/java/rife/bld/BldVersion.java @@ -6,8 +6,6 @@ package rife.bld; import rife.tools.FileUtils; -import java.io.IOException; - /** * Singleton class that provides access to the current bld version as a string. * @@ -15,30 +13,10 @@ import java.io.IOException; * @since 1.7 */ public class BldVersion { - private String version_; + private final String version_; BldVersion() { - var resource = getClass().getClassLoader().getResource("BLD_VERSION"); - try { - if (resource == null) { - version_ = null; - } else { - var connection = resource.openConnection(); - connection.setUseCaches(false); - try (var input_stream = connection.getInputStream()) { - version_ = FileUtils.readString(input_stream); - } - } - } catch (IOException e) { - version_ = null; - } - - if (version_ != null) { - version_ = version_.trim(); - } - if (null == version_) { - version_ = "unknown version"; - } + version_ = FileUtils.versionFromResource("BLD_VERSION"); } private String getVersionString() {