resolved conflicts

Author: reshmifrog

.github/scripts/prepare-cli-release

@@ -0,0 +1,66 @@
+# prepare-cli-release
+
+Helper script that locally mirrors the GitHub Actions **Prepare Release** workflow. It bumps the CLI version, updates deps, builds, pushes a branch, and opens a PR.
+
+## Prerequisites
+- Python 3.8+ (runs the script).
+- Go toolchain available (or provide `--go-home` to a GOROOT).
+- `gh` CLI authenticated for `jfrog/jfrog-cli` (or export `GH_TOKEN`/`GITHUB_TOKEN`).
+- Git workspace clean enough to create/push a branch.
+- Make/build tooling used by `make update-all` and `build/build.sh`.
+
+## Steps the script performs
+1) Compute current version: `go run main.go -v`
+2) Compute next version from the latest release tag via `gh release view`
+3) Create branch `bump-ver-from-<current>-to-<next>` from `--ref` (default `master`)
+4) Run `build/bump-version.sh <next>` with `BUMP_VERSION_SKIP_GIT=true`
+5) Run `make update-all`
+6) Build/check binary via `./build/build.sh` and `./jf --version`
+7) Commit and push the branch
+8) Open a PR titled `Bump version to <next>`
+9) Annotate workflow and add the `ignore for release` label
+
+## Usage
+Run from the repo root (the script checks for `go.mod` with module `github.com/jfrog/jfrog-cli`):
+
+```bash
+.github/scripts/prepare-cli-release --version minor --ref master
+```
+
+### Key flags
+- `--version {minor,patch}`: bump type (default: `minor`).
+- `--ref <branch>`: base branch to start from (default: `master`).
+- `--starting-step <step>`: resume from a specific step; earlier steps are skipped but required values are recomputed when needed.
+- `--gh-token <token>`: GitHub token; otherwise uses `GH_TOKEN`/`GITHUB_TOKEN` or existing `gh` auth.
+- `--dry-run`: print the planned actions and computed versions; no mutations.
+- `--go-home <path>`: set `GOROOT` and prepend its `bin` to `PATH`.
+
+### Common flows
+- Minor release from master:
+  ```bash
+  .github/scripts/prepare-cli-release --version minor --ref master
+  ```
+- Patch release from a maintenance branch:
+  ```bash
+  .github/scripts/prepare-cli-release --version patch --ref release/3.2
+  ```
+- Dry run to preview:
+  ```bash
+  .github/scripts/prepare-cli-release --version minor --dry-run
+  ```
+- Resume after a previous partial run (e.g., start at dependency update):
+  ```bash
+  .github/scripts/prepare-cli-release --starting-step update-dependencies
+  ```
+
+## Outputs
+- Branch: `bump-ver-from-<current>-to-<next>` pushed to `origin`.
+- PR: Created against the base branch with title/body `Bump version to <next>`.
+- Workflow notice printed with PR link and version.
+
+## Troubleshooting tips
+- Auth errors from `gh`: ensure `gh auth status` succeeds or pass `--gh-token`.
+- Go not found: install Go or provide `--go-home /path/to/go`.
+- Push failures: verify remote `origin` exists and you have permission to push.
+- Missing tools: ensure `make`, `build/bump-version.sh`, and `build/build.sh` are executable in the repo root.
+

.github/scripts/prepare-cli-release.md

@@ -1173,6 +1173,7 @@ func transferFilesCmd(c *cli.Context) error {
 	includeReposPatterns, excludeReposPatterns := getTransferIncludeExcludeRepos(c)
 	newTransferFilesCmd.SetIncludeReposPatterns(includeReposPatterns)
 	newTransferFilesCmd.SetExcludeReposPatterns(excludeReposPatterns)
+	newTransferFilesCmd.SetIncludeFilesPatterns(getIncludeFilesPatterns(c))
 	newTransferFilesCmd.SetIgnoreState(c.Bool(cliutils.IgnoreState))
 	newTransferFilesCmd.SetProxyKey(c.String(cliutils.ProxyKey))
 	return newTransferFilesCmd.Run()
@@ -1189,6 +1190,14 @@ func getTransferIncludeExcludeRepos(c *cli.Context) (includeReposPatterns, exclu
 	return
 }
 
+func getIncludeFilesPatterns(c *cli.Context) []string {
+	const patternSeparator = ";"
+	if c.IsSet(cliutils.IncludeFiles) {
+		return strings.Split(c.String(cliutils.IncludeFiles), patternSeparator)
+	}
+	return nil
+}
+
 func getTransferIncludeExcludeProjects(c *cli.Context) (includeProjectsPatterns, excludeProjectsPatterns []string) {
 	const patternSeparator = ";"
 	if c.IsSet(cliutils.IncludeProjects) {

artifactory/cli.go

@@ -2,10 +2,11 @@ package artifactory
 
 import (
 	"bytes"
-	"github.com/jfrog/jfrog-cli-artifactory/cliutils/flagkit"
 	"path/filepath"
 	"testing"
 
+	"github.com/jfrog/jfrog-cli-artifactory/cliutils/flagkit"
+
 	commonCliUtils "github.com/jfrog/jfrog-cli-core/v2/common/cliutils"
 	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
 	"github.com/jfrog/jfrog-cli/utils/cliutils"
@@ -154,3 +155,46 @@ func TestCreateUploadConfiguration(t *testing.T) {
 		})
 	}
 }
+
+// Test cases for getIncludeFilesPatterns
+var getIncludeFilesPatternsTestCases = []struct {
+	name             string
+	flags            []string
+	expectedPatterns []string
+}{
+	{
+		name:             "no flag set",
+		flags:            []string{},
+		expectedPatterns: nil,
+	},
+	{
+		name:             "single pattern",
+		flags:            []string{cliutils.IncludeFiles + "=org/company/*"},
+		expectedPatterns: []string{"org/company/*"},
+	},
+	{
+		name:             "multiple patterns",
+		flags:            []string{cliutils.IncludeFiles + "=org/company/*;com/example/*"},
+		expectedPatterns: []string{"org/company/*", "com/example/*"},
+	},
+	{
+		name:             "three patterns",
+		flags:            []string{cliutils.IncludeFiles + "=path1/*;path2/*;path3/*"},
+		expectedPatterns: []string{"path1/*", "path2/*", "path3/*"},
+	},
+	{
+		name:             "pattern with deep nesting",
+		flags:            []string{cliutils.IncludeFiles + "=a/b/c/d/e/*"},
+		expectedPatterns: []string{"a/b/c/d/e/*"},
+	},
+}
+
+func TestGetIncludeFilesPatterns(t *testing.T) {
+	for _, testCase := range getIncludeFilesPatternsTestCases {
+		t.Run(testCase.name, func(t *testing.T) {
+			context, _ := tests.CreateContext(t, testCase.flags, []string{})
+			patterns := getIncludeFilesPatterns(context)
+			assert.Equal(t, testCase.expectedPatterns, patterns)
+		})
+	}
+}

artifactory/cli_test.go

@@ -276,13 +276,13 @@ func TestReleaseBundleImportOnPrem(t *testing.T) {
 
 func TestReleaseBundleV2Download(t *testing.T) {
 	buildNumber := "5"
+	initArtifactoryTest(t, "")
+	initLifecycleTest(t, signingKeyOptionalArtifactoryMinVersion)
 	defer func() {
 		deleteReceivedReleaseBundle(t, deleteReleaseBundleV2ApiUrl, tests.LcRbName1, buildNumber)
 		inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, tests.RtBuildName1, artHttpDetails)
 		cleanArtifactoryTest()
 	}()
-	initArtifactoryTest(t, "")
-	initLifecycleTest(t, signingKeyOptionalArtifactoryMinVersion)
 
 	runRt(t, "upload", "testdata/a/a1.in", tests.RtRepo1, "--build-name="+tests.RtBuildName1, "--build-number="+buildNumber)
 	runRt(t, "build-publish", tests.RtBuildName1, buildNumber)

artifactory_test.go

@@ -1,6 +1,6 @@
 {
   "name": "jfrog-cli-v2-jf",
-  "version": "2.86.0",
+  "version": "2.87.0",
   "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
   "homepage": "https://github.com/jfrog/jfrog-cli",
   "preferGlobal": true,

build/npm/v2-jf/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "jfrog-cli-v2",
-  "version": "2.86.0",
+  "version": "2.87.0",
   "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
   "homepage": "https://github.com/jfrog/jfrog-cli",
   "preferGlobal": true,

build/npm/v2-jf/package.json

@@ -358,6 +358,7 @@ func GetCommands() []cli.Command {
 		},
 		{
 			Name:            "conan",
+			Hidden:          true,
 			Flags:           cliutils.GetCommandFlags(cliutils.Conan),
 			Usage:           conan.GetDescription(),
 			HelpName:        corecommon.CreateUsage("conan", conan.GetDescription(), conan.Usage),