OakRun offline

krystian-panek-vmltech · krystian-panek-vmltech · commit f922cc433c8e · 2025-08-28T11:23:59.000+02:00
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -50,6 +50,7 @@ snapshot:
   version_template: "{{ incpatch .Version }}-next"
 
 changelog:
+  use: github
   sort: asc
   filters:
     exclude:
diff --git a/examples/docker/src/aem/default/etc/aem.yml b/examples/docker/src/aem/default/etc/aem.yml
@@ -277,6 +277,11 @@ vendor:
     download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/oak-run/1.72.0/oak-run-1.72.0.jar"
     store_path: "crx-quickstart/repository/segmentstore"
 
+    # Pre-installed local JAR file
+    # a) keep it empty to download it automatically
+    # b) set it to an absolute path to skip downloading
+    jar_file: ""
+
 # Content clean options
 content:
   clean:
diff --git a/pkg/oak_run.go b/pkg/oak_run.go
@@ -39,9 +39,7 @@ func (or OakRun) Dir() string {
 
 func (or OakRun) lock() osx.Lock[OakRunLock] {
 	return osx.NewLock(or.Dir()+"/lock/create.yml", func() (OakRunLock, error) {
-		return OakRunLock{
-			DownloadURL: or.DownloadURL,
-		}, nil
+		return OakRunLock{DownloadURL: or.DownloadURL}, nil
 	})
 }
 
@@ -53,13 +51,12 @@ func (or OakRun) PrepareWithChanged() (bool, error) {
 	}
 
 	if or.JarFile != "" {
-		// No preparation needed if using a local JAR
-		log.Infof("using Oak Run JAR from local file '%s'", or.JarFile)
+		log.Debugf("using OakRun from JAR file '%s'", or.JarFile)
 		return false, nil
 	}
 
 	if check.UpToDate {
-		log.Debugf("existing OakRun '%s is up-to-date", or.DownloadURL)
+		log.Debugf("existing OakRun '%s' is up-to-date", or.DownloadURL)
 		return false, nil
 	}
 	log.Infof("preparing new OakRun '%s'", or.DownloadURL)
diff --git a/pkg/project/app_classic/aem/default/etc/aem.yml b/pkg/project/app_classic/aem/default/etc/aem.yml
@@ -279,6 +279,11 @@ vendor:
     download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/oak-run/1.72.0/oak-run-1.72.0.jar"
     store_path: "crx-quickstart/repository/segmentstore"
 
+    # Pre-installed local JAR file
+    # a) keep it empty to download it automatically
+    # b) set it to an absolute path to skip downloading
+    jar_file: ""
+
 # Content-related options
 content:
   clean:
diff --git a/pkg/project/app_cloud/aem/default/etc/aem.yml b/pkg/project/app_cloud/aem/default/etc/aem.yml
@@ -279,6 +279,11 @@ vendor:
     download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/oak-run/1.72.0/oak-run-1.72.0.jar"
     store_path: "crx-quickstart/repository/segmentstore"
 
+    # Pre-installed local JAR file
+    # a) keep it empty to download it automatically
+    # b) set it to an absolute path to skip downloading
+    jar_file: ""
+
 # Content-related options
 content:
   clean:
diff --git a/pkg/project/instance/aem/default/etc/aem.yml b/pkg/project/instance/aem/default/etc/aem.yml
@@ -274,6 +274,11 @@ vendor:
     download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/oak-run/1.72.0/oak-run-1.72.0.jar"
     store_path: "crx-quickstart/repository/segmentstore"
 
+    # Pre-installed local JAR file
+    # a) keep it empty to download it automatically
+    # b) set it to an absolute path to skip downloading
+    jar_file: ""
+
 # Content-related options
 content:
   clean:

Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,7 @@ func (or OakRun) Dir() string {`
`39`	`39`
`40`	`40`	`func (or OakRun) lock() osx.Lock[OakRunLock] {`
`41`	`41`	`return osx.NewLock(or.Dir()+"/lock/create.yml", func() (OakRunLock, error) {`
`42`		`- return OakRunLock{`
`43`		`- DownloadURL: or.DownloadURL,`
`44`		`- }, nil`
	`42`	`+ return OakRunLock{DownloadURL: or.DownloadURL}, nil`
`45`	`43`	`})`
`46`	`44`	`}`
`47`	`45`
`@@ -53,13 +51,12 @@ func (or OakRun) PrepareWithChanged() (bool, error) {`
`53`	`51`	`}`
`54`	`52`
`55`	`53`	`if or.JarFile != "" {`
`56`		`- // No preparation needed if using a local JAR`
`57`		`- log.Infof("using Oak Run JAR from local file '%s'", or.JarFile)`
	`54`	`+ log.Debugf("using OakRun from JAR file '%s'", or.JarFile)`
`58`	`55`	`return false, nil`
`59`	`56`	`}`
`60`	`57`
`61`	`58`	`if check.UpToDate {`
`62`		`- log.Debugf("existing OakRun '%s is up-to-date", or.DownloadURL)`
	`59`	`+ log.Debugf("existing OakRun '%s' is up-to-date", or.DownloadURL)`
`63`	`60`	`return false, nil`
`64`	`61`	`}`
`65`	`62`	`log.Infof("preparing new OakRun '%s'", or.DownloadURL)`