This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new a2edebe2f8f CAMEL-19144: camel-catalog - Include information about
existing Camel releases
a2edebe2f8f is described below
commit a2edebe2f8ffdc1d414b4d9f3bfbd99563c56984
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Mar 16 14:35:04 2023 +0100
CAMEL-19144: camel-catalog - Include information about existing Camel
releases
---
.../apache/camel/catalog/releases/camel-quarkus-releases.json | 9 +++++++--
.../test/java/org/apache/camel/catalog/CamelCatalogTest.java | 2 +-
.../camel/dsl/jbang/core/commands/version/VersionList.java | 11 ++++++-----
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
index 75f84f145a3..4ced882921b 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
@@ -64,14 +64,14 @@
{
"version": "2.13.1",
"date": "2022-11-07",
- "eol": "2022-03-26",
+ "eol": "2023-03-26",
"kind": "lts",
"jdk": "11"
},
{
"version": "2.13.2",
"date": "2022-12-16",
- "eol": "2022-03-26",
+ "eol": "2023-03-26",
"kind": "lts",
"jdk": "11"
},
@@ -141,6 +141,11 @@
"date": "2022-04-12",
"jdk": "11"
},
+ {
+ "version": "2.8.0-M1",
+ "date": "2022-03-08",
+ "jdk": "11"
+ },
{
"version": "2.9.0",
"date": "2022-05-11",
diff --git
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 45766376d5b..cfa20b1b74b 100644
---
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -1560,7 +1560,7 @@ public class CamelCatalogTest {
Assertions.assertNotNull(rel);
Assertions.assertEquals("2.13.2", rel.getVersion());
Assertions.assertEquals("2022-12-16", rel.getDate());
- Assertions.assertEquals("2022-03-26", rel.getEol());
+ Assertions.assertEquals("2023-03-26", rel.getEol());
Assertions.assertEquals("lts", rel.getKind());
Assertions.assertEquals("11", rel.getJdk());
}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionList.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionList.java
index b4834da362e..a88d31dc75a 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionList.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionList.java
@@ -101,7 +101,7 @@ public class VersionList extends CamelCommand {
}
CamelCatalog catalog = new DefaultCamelCatalog();
- List<ReleaseModel> releases = catalog.camelReleases();
+ List<ReleaseModel> releases = runtime.equals("quarkus") ?
catalog.camelQuarkusReleases() : catalog.camelReleases();
List<Row> rows = new ArrayList<>();
for (String[] v : versions) {
@@ -111,7 +111,8 @@ public class VersionList extends CamelCommand {
row.runtimeVersion = v[1];
// enrich with details from catalog (if we can find any)
- ReleaseModel rm = releases.stream().filter(r ->
v[0].equals(r.getVersion())).findFirst().orElse(null);
+ String catalogVersion = runtime.equals("quarkus") ? v[1] : v[0];
+ ReleaseModel rm = releases.stream().filter(r ->
catalogVersion.equals(r.getVersion())).findFirst().orElse(null);
if (rm != null) {
row.releaseDate = rm.getDate();
row.eolDate = rm.getEol();
@@ -137,11 +138,11 @@ public class VersionList extends CamelCommand {
.headerAlign(HorizontalAlign.CENTER).dataAlign(HorizontalAlign.CENTER).with(r
-> r.runtimeVersion),
new Column().header("JDK")
.headerAlign(HorizontalAlign.CENTER).dataAlign(HorizontalAlign.RIGHT).with(this::jdkVersion),
- new
Column().header("KIND").visible(!"quarkus".equalsIgnoreCase(runtime))
+ new Column().header("KIND")
.headerAlign(HorizontalAlign.CENTER).dataAlign(HorizontalAlign.CENTER).with(this::kind),
- new
Column().header("RELEASED").visible(!"quarkus".equalsIgnoreCase(runtime))
+ new Column().header("RELEASED")
.headerAlign(HorizontalAlign.CENTER).dataAlign(HorizontalAlign.RIGHT).with(this::releaseDate),
- new Column().header("SUPPORTED
UNTIL").visible(!"quarkus".equalsIgnoreCase(runtime))
+ new Column().header("SUPPORTED UNTIL")
.headerAlign(HorizontalAlign.CENTER).dataAlign(HorizontalAlign.RIGHT).with(this::eolDate))));
return 0;
