feat: replace semver4j with maven-artifact (#548)

artipie · May 16, 2023 · f521d6b · f521d6b
1 parent c53e239
commit f521d6b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -242,9 +242,9 @@ SOFTWARE.
       <version>0.23.1</version>
     </dependency>
     <dependency>
-      <groupId>com.vdurmont</groupId>
-      <artifactId>semver4j</artifactId>
-      <version>3.1.0</version>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+      <version>3.9.1</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/src/main/java/com/artipie/rpm/meta/CrCompareDependency.java b/src/main/java/com/artipie/rpm/meta/CrCompareDependency.java
@@ -4,8 +4,8 @@
  */
 package com.artipie.rpm.meta;
 
-import com.vdurmont.semver4j.Semver;
 import java.util.Comparator;
+import org.apache.maven.artifact.versioning.ComparableVersion;
 
 /**
  * Compare two dependencies by name.
@@ -73,8 +73,8 @@ public int compare(final String depa, final String depb) {
                         } else {
                             vera = depa.substring(vera.length() - 1, verea.length() - 1);
                             verb = depb.substring(verb.length() - 1, vereb.length() - 1);
-                            result = new Semver(vera, Semver.SemverType.LOOSE).compareTo(
-                                new Semver(verb, Semver.SemverType.LOOSE)
+                            result = new ComparableVersion(vera).compareTo(
+                                new ComparableVersion(verb)
                             );
                         }
                     }

diff --git a/src/test/java/com/artipie/rpm/files/TestBundle.java b/src/test/java/com/artipie/rpm/files/TestBundle.java
@@ -8,6 +8,7 @@
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.nio.file.Path;
 import org.cactoos.io.InputOf;
@@ -122,11 +123,11 @@ public int count() {
          */
         URL url() {
             try {
-                return new URL(
+                return URI.create(
                     String.format(
                         "https://artipie.s3.amazonaws.com/rpm-test/%s.tar.gz", this.filename()
                     )
-                );
+                ).toURL();
             } catch (final MalformedURLException ex) {
                 throw new IllegalArgumentException("Invalid url", ex);
             }