You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/03/16 13:44:05 UTC
[camel] branch camel-3.20.x updated (13074250389 -> edb33dba719)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
from 13074250389 CAMEL-19158: Ensure errors instantiating throwException classes are propagated to the exchange
new 75dfdb878a6 CAMEL-19144: camel-catalog - Include information about existing Camel releases
new 2c418dbe57e CAMEL-19144: camel-catalog - Include information about existing Camel releases
new e9f0cb583fd CAMEL-19144: camel-catalog - Include information about existing Camel releases
new edb33dba719 CAMEL-19144: camel-catalog - Include information about existing Camel releases
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../catalog/releases/camel-quarkus-releases.json | 154 +++++++++++++++++++++
.../org/apache/camel/catalog/CamelCatalog.java | 7 +-
.../apache/camel/catalog/DefaultCamelCatalog.java | 13 +-
.../org/apache/camel/catalog/CamelCatalogTest.java | 14 ++
.../jbang/core/commands/version/VersionList.java | 11 +-
.../maven/packaging/UpdateCamelReleasesMojo.java | 46 +++---
6 files changed, 218 insertions(+), 27 deletions(-)
create mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
[camel] 02/04: CAMEL-19144: camel-catalog - Include information about existing Camel releases
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2c418dbe57eea9398d02c022cdca448fea64bb62
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Mar 16 14:13:02 2023 +0100
CAMEL-19144: camel-catalog - Include information about existing Camel releases
---
.../catalog/releases/camel-quarkus-releases.json | 149 +++++++++++++++++++++
1 file changed, 149 insertions(+)
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
new file mode 100644
index 00000000000..03e1bb282ed
--- /dev/null
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
@@ -0,0 +1,149 @@
+[
+ {
+ "version": "\"1.4.0\"",
+ "date": "2020-12-01",
+ "jdk": "11"
+ },
+ {
+ "version": "\"1.5.0\"",
+ "date": "2020-12-01",
+ "jdk": "11"
+ },
+ {
+ "version": "\"1.6.0\"",
+ "date": "2021-02-14",
+ "jdk": "11"
+ },
+ {
+ "version": "\"1.7.0\"",
+ "date": "2021-02-19",
+ "jdk": "11"
+ },
+ {
+ "version": "\"1.8.0\"",
+ "date": "2021-03-29",
+ "jdk": "11"
+ },
+ {
+ "version": "\"1.8.1\"",
+ "date": "2021-04-07",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.0.0\"",
+ "date": "2021-06-28",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.1.0\"",
+ "date": "2021-07-30",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.10.0\"",
+ "date": "2022-06-23",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.11.0\"",
+ "date": "2022-07-27",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.12.0\"",
+ "date": "2022-09-01",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.13.0\"",
+ "date": "2022-09-26",
+ "eol": "2023-03-26",
+ "kind": "lts",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.13.1\"",
+ "date": "2022-11-07",
+ "eol": "2022-03-26",
+ "kind": "lts",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.13.2\"",
+ "date": "2022-12-16",
+ "eol": "2022-03-26",
+ "kind": "lts",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.14.0\"",
+ "date": "2022-11-07",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.15.0\"",
+ "date": "2022-12-12",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.16.0\"",
+ "date": "2023-01-25",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.2.0\"",
+ "date": "2021-09-01",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.3.0\"",
+ "date": "2021-10-08",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.4.0\"",
+ "date": "2021-11-12",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.5.0\"",
+ "date": "2021-11-26",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.6.0\"",
+ "date": "2021-12-23",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.7.0\"",
+ "date": "2022-02-02",
+ "eol": "2022-08-02",
+ "kind": "lts",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.7.1\"",
+ "date": "2022-04-04",
+ "eol": "2022-08-02",
+ "kind": "lts",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.7.2\"",
+ "date": "2022-07-04",
+ "eol": "2022-08-02",
+ "kind": "lts",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.8.0\"",
+ "date": "2022-04-12",
+ "jdk": "11"
+ },
+ {
+ "version": "\"2.9.0\"",
+ "date": "2022-05-11",
+ "jdk": "11"
+ }
+]
[camel] 04/04: CAMEL-19144: camel-catalog - Include information about existing Camel releases
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit edb33dba71932516b25fa1d169e590856fdf60b8
Author: Claus Ibsen <cl...@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 124beaa47f8..4d425a8363f 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
@@ -1618,7 +1618,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 4d05cfe26f9..b4412a68e20 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
@@ -100,7 +100,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) {
@@ -110,7 +110,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();
@@ -136,11 +137,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;
[camel] 03/04: CAMEL-19144: camel-catalog - Include information about existing Camel releases
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e9f0cb583fd5a284916600c7a701f8a525f61c85
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Mar 16 14:25:22 2023 +0100
CAMEL-19144: camel-catalog - Include information about existing Camel releases
---
.../catalog/releases/camel-quarkus-releases.json | 54 +++++++++++-----------
.../org/apache/camel/catalog/CamelCatalog.java | 7 ++-
.../apache/camel/catalog/DefaultCamelCatalog.java | 13 +++++-
.../org/apache/camel/catalog/CamelCatalogTest.java | 14 ++++++
4 files changed, 58 insertions(+), 30 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 03e1bb282ed..75f84f145a3 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
@@ -1,148 +1,148 @@
[
{
- "version": "\"1.4.0\"",
+ "version": "1.4.0",
"date": "2020-12-01",
"jdk": "11"
},
{
- "version": "\"1.5.0\"",
+ "version": "1.5.0",
"date": "2020-12-01",
"jdk": "11"
},
{
- "version": "\"1.6.0\"",
+ "version": "1.6.0",
"date": "2021-02-14",
"jdk": "11"
},
{
- "version": "\"1.7.0\"",
+ "version": "1.7.0",
"date": "2021-02-19",
"jdk": "11"
},
{
- "version": "\"1.8.0\"",
+ "version": "1.8.0",
"date": "2021-03-29",
"jdk": "11"
},
{
- "version": "\"1.8.1\"",
+ "version": "1.8.1",
"date": "2021-04-07",
"jdk": "11"
},
{
- "version": "\"2.0.0\"",
+ "version": "2.0.0",
"date": "2021-06-28",
"jdk": "11"
},
{
- "version": "\"2.1.0\"",
+ "version": "2.1.0",
"date": "2021-07-30",
"jdk": "11"
},
{
- "version": "\"2.10.0\"",
+ "version": "2.10.0",
"date": "2022-06-23",
"jdk": "11"
},
{
- "version": "\"2.11.0\"",
+ "version": "2.11.0",
"date": "2022-07-27",
"jdk": "11"
},
{
- "version": "\"2.12.0\"",
+ "version": "2.12.0",
"date": "2022-09-01",
"jdk": "11"
},
{
- "version": "\"2.13.0\"",
+ "version": "2.13.0",
"date": "2022-09-26",
"eol": "2023-03-26",
"kind": "lts",
"jdk": "11"
},
{
- "version": "\"2.13.1\"",
+ "version": "2.13.1",
"date": "2022-11-07",
"eol": "2022-03-26",
"kind": "lts",
"jdk": "11"
},
{
- "version": "\"2.13.2\"",
+ "version": "2.13.2",
"date": "2022-12-16",
"eol": "2022-03-26",
"kind": "lts",
"jdk": "11"
},
{
- "version": "\"2.14.0\"",
+ "version": "2.14.0",
"date": "2022-11-07",
"jdk": "11"
},
{
- "version": "\"2.15.0\"",
+ "version": "2.15.0",
"date": "2022-12-12",
"jdk": "11"
},
{
- "version": "\"2.16.0\"",
+ "version": "2.16.0",
"date": "2023-01-25",
"jdk": "11"
},
{
- "version": "\"2.2.0\"",
+ "version": "2.2.0",
"date": "2021-09-01",
"jdk": "11"
},
{
- "version": "\"2.3.0\"",
+ "version": "2.3.0",
"date": "2021-10-08",
"jdk": "11"
},
{
- "version": "\"2.4.0\"",
+ "version": "2.4.0",
"date": "2021-11-12",
"jdk": "11"
},
{
- "version": "\"2.5.0\"",
+ "version": "2.5.0",
"date": "2021-11-26",
"jdk": "11"
},
{
- "version": "\"2.6.0\"",
+ "version": "2.6.0",
"date": "2021-12-23",
"jdk": "11"
},
{
- "version": "\"2.7.0\"",
+ "version": "2.7.0",
"date": "2022-02-02",
"eol": "2022-08-02",
"kind": "lts",
"jdk": "11"
},
{
- "version": "\"2.7.1\"",
+ "version": "2.7.1",
"date": "2022-04-04",
"eol": "2022-08-02",
"kind": "lts",
"jdk": "11"
},
{
- "version": "\"2.7.2\"",
+ "version": "2.7.2",
"date": "2022-07-04",
"eol": "2022-08-02",
"kind": "lts",
"jdk": "11"
},
{
- "version": "\"2.8.0\"",
+ "version": "2.8.0",
"date": "2022-04-12",
"jdk": "11"
},
{
- "version": "\"2.9.0\"",
+ "version": "2.9.0",
"date": "2022-05-11",
"jdk": "11"
}
diff --git a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
index 8af2b8d1b2f..e006385d0fb 100644
--- a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
+++ b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
@@ -582,8 +582,13 @@ public interface CamelCatalog {
InputStream loadResource(String kind, String name);
/**
- * Load all Camel releases from catalog
+ * Load all Camel releases (core and spring-boot) from catalog
*/
List<ReleaseModel> camelReleases();
+ /**
+ * Load all Camel Quarkus releases from catalog
+ */
+ List<ReleaseModel> camelQuarkusReleases();
+
}
diff --git a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 03d8f3bbc7d..2b00ab629e9 100644
--- a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -506,10 +506,19 @@ public class DefaultCamelCatalog extends AbstractCamelCatalog implements CamelCa
@Override
public List<ReleaseModel> camelReleases() {
- return cache("camelReleases", () -> {
+ return camelReleases("camel-releases.json");
+ }
+
+ @Override
+ public List<ReleaseModel> camelQuarkusReleases() {
+ return camelReleases("camel-quarkus-releases.json");
+ }
+
+ private List<ReleaseModel> camelReleases(String file) {
+ return cache(file, () -> {
try {
List<ReleaseModel> answer = new ArrayList<>();
- InputStream is = loadResource("releases", "camel-releases.json");
+ InputStream is = loadResource("releases", file);
String json = CatalogHelper.loadText(is);
JsonArray arr = (JsonArray) Jsoner.deserialize(json);
for (Object o : arr) {
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 9c40956b0c5..124beaa47f8 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
@@ -1609,4 +1609,18 @@ public class CamelCatalogTest {
Assertions.assertEquals("lts", rel.getKind());
}
+ @Test
+ public void camelQuarkusReleases() {
+ List<ReleaseModel> list = catalog.camelQuarkusReleases();
+ Assertions.assertTrue(list.size() > 20);
+
+ ReleaseModel rel = list.stream().filter(r -> r.getVersion().equals("2.13.2")).findFirst().orElse(null);
+ 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("lts", rel.getKind());
+ Assertions.assertEquals("11", rel.getJdk());
+ }
+
}
[camel] 01/04: CAMEL-19144: camel-catalog - Include information about existing Camel releases
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 75dfdb878a6cc52e22ae3ba2798968d87c339bc4
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Mar 16 14:11:26 2023 +0100
CAMEL-19144: camel-catalog - Include information about existing Camel releases
---
.../maven/packaging/UpdateCamelReleasesMojo.java | 46 +++++++++++++---------
1 file changed, 27 insertions(+), 19 deletions(-)
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateCamelReleasesMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateCamelReleasesMojo.java
index 20fa0c9f97b..09f79ecb3dc 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateCamelReleasesMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateCamelReleasesMojo.java
@@ -47,7 +47,9 @@ import org.apache.maven.plugins.annotations.Parameter;
@Mojo(name = "update-camel-releases", threadSafe = true, defaultPhase = LifecyclePhase.PROCESS_CLASSES)
public class UpdateCamelReleasesMojo extends AbstractGeneratorMojo {
- private static final String GIT_URL = "https://api.github.com/repos/apache/camel-website/contents/content/releases/";
+ private static final String GIT_CAMEL_URL = "https://api.github.com/repos/apache/camel-website/contents/content/releases/";
+ private static final String GIT_CAMEL_QUARKUS_URL
+ = "https://api.github.com/repos/apache/camel-website/contents/content/releases/q/";
/**
* The output directory for generated file
@@ -63,28 +65,34 @@ public class UpdateCamelReleasesMojo extends AbstractGeneratorMojo {
try {
getLog().info("Updating Camel release information from camel-website");
- List<String> links = fetchCamelReleaseLinks();
- List<ReleaseModel> releases = processReleases(links);
- releases.sort(Comparator.comparing(ReleaseModel::getVersion));
- getLog().info("Found " + releases.size() + " Camel releases");
-
- JsonArray arr = new JsonArray();
- for (ReleaseModel r : releases) {
- JsonObject jo = JsonMapper.asJsonObject(r);
- arr.add(jo);
- }
- String json = Jsoner.serialize(arr);
- json = Jsoner.prettyPrint(json, 4);
-
- Path path = outDir.toPath();
- updateResource(path, "camel-releases.json", json);
- addResourceDirectory(path);
+ List<String> links = fetchCamelReleaseLinks(GIT_CAMEL_URL);
+ updateCamelRelease(links, "camel-releases.json");
+ links = fetchCamelReleaseLinks(GIT_CAMEL_QUARKUS_URL);
+ updateCamelRelease(links, "camel-quarkus-releases.json");
} catch (Exception e) {
throw new MojoExecutionException("Error updating Camel releases", e);
}
}
+ private void updateCamelRelease(List<String> links, String fileName) throws Exception {
+ List<ReleaseModel> releases = processReleases(links);
+ releases.sort(Comparator.comparing(ReleaseModel::getVersion));
+ getLog().info("Found " + releases.size() + " releases");
+
+ JsonArray arr = new JsonArray();
+ for (ReleaseModel r : releases) {
+ JsonObject jo = JsonMapper.asJsonObject(r);
+ arr.add(jo);
+ }
+ String json = Jsoner.serialize(arr);
+ json = Jsoner.prettyPrint(json, 4);
+
+ Path path = outDir.toPath();
+ updateResource(path, fileName, json);
+ addResourceDirectory(path);
+ }
+
private List<ReleaseModel> processReleases(List<String> urls) throws Exception {
List<ReleaseModel> answer = new ArrayList<>();
@@ -124,12 +132,12 @@ public class UpdateCamelReleasesMojo extends AbstractGeneratorMojo {
return answer;
}
- private List<String> fetchCamelReleaseLinks() throws Exception {
+ private List<String> fetchCamelReleaseLinks(String gitUrl) throws Exception {
List<String> answer = new ArrayList<>();
// use JDK http client to call github api
HttpClient hc = HttpClient.newHttpClient();
- HttpResponse<String> res = hc.send(HttpRequest.newBuilder(new URI(GIT_URL)).timeout(Duration.ofSeconds(20)).build(),
+ HttpResponse<String> res = hc.send(HttpRequest.newBuilder(new URI(gitUrl)).timeout(Duration.ofSeconds(20)).build(),
HttpResponse.BodyHandlers.ofString());
// follow redirect