Merge pull request #22 from OP-TED/release/1.1.0

Release/1.1.0

Author: rousso

.github/workflows/publish.yml

@@ -20,10 +20,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Import GPG Key
-        uses: crazy-max/ghaction-import-gpg@v1
-        env:
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-          PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+        uses: crazy-max/ghaction-import-gpg@v5
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
       - name: Set up Java for publishing to Maven Central Repository
         uses: actions/setup-java@v3
         with:

CHANGELOG.md

@@ -1,14 +1,12 @@
-# eForms Core Library 1.0.5 Release Notes
+# eForms Core Library 1.1.0 Release Notes
 
 _The library is a collection of utilities that are used by our sample applications as well as the EFX Toolkit for Java Developers._
 
-## In this release:
-This patch 
-- improves performance by lazy-loading codelists,
-- improves handling of SemVer 2.0 version numbers.
+## In this release
+This release updates the SdkDownloader to simplify its logic and make sure it resolves pre-release versions of the SDK correctly. 
 
 ## Download
 
 You can download the latest eForms Core library from Maven Central.
 
-[![Maven Central](https://img.shields.io/maven-central/v/eu.europa.ted.eforms/eforms-core-java?label=Download%20&style=flat-square)](https://search.maven.org/search?q=g:%22eu.europa.ted.eforms%22%20AND%20a:%22eforms-core-java%22)
+[![Maven Central](https://img.shields.io/maven-central/v/eu.europa.ted.eforms/eforms-core-java?label=Download%20&style=flat-square)](https://central.sonatype.com/artifact/eu.europa.ted.eforms/eforms-core-java)

pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>eu.europa.ted.eforms</groupId>
   <artifactId>eforms-core-java</artifactId>
-  <version>1.0.5</version>
+  <version>1.1.0</version>
 
   <name>eForms Core Library</name>
   <description>API and tools for eForms applications.</description>

src/main/java/eu/europa/ted/eforms/sdk/SdkVersion.java

@@ -1,6 +1,7 @@
 package eu.europa.ted.eforms.sdk;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import org.apache.commons.lang3.StringUtils;
@@ -24,27 +25,43 @@ public SdkVersion(final String version) {
   }
 
   public String getMajor() {
-    return version.getMajor().toString();
+    return this.version.getMajor().toString();
   }
 
   public String getMinor() {
-    return version.getMinor().toString();
+    return this.version.getMinor().toString();
   }
 
   public String getPatch() {
-    return version.getPatch() == null ? "0" : version.getPatch().toString();
+    return this.version.getPatch() == null ? "0" : this.version.getPatch().toString();
   }
 
   public String getNextMajor() {
-    return version.withIncMajor().toString();
+    return this.version.withIncMajor().toString();
   }
 
   public String getNextMinor() {
-    return version.withIncMinor().toString();
+    return this.version.withIncMinor().toString();
+  }
+
+  public boolean isMajor() {
+    return !this.isMinor() &&  this.version.getMajor() != null;
+  }
+
+  public boolean isMinor() {
+    return !this.isPatch() && this.version.getMinor() != null;
   }
 
   public boolean isPatch() {
-    return version.getPatch() != null;
+    return this.version.getPatch() != null;
+  }
+
+  public boolean isPreRelease() {
+    return this.version.getSuffixTokens().length > 0;
+  }
+
+  public boolean isSnapshot() {
+    return Arrays.asList(this.version.getSuffixTokens()).contains("SNAPSHOT");
   }
 
   public String toNormalisedString(boolean withPatch) {
@@ -66,7 +83,7 @@ public String toStringWithoutPatch() {
 
   @Override
   public String toString() {
-    return version.toString();
+    return this.version.toString();
   }
 
   @Override
@@ -79,12 +96,12 @@ public int compareTo(SdkVersion that) {
       return 0;
     }
 
-    return version.compareTo(that.version);
+    return this.version.compareTo(that.version);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(version);
+    return Objects.hash(this.version);
   }
 
   @Override
@@ -96,6 +113,6 @@ public boolean equals(Object obj) {
     if (getClass() != obj.getClass())
       return false;
     SdkVersion other = (SdkVersion) obj;
-    return Objects.equals(version, other.version);
+    return Objects.equals(this.version, other.version);
   }
 }