Release 0.5.2. Fixes #23.

JULIELab · Dec 9, 2022 · b410145 · b410145
1 parent dbcf0ea
commit b410145
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.5.1 (23/11/2022)
+
+---
+
 ## v0.5.0 (17/11/2022)
 - [**closed**] Support multi-valued parameters for configurable resources. [#18](https://github.com/JULIELab/jcore-pipeline-modules/issues/18)
 - [**closed**] Add flow controller support. [#17](https://github.com/JULIELab/jcore-pipeline-modules/issues/17)

diff --git a/jcore-pipeline-builder-base/pom.xml b/jcore-pipeline-builder-base/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>de.julielab</groupId>
         <artifactId>jcore-pipeline-modules</artifactId>
-        <version>0.5.1</version>
+        <version>0.5.2</version>
     </parent>
 
     <build>
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>de.julielab</groupId>
             <artifactId>julielab-maven-aether-utilities</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/jcore-pipeline-builder-cli/pom.xml b/jcore-pipeline-builder-cli/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>de.julielab</groupId>
         <artifactId>jcore-pipeline-modules</artifactId>
-        <version>0.5.1</version>
+        <version>0.5.2</version>
     </parent>
     <dependencies>
         <dependency>

diff --git a/...li/src/main/java/de/julielab/jcore/pipeline/builder/cli/menu/ArtifactVersionMenuItem.java b/...li/src/main/java/de/julielab/jcore/pipeline/builder/cli/menu/ArtifactVersionMenuItem.java
@@ -6,6 +6,7 @@
 import de.julielab.utilities.aether.AetherUtilities;
 import de.julielab.utilities.aether.MavenArtifact;
 import de.julielab.utilities.aether.MavenException;
+import org.apache.commons.lang3.StringUtils;
 import org.beryx.textio.TextIO;
 
 import java.util.Collections;
@@ -32,8 +33,11 @@ public void selectVersion(TextIO textIO, JCoReUIMAPipeline pipeline) {
         MavenArtifact artifact = description.getMetaDescription().getMavenArtifactCoordinates();
         try {
             List<String> versionList = AetherUtilities.getVersions(artifact).collect(Collectors.toList());
-            if (versionList.isEmpty()) {
-                textIO.getTextTerminal().executeWithPropertiesPrefix(TerminalPrefixes.ERROR, t -> t.print("No versions available for component " + description.getName() + ", Maven artifact " + artifact));
+            if (versionList.isEmpty() && !StringUtils.isBlank(description.getMetaDescription().getMavenArtifactCoordinates().getVersion())) {
+                versionList = List.of(description.getMetaDescription().getMavenArtifactCoordinates().getVersion());
+                textIO.getTextTerminal().executeWithPropertiesPrefix(TerminalPrefixes.WARN, t -> t.print("Could not retrieve any versions for component " + description.getName() + ", Maven artifact " + artifact));
+            }else if (versionList.isEmpty()) {
+                textIO.getTextTerminal().executeWithPropertiesPrefix(TerminalPrefixes.ERROR, t -> t.print("No versions available for component " + description.getName() + ", Maven artifact " + artifact + " and the current artefact does not specify a version either. This is an inconsistent state."));
                 return;
             }
             // In tests, the received list was sorted ascendingly, we want it descending

diff --git a/...ain/java/de/julielab/jcore/pipeline/builder/cli/menu/dialog/UpdateAllArtifactsDialog.java b/...ain/java/de/julielab/jcore/pipeline/builder/cli/menu/dialog/UpdateAllArtifactsDialog.java
@@ -55,8 +55,12 @@ public void execute(JCoReUIMAPipeline pipeline, TextIO textIO) {
                 }
                 try {
                     String newestVersion = AetherUtilities.getNewestVersion(description.getMetaDescription().getMavenArtifactCoordinates());
-                    description.getMetaDescription().getMavenArtifactCoordinates().setVersion(newestVersion);
-                    textIO.getTextTerminal().print("Set artifact version of component " + description.getName() + " to " + newestVersion + System.getProperty("line.separator"));
+                    if (newestVersion != null && ! newestVersion.isBlank()) {
+                        description.getMetaDescription().getMavenArtifactCoordinates().setVersion(newestVersion);
+                        textIO.getTextTerminal().print("Set artifact version of component " + description.getName() + " to " + newestVersion + System.getProperty("line.separator"));
+                    } else {
+                        textIO.getTextTerminal().print("Could not obtain any version for component " + description.getName() + ", retaining current version." + System.getProperty("line.separator"));
+                    }
                 } catch (MavenException e) {
                     log.error("Could not set the new version to component {}", description.getName(), e);
                 }

diff --git a/jcore-pipeline-runner/jcore-pipeline-runner-assembly/pom.xml b/jcore-pipeline-runner/jcore-pipeline-runner-assembly/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>jcore-pipeline-runner</artifactId>
         <groupId>de.julielab</groupId>
-        <version>0.5.1</version>
+        <version>0.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/jcore-pipeline-runner/jcore-pipeline-runner-base/pom.xml b/jcore-pipeline-runner/jcore-pipeline-runner-base/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>jcore-pipeline-runner</artifactId>
         <groupId>de.julielab</groupId>
-        <version>0.5.1</version>
+        <version>0.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/jcore-pipeline-runner/jcore-pipeline-runner-cpe/pom.xml b/jcore-pipeline-runner/jcore-pipeline-runner-cpe/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>jcore-pipeline-runner</artifactId>
         <groupId>de.julielab</groupId>
-        <version>0.5.1</version>
+        <version>0.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <build>

diff --git a/jcore-pipeline-runner/pom.xml b/jcore-pipeline-runner/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>jcore-pipeline-modules</artifactId>
         <groupId>de.julielab</groupId>
-        <version>0.5.1</version>
+        <version>0.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -5,11 +5,11 @@
 
     <artifactId>jcore-pipeline-modules</artifactId>
     <packaging>pom</packaging>
-    <version>0.5.1</version>
+    <version>0.5.2</version>
     <parent>
         <groupId>de.julielab</groupId>
         <artifactId>jcore-base</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
     </parent>
     <dependencyManagement>
         <dependencies>