Merge remote-tracking branch 'upstream/dev' into gradle-extractor-5

.github/workflows/gradleTests.yml

@@ -29,11 +29,6 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: 1.20.x
-      - name: Install Java
-        uses: actions/setup-java@v3
-        with:
-          java-version: "11"
-          distribution: "adopt"
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
         with:

build/npm/v2-jf/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jfrog-cli-v2-jf",
-  "version": "2.46.1",
+  "version": "2.46.2",
   "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.46.1",
+  "version": "2.46.2",
   "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
   "homepage": "https://github.com/jfrog/jfrog-cli",
   "preferGlobal": true,

documentation/JFrog-CLI.md

@@ -43,6 +43,8 @@ Your contributions will be reviewed, and if accepted, they will be merged into t
 * [CLI for JFrog Mission Control](https://jfrog.com/help/r/jfrog-cli/cli-for-jfrog-mission-control)
 * [CLI for JFrog Pipelines](https://jfrog.com/help/r/jfrog-cli/cli-for-jfrog-pipelines)
 * [CLI for JFrog Xray](https://jfrog.com/help/r/jfrog-cli/cli-for-jfrog-xray)
+* [CLI for JFrog Release Lifecycle Management](https://jfrog.com/help/r/jfrog-cli/cli-for-jfrog-release-lifecycle-management)
+* [Transfer Artifactory Configuration and Files fron Self-Hosted to JFrog Cloud](https://jfrog.com/help/r/jfrog-cli/transfer-artifactory-configuration-and-files-from-self-hosted-to-jfrog-cloud)
 
 * * *
 

documentation/cli.ftmap

@@ -16,6 +16,8 @@
       </ft:node>
       <ft:node ft:title="CLI for JFrog Release Lifecycle Management" href="CLI-for-JFrog-Lifecycle.md" type="topics">
       </ft:node>
+      <ft:node ft:title="Transfer Artifactory Configuration and Files from Self-Hosted to JFrog Cloud" href="CLI-for-JFrog-Cloud-Transfer.md" type="topics">
+      </ft:node>
       <ft:node ft:title="CLI for JFrog Curation" href="CLI-for-JFrog-Curation.md" type="topics">
       </ft:node>
     </ft:toc>

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/gocarina/gocsv v0.0.0-20230616125104-99d496ca653d
 	github.com/jfrog/build-info-go v1.9.8
 	github.com/jfrog/gofrog v1.3.0
-	github.com/jfrog/jfrog-cli-core/v2 v2.41.1
+	github.com/jfrog/jfrog-cli-core/v2 v2.41.2
 	github.com/jfrog/jfrog-client-go v1.31.5
 	github.com/jszwec/csvutil v1.8.0
 	github.com/mholt/archiver/v3 v3.5.1
@@ -122,9 +122,9 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/jfrog/build-info-go => github.com/yahavi/build-info-go v0.1.2-0.20230824155947-19b4a42c70d2
+replace github.com/jfrog/build-info-go => github.com/yahavi/build-info-go v0.1.2-0.20230828125009-77a055ad416d
 
-replace github.com/jfrog/jfrog-cli-core/v2 => github.com/yahavi/jfrog-cli-core/v2 v2.0.0-20230824160204-b4bcbaf7ff62
+replace github.com/jfrog/jfrog-cli-core/v2 => github.com/yahavi/jfrog-cli-core/v2 v2.0.0-20230828125207-52db313dc422
 
 // replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.2.6-0.20230418122323-2bf299dd6d27
 

go.sum

@@ -407,10 +407,10 @@ github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofm
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
 github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
 github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
-github.com/yahavi/build-info-go v0.1.2-0.20230824155947-19b4a42c70d2 h1:QC50/5wdC0/4oa5soSx5124ei6NA/7FfOkm76h+JoXA=
-github.com/yahavi/build-info-go v0.1.2-0.20230824155947-19b4a42c70d2/go.mod h1:t31QRpH5xUJKw8XkQlAA+Aq7aanyS1rrzpcK8xSNVts=
-github.com/yahavi/jfrog-cli-core/v2 v2.0.0-20230824160204-b4bcbaf7ff62 h1:mWLKD5Zg85cnKDzWq7vIREtBwmzc3V1O8EzxUVc91Vg=
-github.com/yahavi/jfrog-cli-core/v2 v2.0.0-20230824160204-b4bcbaf7ff62/go.mod h1:YqB9rEJF1P7uGLIPUvF5qdDDf1zM5f4DneIQNkqyAfs=
+github.com/yahavi/build-info-go v0.1.2-0.20230828125009-77a055ad416d h1:O2af1nmKMmLCCpvuYpPYHBK3ERGoIQB2bOMjdIdHFJY=
+github.com/yahavi/build-info-go v0.1.2-0.20230828125009-77a055ad416d/go.mod h1:t31QRpH5xUJKw8XkQlAA+Aq7aanyS1rrzpcK8xSNVts=
+github.com/yahavi/jfrog-cli-core/v2 v2.0.0-20230828125207-52db313dc422 h1:8Pl7B/M0hW7hyRyiPtHwW4qi5YVqHR8ONnmbjUhy04k=
+github.com/yahavi/jfrog-cli-core/v2 v2.0.0-20230828125207-52db313dc422/go.mod h1:YqB9rEJF1P7uGLIPUvF5qdDDf1zM5f4DneIQNkqyAfs=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

utils/cliutils/cli_consts.go

@@ -4,7 +4,7 @@ import "time"
 
 const (
 	// General CLI constants
-	CliVersion  = "2.46.1"
+	CliVersion  = "2.46.2"
 	ClientAgent = "jfrog-cli-go"
 
 	// CLI base commands constants: