Yaci Store download url for 2.0.0-beta1 (#122)

satran004 · web-flow · commit 1e5cdce51541 · 2025-05-03T20:47:59.000+08:00
* fix: Update download url for yaci-store native build

* Bump version for beta
diff --git a/applications/cli/config/download.properties b/applications/cli/config/download.properties
@@ -2,8 +2,10 @@
 node.version=10.1.4
 ogmios.version=6.11.2
 kupo.version=2.10.0
-yaci.store.version=0.2.0-graal-preview1
-yaci.store.jar.version=0.1.1
+
+yaci.store.tag=rel-native-2.0.0-beta1-devkit
+yaci.store.version=2.0.0-beta1-devkit
+yaci.store.jar.version=2.0.0-beta1
 
 #node.url=
 #ogmios.url=
diff --git a/applications/cli/src/main/java/com/bloxbean/cardano/yacicli/commands/common/DownloadService.java b/applications/cli/src/main/java/com/bloxbean/cardano/yacicli/commands/common/DownloadService.java
@@ -42,6 +42,9 @@ public class DownloadService {
     @Value("${yaci.store.version:#{null}}")
     private String yaciStoreVersion;
 
+    @Value("${yaci.store.tag:#{null}}")
+    private String yaciStoreTag;
+
     @Value("${yaci.store.jar.version:#{null}}")
     private String yaciStoreJarVersion;
 
@@ -67,7 +70,7 @@ public boolean downloadNode(boolean overwrite) {
         String downloadPath = resolveNodeDownloadPath();
 
         if ( downloadPath == null) {
-            writeLn(error("Download URL for cardano-node is not set. Please set the download URL in application.properties"));
+            writeLn(error("Download URL for cardano-node is not set. Please set the download URL in download.properties"));
             return false;
         }
 
@@ -108,7 +111,7 @@ public boolean downloadYaciStoreNative(boolean overwrite) {
         String downloadPath = resolveYaciStoreNativeDownloadPath();
 
         if ( downloadPath == null) {
-            writeLn(error("Download URL for yaci-store is not set. Please set the download URL in application.properties"));
+            writeLn(error("Download URL for yaci-store is not set. Please set the download URL in download.properties"));
             return false;
         }
 
@@ -171,7 +174,7 @@ public boolean downloadYaciStoreJar(boolean overwrite) {
         String downloadPath = resolveYaciStoreJarDownloadPath();
 
         if ( downloadPath == null) {
-            writeLn(error("Download URL for yaci-store-jar is not set. Please set the download URL in application.properties"));
+            writeLn(error("Download URL for yaci-store-jar is not set. Please set the download URL in download.properties"));
             return false;
         }
 
@@ -201,7 +204,7 @@ public boolean downloadJre(boolean overwrite) {
         String downloadPath = JreResolver.resolveJreDownloadUrl();
 
         if ( downloadPath == null) {
-            writeLn(error("Download URL for JRE is not set. Please set the download URL in application.properties"));
+            writeLn(error("Download URL for JRE is not set. Please set the download URL in download.properties"));
             return false;
         }
 
@@ -240,7 +243,7 @@ public boolean downloadOgmios(boolean overwrite) {
         String downloadPath = resolveOgmiosDownloadPath();
 
         if ( downloadPath == null) {
-            writeLn(error("Download URL for ogmios is not set. Please set the download URL in application.properties"));
+            writeLn(error("Download URL for ogmios is not set. Please set the download URL in download.properties"));
             return false;
         }
 
@@ -277,7 +280,7 @@ public boolean downloadKupo(boolean overwrite) {
         String downloadPath = resolveKupoDownloadPath();
 
         if ( downloadPath == null) {
-            writeLn(error("Download URL for Kupo is not set. Please set the download URL in application.properties"));
+            writeLn(error("Download URL for Kupo is not set. Please set the download URL in download.properties"));
             return false;
         }
 
@@ -433,7 +436,7 @@ private String resolveNodeDownloadPath() {
         }
 
         if (StringUtils.isEmpty(nodeVersion)) {
-            writeLn(error("Node version is not set. Please set the node version (node.version) or node download url (node.url) in application.properties"));
+            writeLn(error("Node version is not set. Please set the node version (node.version) or node download url (node.url) in download.properties"));
             return null;
         }
 
@@ -459,7 +462,12 @@ private String resolveYaciStoreNativeDownloadPath() {
         }
 
         if (StringUtils.isEmpty(yaciStoreVersion)) {
-            writeLn(error("YaciStore version is not set. Please set the yaci-store version (yaci.store.version) or yaci-store download url (yaci.store.url) in application.properties"));
+            writeLn(error("YaciStore version is not set. Please set the yaci-store version (yaci.store.version) or yaci-store download url (yaci.store.url) in download.properties"));
+            return null;
+        }
+
+        if (StringUtils.isEmpty(yaciStoreTag)) {
+            writeLn(error("YaciStore download tag is not set. Please set the yaci-store tag (yaci.store.tag) or yaci-store download url (yaci.store.url) in download.properties"));
             return null;
         }
 
@@ -481,7 +489,7 @@ private String resolveYaciStoreNativeDownloadPath() {
         }
 
 
-        String url = YACI_STORE_DOWNLOAD_URL + "/rel-graal-" + yaciStoreVersion + "/yaci-store-" + yaciStoreVersion + "-" + osPrefix + "-" + cpuArch +"-n2c.zip";
+        String url = YACI_STORE_DOWNLOAD_URL + "/" + yaciStoreTag + "/yaci-store-" + yaciStoreVersion + "-" + osPrefix + "-" + cpuArch +"-n2c.zip";
         return url;
     }
 
@@ -491,7 +499,7 @@ private String resolveYaciStoreJarDownloadPath() {
         }
 
         if (StringUtils.isEmpty(yaciStoreJarVersion)) {
-            writeLn(error("YaciStore Jar version is not set. Please set the yaci-store version (yaci.store.jar.version) or yaci-store download url (yaci.store.jar.url) in application.properties"));
+            writeLn(error("YaciStore Jar version is not set. Please set the yaci-store version (yaci.store.jar.version) or yaci-store download url (yaci.store.jar.url) in download.properties"));
             return null;
         }
 
@@ -505,7 +513,7 @@ private String resolveOgmiosDownloadPath() {
         }
 
         if (StringUtils.isEmpty(ogmiosVersion)) {
-            writeLn(error("Ogmios version is not set. Please set the ogmios version (ogmios.version) or ogmios download url (ogmios.url) in application.properties"));
+            writeLn(error("Ogmios version is not set. Please set the ogmios version (ogmios.version) or ogmios download url (ogmios.url) in download.properties"));
             return null;
         }
 
@@ -536,7 +544,7 @@ private String resolveKupoDownloadPath() {
         }
 
         if (StringUtils.isEmpty(kupoVersion)) {
-            writeLn(error("Kupo version is not set. Please set the kupo version (kupo.version) or kupo download url (kupo.url) in application.properties"));
+            writeLn(error("Kupo version is not set. Please set the kupo version (kupo.version) or kupo download url (kupo.url) in download.properties"));
             return null;
         }
 
diff --git a/config/version b/config/version
@@ -1,2 +1,2 @@
-tag=0.10.6-preview
+tag=0.10.6-beta
 revision=

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,9 @@ public class DownloadService {`
`42`	`42`	`@Value("${yaci.store.version:#{null}}")`
`43`	`43`	`private String yaciStoreVersion;`
`44`	`44`
	`45`	`+ @Value("${yaci.store.tag:#{null}}")`
	`46`	`+ private String yaciStoreTag;`
	`47`	`+`
`45`	`48`	`@Value("${yaci.store.jar.version:#{null}}")`
`46`	`49`	`private String yaciStoreJarVersion;`
`47`	`50`
`@@ -67,7 +70,7 @@ public boolean downloadNode(boolean overwrite) {`
`67`	`70`	`String downloadPath = resolveNodeDownloadPath();`
`68`	`71`
`69`	`72`	`if ( downloadPath == null) {`
`70`		`- writeLn(error("Download URL for cardano-node is not set. Please set the download URL in application.properties"));`
	`73`	`+ writeLn(error("Download URL for cardano-node is not set. Please set the download URL in download.properties"));`
`71`	`74`	`return false;`
`72`	`75`	`}`
`73`	`76`
`@@ -108,7 +111,7 @@ public boolean downloadYaciStoreNative(boolean overwrite) {`
`108`	`111`	`String downloadPath = resolveYaciStoreNativeDownloadPath();`
`109`	`112`
`110`	`113`	`if ( downloadPath == null) {`
`111`		`- writeLn(error("Download URL for yaci-store is not set. Please set the download URL in application.properties"));`
	`114`	`+ writeLn(error("Download URL for yaci-store is not set. Please set the download URL in download.properties"));`
`112`	`115`	`return false;`
`113`	`116`	`}`
`114`	`117`
`@@ -171,7 +174,7 @@ public boolean downloadYaciStoreJar(boolean overwrite) {`
`171`	`174`	`String downloadPath = resolveYaciStoreJarDownloadPath();`
`172`	`175`
`173`	`176`	`if ( downloadPath == null) {`
`174`		`- writeLn(error("Download URL for yaci-store-jar is not set. Please set the download URL in application.properties"));`
	`177`	`+ writeLn(error("Download URL for yaci-store-jar is not set. Please set the download URL in download.properties"));`
`175`	`178`	`return false;`
`176`	`179`	`}`
`177`	`180`
`@@ -201,7 +204,7 @@ public boolean downloadJre(boolean overwrite) {`
`201`	`204`	`String downloadPath = JreResolver.resolveJreDownloadUrl();`
`202`	`205`
`203`	`206`	`if ( downloadPath == null) {`
`204`		`- writeLn(error("Download URL for JRE is not set. Please set the download URL in application.properties"));`
	`207`	`+ writeLn(error("Download URL for JRE is not set. Please set the download URL in download.properties"));`
`205`	`208`	`return false;`
`206`	`209`	`}`
`207`	`210`
`@@ -240,7 +243,7 @@ public boolean downloadOgmios(boolean overwrite) {`
`240`	`243`	`String downloadPath = resolveOgmiosDownloadPath();`
`241`	`244`
`242`	`245`	`if ( downloadPath == null) {`
`243`		`- writeLn(error("Download URL for ogmios is not set. Please set the download URL in application.properties"));`
	`246`	`+ writeLn(error("Download URL for ogmios is not set. Please set the download URL in download.properties"));`
`244`	`247`	`return false;`
`245`	`248`	`}`
`246`	`249`
`@@ -277,7 +280,7 @@ public boolean downloadKupo(boolean overwrite) {`
`277`	`280`	`String downloadPath = resolveKupoDownloadPath();`
`278`	`281`
`279`	`282`	`if ( downloadPath == null) {`
`280`		`- writeLn(error("Download URL for Kupo is not set. Please set the download URL in application.properties"));`
	`283`	`+ writeLn(error("Download URL for Kupo is not set. Please set the download URL in download.properties"));`
`281`	`284`	`return false;`
`282`	`285`	`}`
`283`	`286`
`@@ -433,7 +436,7 @@ private String resolveNodeDownloadPath() {`
`433`	`436`	`}`
`434`	`437`
`435`	`438`	`if (StringUtils.isEmpty(nodeVersion)) {`
`436`		`- writeLn(error("Node version is not set. Please set the node version (node.version) or node download url (node.url) in application.properties"));`
	`439`	`+ writeLn(error("Node version is not set. Please set the node version (node.version) or node download url (node.url) in download.properties"));`
`437`	`440`	`return null;`
`438`	`441`	`}`
`439`	`442`
`@@ -459,7 +462,12 @@ private String resolveYaciStoreNativeDownloadPath() {`
`459`	`462`	`}`
`460`	`463`
`461`	`464`	`if (StringUtils.isEmpty(yaciStoreVersion)) {`
`462`		`- writeLn(error("YaciStore version is not set. Please set the yaci-store version (yaci.store.version) or yaci-store download url (yaci.store.url) in application.properties"));`
	`465`	`+ writeLn(error("YaciStore version is not set. Please set the yaci-store version (yaci.store.version) or yaci-store download url (yaci.store.url) in download.properties"));`
	`466`	`+ return null;`
	`467`	`+ }`
	`468`	`+`
	`469`	`+ if (StringUtils.isEmpty(yaciStoreTag)) {`
	`470`	`+ writeLn(error("YaciStore download tag is not set. Please set the yaci-store tag (yaci.store.tag) or yaci-store download url (yaci.store.url) in download.properties"));`
`463`	`471`	`return null;`
`464`	`472`	`}`
`465`	`473`
`@@ -481,7 +489,7 @@ private String resolveYaciStoreNativeDownloadPath() {`
`481`	`489`	`}`
`482`	`490`
`483`	`491`
`484`		`- String url = YACI_STORE_DOWNLOAD_URL + "/rel-graal-" + yaciStoreVersion + "/yaci-store-" + yaciStoreVersion + "-" + osPrefix + "-" + cpuArch +"-n2c.zip";`
	`492`	`+ String url = YACI_STORE_DOWNLOAD_URL + "/" + yaciStoreTag + "/yaci-store-" + yaciStoreVersion + "-" + osPrefix + "-" + cpuArch +"-n2c.zip";`
`485`	`493`	`return url;`
`486`	`494`	`}`
`487`	`495`
`@@ -491,7 +499,7 @@ private String resolveYaciStoreJarDownloadPath() {`
`491`	`499`	`}`
`492`	`500`
`493`	`501`	`if (StringUtils.isEmpty(yaciStoreJarVersion)) {`
`494`		`- writeLn(error("YaciStore Jar version is not set. Please set the yaci-store version (yaci.store.jar.version) or yaci-store download url (yaci.store.jar.url) in application.properties"));`
	`502`	`+ writeLn(error("YaciStore Jar version is not set. Please set the yaci-store version (yaci.store.jar.version) or yaci-store download url (yaci.store.jar.url) in download.properties"));`
`495`	`503`	`return null;`
`496`	`504`	`}`
`497`	`505`
`@@ -505,7 +513,7 @@ private String resolveOgmiosDownloadPath() {`
`505`	`513`	`}`
`506`	`514`
`507`	`515`	`if (StringUtils.isEmpty(ogmiosVersion)) {`
`508`		`- writeLn(error("Ogmios version is not set. Please set the ogmios version (ogmios.version) or ogmios download url (ogmios.url) in application.properties"));`
	`516`	`+ writeLn(error("Ogmios version is not set. Please set the ogmios version (ogmios.version) or ogmios download url (ogmios.url) in download.properties"));`
`509`	`517`	`return null;`
`510`	`518`	`}`
`511`	`519`
`@@ -536,7 +544,7 @@ private String resolveKupoDownloadPath() {`
`536`	`544`	`}`
`537`	`545`
`538`	`546`	`if (StringUtils.isEmpty(kupoVersion)) {`
`539`		`- writeLn(error("Kupo version is not set. Please set the kupo version (kupo.version) or kupo download url (kupo.url) in application.properties"));`
	`547`	`+ writeLn(error("Kupo version is not set. Please set the kupo version (kupo.version) or kupo download url (kupo.url) in download.properties"));`
`540`	`548`	`return null;`
`541`	`549`	`}`
`542`	`550`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-tag=0.10.6-preview`
	`1`	`+tag=0.10.6-beta`
`2`	`2`	`revision=`