Merge branch 'dev' into fix-rbc-project

docs/artifactory/buildaddgit/help.go

@@ -3,7 +3,11 @@ package buildaddgit
 var Usage = []string{"rt bag [command options] <build name> <build number> [Path To .git]"}
 
 func GetDescription() string {
-	return "Collect VCS details from git and add them to a build."
+	return "Collects the Git revision and URL from the local .git directory and adds it to the build-info.\n" +
+		"It can also collect the list of tracked project issues (for example, issues stored in JIRA or other bug tracking systems) and add them to the build-info.\n" +
+		"The issues are collected by reading the git commit messages from the local git log.\n" +
+		"Each commit message is matched against a pre-configured regular expression, which retrieves the issue ID and issue summary.\n" +
+		"The information required for collecting the issues is retrieved from a yaml configuration file provided to the command."
 }
 
 func GetArguments() string {

docs/artifactory/copy/help.go

@@ -8,15 +8,15 @@ var Usage = []string{"rt cp [command options] <source pattern> <target pattern>"
 const EnvVar string = common.JfrogCliFailNoOp
 
 func GetDescription() string {
-	return "Copy files."
+	return "Copy files between Artifactory paths."
 }
 
 func GetArguments() string {
-	return `	source Pattern
+	return `	source pattern
 		Specifies the source path in Artifactory, from which the artifacts should be copied,
 		in the following format: <repository name>/<repository path>. You can use wildcards to specify multiple artifacts.
 
-	target Pattern
+	target pattern
 		Specifies the target path in Artifactory, to which the artifacts should be copied, in the following format: <repository name>/<repository path>.
 		If the pattern ends with a slash, the target path is assumed to be a folder. For example, if you specify the target as "repo-name/a/b/",
 		then "b" is assumed to be a folder in Artifactory into which files should be copied.

docs/artifactory/delete/help.go

@@ -8,7 +8,7 @@ var Usage = []string{"rt del [command options] <delete pattern>",
 const EnvVar string = common.JfrogCliFailNoOp
 
 func GetDescription() string {
-	return "Delete files."
+	return "Delete files from Artifactory."
 }
 
 func GetArguments() string {

docs/artifactory/deleteprops/help.go

@@ -2,8 +2,8 @@ package deleteprops
 
 import "github.com/jfrog/jfrog-cli/docs/common"
 
-var Usage = []string{"rt delp [command options] <artifacts pattern> <artifact properties>",
-	"rt delp <artifact properties> --spec=<File Spec path> [command options]"}
+var Usage = []string{"rt delp [command options] <files pattern> <properties list>",
+	"rt delp <properties list> --spec=<File Spec path> [command options]"}
 
 const EnvVar string = common.JfrogCliFailNoOp
 
@@ -12,9 +12,10 @@ func GetDescription() string {
 }
 
 func GetArguments() string {
-	return `	artifacts pattern
+	return `	files pattern
 		Properties of artifacts that match this pattern will be removed.
+		in the following format: <repository name>/<repository path>. You can use wildcards to specify multiple artifacts.	
 
-	artifact properties
-		The list of properties, in the form of key1,key2,..., to be removed from the matching artifacts.`
+	properties list
+		List of comma-separated(,) properties, in the form of key1,key2,..., to be removed from the matching files.`
 }

docs/artifactory/download/help.go

@@ -8,7 +8,7 @@ var Usage = []string{"rt dl [command options] <source pattern> [target pattern]"
 var EnvVar = []string{common.JfrogCliTransitiveDownloadExperimental, common.JfrogCliFailNoOp}
 
 func GetDescription() string {
-	return "Download files."
+	return "Download files from Artifactory to local file system."
 }
 
 func GetArguments() string {

docs/artifactory/groupaddusers/help.go

@@ -12,6 +12,6 @@ func GetArguments() string {
 
 	users list
 		Specifies the usernames to add to the specified group.
-		The list should be comma-separated. 
+		The list should be comma-separated(,) in the form of user1,user2,...
 	`
 }

docs/artifactory/move/help.go

@@ -8,7 +8,7 @@ var Usage = []string{"rt mv [command options] <source pattern> <target pattern>"
 var EnvVar = common.JfrogCliFailNoOp
 
 func GetDescription() string {
-	return "Move files."
+	return "Move files between Artifactory paths."
 }
 
 func GetArguments() string {

docs/artifactory/podmanpull/help.go

@@ -1,6 +1,6 @@
 package podmanpull
 
-var Usage = []string{"rt podman-pull <image tag> <target repo>"}
+var Usage = []string{"rt podman-pull <image tag> <source repo>"}
 
 func GetDescription() string {
 	return "Podman pull."
@@ -9,7 +9,7 @@ func GetDescription() string {
 func GetArguments() string {
 	return `	image tag
 		Docker image tag to pull.
-	target repo
+	source repo
 		Source repository in Artifactory.
 `
 }

docs/artifactory/search/help.go

@@ -8,7 +8,7 @@ var Usage = []string{"rt s [command options] <search pattern>",
 const EnvVar string = common.JfrogCliFailNoOp
 
 func GetDescription() string {
-	return "Search files."
+	return "Search files in Artifactory."
 }
 
 func GetArguments() string {

docs/artifactory/setprops/help.go

@@ -2,8 +2,8 @@ package setprops
 
 import "github.com/jfrog/jfrog-cli/docs/common"
 
-var Usage = []string{"rt sp [command options] <artifacts pattern> <artifact properties>",
-	"rt sp <artifact properties> --spec=<File Spec path> [command options]"}
+var Usage = []string{"rt sp [command options] <files pattern> <file properties>",
+	"rt sp <file properties> --spec=<File Spec path> [command options]"}
 
 const EnvVar string = common.JfrogCliFailNoOp
 
@@ -12,9 +12,9 @@ func GetDescription() string {
 }
 
 func GetArguments() string {
-	return `	artifacts pattern
+	return `	files pattern
 		Artifacts that match the pattern will be set with the specified properties.
 
-	artifact properties
-		The list of properties, in the form of key1=value1;key2=value2,..., to be set on the matching artifacts.`
+	file properties
+		List of semicolon-separated(;) key-value properties, in the form of "key1=value1;key2=value2;..." to be set on the matching artifacts.`
 }

docs/artifactory/upload/help.go

@@ -8,7 +8,7 @@ var Usage = []string{"rt u [command options] <source pattern> <target pattern>",
 var EnvVar = []string{common.JfrogCliMinChecksumDeploySizeKb, common.JfrogCliFailNoOp, common.JfrogCliUploadEmptyArchive}
 
 func GetDescription() string {
-	return "Upload files."
+	return "Upload files from local file system to Artifactory."
 }
 
 func GetArguments() string {

docs/artifactory/usersdelete/help.go

@@ -8,5 +8,5 @@ func GetDescription() string {
 
 func GetArguments() string {
 	return `	users list
-		Comma-separated list of usernames to delete.`
+		Comma-separated(,) list of usernames to delete in the form of user1,user2,....`
 }

docs/common/env.go

@@ -101,7 +101,7 @@ var (
 
 	JfrogCliEnvExclude = `	JFROG_CLI_ENV_EXCLUDE
 		[Default: *password*;*psw*;*secret*;*key*;*token*;*auth*]
-		List of case insensitive patterns in the form of "value1;value2;...".
+		List of case insensitive semicolon-separated(;) patterns in the form of "value1;value2;...".
 		Environment variables match those patterns will be excluded.
 		This environment variable is used by the "` + coreutils.GetCliExecutableName() + ` rt build-publish" command,
 		in case the --env-exclude command option is not sent.`

general/project/cli.go

@@ -19,6 +19,7 @@ func GetCommands() []cli.Command {
 	return cliutils.GetSortedCommands(cli.CommandsByName{
 		{
 			Name:         "init",
+			Hidden:       true,
 			Usage:        projectinit.GetDescription(),
 			Flags:        cliutils.GetCommandFlags(cliutils.InitProject),
 			HelpName:     corecommon.CreateUsage("project init", projectinit.GetDescription(), projectinit.Usage),

go.mod

@@ -16,10 +16,10 @@ require (
 	github.com/jszwec/csvutil v1.10.0
 	github.com/stretchr/testify v1.9.0
 	github.com/testcontainers/testcontainers-go v0.23.0
-	github.com/urfave/cli v1.22.14
+	github.com/urfave/cli v1.22.15
 	github.com/xeipuuv/gojsonschema v1.2.0
-	golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8
-	golang.org/x/term v0.18.0
+	golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f
+	golang.org/x/term v0.20.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
@@ -38,10 +38,10 @@ require (
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/chzyer/readline v1.5.1 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
-	github.com/containerd/containerd v1.7.12 // indirect
+	github.com/containerd/containerd v1.7.15 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/cpuguy83/dockercfg v0.3.1 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/distribution/reference v0.5.0 // indirect
@@ -50,23 +50,23 @@ require (
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/felixge/httpsnoop v1.0.3 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/forPelevin/gomoji v1.2.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.5.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gookit/color v1.5.4 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
-	github.com/jedib0t/go-pretty/v6 v6.5.6 // indirect
+	github.com/jedib0t/go-pretty/v6 v6.5.8 // indirect
 	github.com/jfrog/jfrog-apps-config v1.0.1 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/klauspost/compress v1.17.4 // indirect
@@ -116,19 +116,19 @@ require (
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
-	go.opentelemetry.io/otel v1.19.0 // indirect
-	go.opentelemetry.io/otel/metric v1.19.0 // indirect
-	go.opentelemetry.io/otel/trace v1.19.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
+	go.opentelemetry.io/otel v1.24.0 // indirect
+	go.opentelemetry.io/otel/metric v1.24.0 // indirect
+	go.opentelemetry.io/otel/trace v1.24.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
-	golang.org/x/crypto v0.21.0 // indirect
-	golang.org/x/mod v0.16.0 // indirect
-	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.19.0 // indirect
+	golang.org/x/crypto v0.22.0 // indirect
+	golang.org/x/mod v0.17.0 // indirect
+	golang.org/x/net v0.24.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/tools v0.20.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
 	google.golang.org/grpc v1.59.0 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
@@ -137,7 +137,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240505135056-aa682847c303
+replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240505160419-7173b506c6b7
 
 replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240505164307-d12abb9f140e