Skip to content

Commit bece1c0

Browse files
Vault CLI removed / to be reverted if needed
1 parent 6cb8222 commit bece1c0

File tree

10 files changed

+0
-182
lines changed

10 files changed

+0
-182
lines changed

README.md

-3
Original file line numberDiff line numberDiff line change
@@ -456,9 +456,6 @@ java:
456456
"arm64": "x64"
457457
"aarch64": "x64"
458458

459-
vault:
460-
"download_url": "https://repo1.maven.org/maven2/org/apache/jackrabbit/vault/vault-cli/3.8.2/vault-cli-3.8.2-bin.tar.gz"
461-
462459
base:
463460
# Location of temporary files (downloaded AEM packages, etc)
464461
tmp_dir: aem/home/tmp

cmd/aem/root.go

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ func (c *CLI) rootCmd() *cobra.Command {
3434
cmd.AddCommand(c.fileCmd())
3535
cmd.AddCommand(c.authCmd())
3636
cmd.AddCommand(c.contentCmd())
37-
cmd.AddCommand(c.vaultCmd())
3837

3938
c.rootFlags(cmd)
4039

cmd/aem/vault.go

-30
This file was deleted.

cmd/aem/vendor.go

-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ func (c *CLI) vendorListCmd() *cobra.Command {
4343
}
4444
c.SetOutput("javaExecutable", javaExecutable)
4545

46-
vaultExecutable := c.aem.VendorManager().VaultCLI().VltFile()
47-
c.setOutput("vaultExecutable", vaultExecutable)
48-
4946
oakRunJar := c.aem.VendorManager().OakRun().JarFile()
5047
c.setOutput("oakRunJar", oakRunJar)
5148

examples/docker/src/aem/default/etc/aem.yml

-3
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,6 @@ vendor:
265265
"arm64": "x64"
266266
"aarch64": "x64"
267267

268-
vault:
269-
download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/vault/vault-cli/3.8.2/vault-cli-3.8.2-bin.tar.gz"
270-
271268
# Oak Run tool options (offline instance management)
272269
oak_run:
273270
download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/oak-run/1.72.0/oak-run-1.72.0.jar"

pkg/project/app_classic/aem/default/etc/aem.yml

-4
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,6 @@ vendor:
272272
download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/oak-run/1.72.0/oak-run-1.72.0.jar"
273273
store_path: "crx-quickstart/repository/segmentstore"
274274

275-
# Jackrabbit Vault tool (repository content management tool)
276-
vault:
277-
download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/vault/vault-cli/3.8.2/vault-cli-3.8.2-bin.tar.gz"
278-
279275
# Content-related options
280276
content:
281277
clean:

pkg/project/app_cloud/aem/default/etc/aem.yml

-4
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,6 @@ vendor:
272272
download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/oak-run/1.72.0/oak-run-1.72.0.jar"
273273
store_path: "crx-quickstart/repository/segmentstore"
274274

275-
# Jackrabbit Vault tool (repository content management tool)
276-
vault:
277-
download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/vault/vault-cli/3.8.2/vault-cli-3.8.2-bin.tar.gz"
278-
279275
# Content-related options
280276
content:
281277
clean:

pkg/project/instance/aem/default/etc/aem.yml

-4
Original file line numberDiff line numberDiff line change
@@ -267,10 +267,6 @@ vendor:
267267
download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/oak-run/1.72.0/oak-run-1.72.0.jar"
268268
store_path: "crx-quickstart/repository/segmentstore"
269269

270-
# Jackrabbit Vault tool (repository content management tool)
271-
vault:
272-
download_url: "https://repo1.maven.org/maven2/org/apache/jackrabbit/vault/vault-cli/3.8.2/vault-cli-3.8.2-bin.tar.gz"
273-
274270
# Content-related options
275271
content:
276272
clean:

pkg/vault_cli.go

-118
This file was deleted.

pkg/vendor_manager.go

-12
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ type VendorManager struct {
88
oakRun *OakRun
99
quickstart *Quickstart
1010
sdk *SDK
11-
vaultCLI *VaultCLI
1211
}
1312

1413
func NewVendorManager(aem *AEM) *VendorManager {
@@ -17,7 +16,6 @@ func NewVendorManager(aem *AEM) *VendorManager {
1716
result.sdk = NewSDK(result)
1817
result.quickstart = NewQuickstart(result)
1918
result.oakRun = NewOakRun(result)
20-
result.vaultCLI = NewVaultCLI(result)
2119
return result
2220
}
2321

@@ -59,12 +57,6 @@ func (vm *VendorManager) PrepareWithChanged() (bool, error) {
5957
return changed, err
6058
}
6159

62-
vaultCLIChanged, err := vm.vaultCLI.PrepareWithChanged()
63-
changed = changed || vaultCLIChanged
64-
if err != nil {
65-
return changed, err
66-
}
67-
6860
return changed, nil
6961
}
7062

@@ -83,7 +75,3 @@ func (vm *VendorManager) Quickstart() *Quickstart {
8375
func (vm *VendorManager) SDK() *SDK {
8476
return vm.sdk
8577
}
86-
87-
func (vm *VendorManager) VaultCLI() *VaultCLI {
88-
return vm.vaultCLI
89-
}

0 commit comments

Comments
 (0)