From b4101456255e0fd43b16098b23b3f9698d860271 Mon Sep 17 00:00:00 2001 From: khituras Date: Fri, 9 Dec 2022 10:19:06 +0100 Subject: [PATCH] Release 0.5.2. Fixes #23. --- CHANGELOG.md | 4 ++++ jcore-pipeline-builder-base/pom.xml | 4 ++-- jcore-pipeline-builder-cli/pom.xml | 2 +- .../builder/cli/menu/ArtifactVersionMenuItem.java | 8 ++++++-- .../builder/cli/menu/dialog/UpdateAllArtifactsDialog.java | 8 ++++++-- .../jcore-pipeline-runner-assembly/pom.xml | 2 +- jcore-pipeline-runner/jcore-pipeline-runner-base/pom.xml | 2 +- jcore-pipeline-runner/jcore-pipeline-runner-cpe/pom.xml | 2 +- jcore-pipeline-runner/pom.xml | 2 +- pom.xml | 4 ++-- 10 files changed, 25 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 467fe73..458446f 100644 --- 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 index 2a65f23..e48ac5c 100644 --- a/jcore-pipeline-builder-base/pom.xml +++ b/jcore-pipeline-builder-base/pom.xml @@ -8,7 +8,7 @@ de.julielab jcore-pipeline-modules - 0.5.1 + 0.5.2 @@ -109,7 +109,7 @@ de.julielab julielab-maven-aether-utilities - 1.1.2 + 1.1.3-SNAPSHOT com.google.guava diff --git a/jcore-pipeline-builder-cli/pom.xml b/jcore-pipeline-builder-cli/pom.xml index 66e6d50..dedfd7c 100644 --- a/jcore-pipeline-builder-cli/pom.xml +++ b/jcore-pipeline-builder-cli/pom.xml @@ -8,7 +8,7 @@ de.julielab jcore-pipeline-modules - 0.5.1 + 0.5.2 diff --git a/jcore-pipeline-builder-cli/src/main/java/de/julielab/jcore/pipeline/builder/cli/menu/ArtifactVersionMenuItem.java b/jcore-pipeline-builder-cli/src/main/java/de/julielab/jcore/pipeline/builder/cli/menu/ArtifactVersionMenuItem.java index aef40ba..2654b3c 100644 --- a/jcore-pipeline-builder-cli/src/main/java/de/julielab/jcore/pipeline/builder/cli/menu/ArtifactVersionMenuItem.java +++ b/jcore-pipeline-builder-cli/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 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/jcore-pipeline-builder-cli/src/main/java/de/julielab/jcore/pipeline/builder/cli/menu/dialog/UpdateAllArtifactsDialog.java b/jcore-pipeline-builder-cli/src/main/java/de/julielab/jcore/pipeline/builder/cli/menu/dialog/UpdateAllArtifactsDialog.java index a324f26..bad55ce 100644 --- a/jcore-pipeline-builder-cli/src/main/java/de/julielab/jcore/pipeline/builder/cli/menu/dialog/UpdateAllArtifactsDialog.java +++ b/jcore-pipeline-builder-cli/src/main/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 index bd71df9..751b8be 100644 --- a/jcore-pipeline-runner/jcore-pipeline-runner-assembly/pom.xml +++ b/jcore-pipeline-runner/jcore-pipeline-runner-assembly/pom.xml @@ -3,7 +3,7 @@ jcore-pipeline-runner de.julielab - 0.5.1 + 0.5.2 4.0.0 diff --git a/jcore-pipeline-runner/jcore-pipeline-runner-base/pom.xml b/jcore-pipeline-runner/jcore-pipeline-runner-base/pom.xml index 6a82824..57391f2 100644 --- a/jcore-pipeline-runner/jcore-pipeline-runner-base/pom.xml +++ b/jcore-pipeline-runner/jcore-pipeline-runner-base/pom.xml @@ -4,7 +4,7 @@ jcore-pipeline-runner de.julielab - 0.5.1 + 0.5.2 4.0.0 diff --git a/jcore-pipeline-runner/jcore-pipeline-runner-cpe/pom.xml b/jcore-pipeline-runner/jcore-pipeline-runner-cpe/pom.xml index 1efbf50..9b10e75 100644 --- a/jcore-pipeline-runner/jcore-pipeline-runner-cpe/pom.xml +++ b/jcore-pipeline-runner/jcore-pipeline-runner-cpe/pom.xml @@ -4,7 +4,7 @@ jcore-pipeline-runner de.julielab - 0.5.1 + 0.5.2 4.0.0 diff --git a/jcore-pipeline-runner/pom.xml b/jcore-pipeline-runner/pom.xml index 84e2e18..b8b5518 100644 --- a/jcore-pipeline-runner/pom.xml +++ b/jcore-pipeline-runner/pom.xml @@ -3,7 +3,7 @@ jcore-pipeline-modules de.julielab - 0.5.1 + 0.5.2 4.0.0 diff --git a/pom.xml b/pom.xml index 6d87d9a..498f1a6 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ jcore-pipeline-modules pom - 0.5.1 + 0.5.2 de.julielab jcore-base - 2.6.0 + 2.6.1