Merge remote-tracking branch 'origin/dev' into v2

.github/workflows/pythonTests.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        suite: [ pip, pipenv, poetry ]
+        suite: [ pip, pipenv ]
         os: [ ubuntu, windows, macos ]
     runs-on: ${{ matrix.os }}-latest
     steps:
@@ -35,9 +35,6 @@ jobs:
       - name: Setup Pipenv
         if: ${{ matrix.suite == 'pipenv' }}
         run: python -m pip install pipenv
-      - name: Setup Poetry
-        if: ${{ matrix.suite == 'poetry' }}
-        run: python -m pip install poetry
       - name: Checkout code
         uses: actions/checkout@v3
         with:

.github/workflows/scriptTests.yml

@@ -78,7 +78,7 @@ jobs:
       - name: "Get latest release"
         id: latest-release
         run: |
-         export LATEST_RELEASE=`curl https://api.github.com/repos/jfrog/jfrog-cli/releases/latest -s | jq .name -r | cut -c 2-`
+         export LATEST_RELEASE=`curl https://api.github.com/repos/jfrog/jfrog-cli/releases/latest -s --retry 10 | jq .name -r | cut -c 2-`
          echo "LATEST_RELEASE=$LATEST_RELEASE" >> "$GITHUB_OUTPUT"
         shell: bash
 

CONTRIBUTING.md

@@ -104,7 +104,6 @@ The available test types are:
 | `-test.go`           | Go tests           |
 | `-test.pip`          | Pip tests          |
 | `-test.pipenv`       | Pipenv tests       |
-| `-test.poetry`       | Poetry tests       |
 | `-test.nuget`        | Nuget tests        |
 | `-test.plugins`      | Plugins tests      |
 | `-test.distribution` | Distribution tests |

Jenkinsfile

@@ -46,6 +46,18 @@ node("docker") {
             }
         }
 
+        state('synchronize branches') {
+            if ("$EXECUTION_MODE".toString().equals("Build CLI")) {
+                masterBranch = 'v2'
+                devBranch = 'dev'
+                if (BRANCH?.trim() == 'v1') {
+                    masterBranch = 'v1'
+                    devBranch = 'dev-v1'
+                }
+                synchronizeBranches(masterBranch, devBranch)
+            }
+        }
+
         stage('install npm') {
             installNpm(nodeVersion)
         }
@@ -148,6 +160,28 @@ def runRelease(architectures) {
     }
 }
 
+def synchronizeBranches(masterBranch, devBranch) {
+    dir("$cliWorkspace/$repo") {
+        releaseTag = "v$RELEASE_VERSION"
+        withCredentials([string(credentialsId: 'ecosystem-github-automation', variable: 'GITHUB_ACCESS_TOKEN')]) {
+            stage("Merge to $masterBranch") {
+                sh """#!/bin/bash
+                    git merge origin/$devBranch --no-edit
+                    git push "https://$GITHUB_ACCESS_TOKEN@github.com/jfrog/jfrog-cli.git"
+                """
+            }
+            stage("Merge to $devBranch") {
+                sh """#!/bin/bash
+                    git checkout $devBranch
+                    git merge origin/$masterBranch --no-edit
+                    git push "https://$GITHUB_ACCESS_TOKEN@github.com/jfrog/jfrog-cli.git"
+                    git checkout $masterBranch
+                """
+            }
+        }
+    }
+}
+
 def createTag() {
     stage('Create a tag and a GitHub release') {
         dir("$jfrogCliRepoDir") {

README.md

@@ -272,11 +272,11 @@ the [JFrog CLI User Guide](https://jfrog.com/help/r/jfrog-cli).
 
 # JFrog CLI Plugins
 
-JFrog CLI plugins support enhancing the functionality of JFrog CLI to meet the specific user and organization needs. The
+[JFrog CLI Plugins](https://docs.jfrog-applications.jfrog.io/jfrog-applications/jfrog-cli/cli-plugins) support enhancing the functionality of JFrog CLI to meet the specific user and organization needs. The
 source code of a plugin is maintained as an open source Go project on GitHub. All public plugins are registered in JFrog
 CLI's Plugins Registry, which is hosted in the [jfrog-cli-plugins-reg](https://github.com/jfrog/jfrog-cli-plugins-reg)
 GitHub repository. We encourage you, as developers, to create plugins and share them publicly with the rest of the
-community. Read more about this in the [JFrog CLI Plugin Developer Guide](guides/jfrog-cli-plugins-developer-guide.md).
+community. Read more about this in the [JFrog CLI Plugin Developer Guide](https://docs.jfrog-applications.jfrog.io/jfrog-applications/jfrog-cli/cli-plugins/developer-guide).
 
 # Release Notes
 

build/npm/v2-jf/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jfrog-cli-v2-jf",
-  "version": "2.51.1",
+  "version": "2.52.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/package.json

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

distribution_test.go

@@ -445,7 +445,7 @@ func TestUpdateBundleProps(t *testing.T) {
 	cleanDistributionTest(t)
 }
 
-func TestBundlePathMapping(t *testing.T) {
+func TestBundlePathMappingFromPatternAndTarget(t *testing.T) {
 	initDistributionTest(t)
 
 	// Upload files
@@ -465,6 +465,28 @@ func TestBundlePathMapping(t *testing.T) {
 	cleanDistributionTest(t)
 }
 
+func TestBundlePathMappingFromPatternAndTargetUsingSpec(t *testing.T) {
+	initDistributionTest(t)
+
+	// Upload files
+	specFile, err := tests.CreateSpec(tests.DistributionUploadSpecB)
+	assert.NoError(t, err)
+	runRt(t, "u", "--spec="+specFile)
+
+	// Create and distribute release bundle with path mapping from <DistRepo1>/data/ to <DistRepo2>/target/
+	spec, err := tests.CreateSpec(tests.DistributionCreateWithPatternAndTarget)
+	assert.NoError(t, err)
+	runDs(t, "rbc", tests.BundleName, bundleVersion, "--sign", "--spec="+spec)
+	runDs(t, "rbd", tests.BundleName, bundleVersion, "--site=*", "--sync")
+
+	// Validate files are distributed to the target mapping
+	spec, err = tests.CreateSpec(tests.DistributionMappingDownload)
+	assert.NoError(t, err)
+	inttestutils.VerifyExistInArtifactory(tests.GetBundleMappingExpected(), spec, serverDetails, t)
+
+	cleanDistributionTest(t)
+}
+
 func TestBundlePathMappingUsingSpec(t *testing.T) {
 	initDistributionTest(t)