From 19991e84c4798158fd7c3f0c49b4bcb26c293165 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Fri, 19 Jul 2024 23:16:18 -0400 Subject: [PATCH] Regression fix to version handling --- lib/bld/bld-wrapper.jar | Bin 29778 -> 29778 bytes src/main/java/rife/bld/BaseProject.java | 11 +++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 804317a849f1e6977ff000f3f1bc789e1412fafd..85a2812707298b09781e0f7dd0a2f79d08ab3557 100644 GIT binary patch delta 140 zcmccgg7MM|MxFp~W)=|!4h{~64?8FF)H8k9xv_V#C6Jo@%SLPRf+E4qxmMjwK>p@m zHa%dv!~VA}h~Juffe}Q9=No~X`y3ZtPub38W_fveBBnph$3Yu2nY^kiYqt zO%Isvu>Y+K;h|$=!vXAnID73y6{_@&ZvAMWG;SKZFu1b_4O^isQk8 L#Q`8nu*4AnGv+j4 diff --git a/src/main/java/rife/bld/BaseProject.java b/src/main/java/rife/bld/BaseProject.java index 7b33079..431d065 100644 --- a/src/main/java/rife/bld/BaseProject.java +++ b/src/main/java/rife/bld/BaseProject.java @@ -8,13 +8,8 @@ import rife.bld.dependencies.*; import rife.bld.help.*; import rife.bld.operations.*; import rife.tools.FileUtils; -import rife.tools.StringUtils; -import rife.tools.exceptions.FileUtilsErrorException; import java.io.File; -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; import java.util.*; import java.util.regex.Pattern; @@ -803,7 +798,7 @@ public class BaseProject extends BuildExecutor { * @return a newly created {@code Dependency} instance * @since 1.5 */ - public Dependency dependency(String groupId, String artifactId, VersionNumber version) { + public Dependency dependency(String groupId, String artifactId, Version version) { return new Dependency(groupId, artifactId, version); } @@ -817,7 +812,7 @@ public class BaseProject extends BuildExecutor { * @return a newly created {@code Dependency} instance * @since 1.5 */ - public Dependency dependency(String groupId, String artifactId, VersionNumber version, String classifier) { + public Dependency dependency(String groupId, String artifactId, Version version, String classifier) { return new Dependency(groupId, artifactId, version, classifier); } @@ -832,7 +827,7 @@ public class BaseProject extends BuildExecutor { * @return a newly created {@code Dependency} instance * @since 1.5 */ - public Dependency dependency(String groupId, String artifactId, VersionNumber version, String classifier, String type) { + public Dependency dependency(String groupId, String artifactId, Version version, String classifier, String type) { return new Dependency(groupId, artifactId, version, classifier, type); }