Merge branch 'master' into mavenFlexpack

Author: agrasth

.github/workflows/prepare-minor-release.yml

@@ -1,14 +1,16 @@
+name: Prepare Minor Release
 on:
   workflow_dispatch:
     inputs:
       ref:
-        description: The branch to prepare the release for
+        description: Release from
         default: "master"
 
 jobs:
   prepare-minor-release:
     uses: ./.github/workflows/prepare-release.yml
-    name: Prepare minor release
+    name: Prepare Minor Release
+    secrets: inherit
     with:
       version: "minor"
       ref: ${{ inputs.ref }}

.github/workflows/prepare-patch-release.yml

@@ -1,3 +1,4 @@
+name: Prepare Patch Release
 on:
   workflow_dispatch:
     inputs:
@@ -8,7 +9,8 @@ on:
 jobs:
   prepare-patch-release:
     uses: ./.github/workflows/prepare-release.yml
-    name: Prepare patch release
+    name: Prepare Patch Release
+    secrets: inherit
     with:
       version: "patch"
       ref: ${{ inputs.ref }}

.github/workflows/prepare-release.yml

@@ -1,3 +1,4 @@
+name: Prepare Release
 on:
   workflow_call:
     inputs:
@@ -17,7 +18,7 @@ permissions:
 
 jobs:
   prepare-release:
-    name: Prepare ${{ inputs.version }} from ${{ inputs.ref }}
+    name: Prepare ${{ inputs.version }} From ${{ inputs.ref }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -31,8 +32,8 @@ jobs:
       - name: Compute current version
         id: compute-current-version
         run: |
-          ./build/build.sh
-          current_version=$(./jf --version)
+          current_version=$(go run main.go -v)
+          current_version=${current_version//[^0-9.+]/}
           echo "current_version=${current_version}" >> $GITHUB_OUTPUT
 
       - name: Compute next version
@@ -74,25 +75,23 @@ jobs:
       - name: Create pull request
         run: gh pr create --title "Bump version to ${{ steps.compute-next-version.outputs.next_version }}" --body "Bump version to ${{ steps.compute-next-version.outputs.next_version }}"
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.CLI_ACTION_TOKEN }}
 
       - name: Get PR number
         id: get-pr-number
         run: |
           PR_NUMBER=$(gh pr list --head "${{ steps.branch.outputs.branch_name }}" --json number --jq '.[0].number')
           echo "pr_number=$PR_NUMBER" >> $GITHUB_OUTPUT
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.CLI_ACTION_TOKEN }}
 
-      - name: Comment PR with link and version
+      - name: Annotate workflow with PR link and version
         run: |
-          PR_URL=$(gh pr view ${{ steps.get-pr-number.outputs.pr_number }} --json url --jq .url)
-          gh pr comment ${{ steps.get-pr-number.outputs.pr_number }} --body "Prepared release version ${{ steps.compute-next-version.outputs.next_version }}. PR: ${PR_URL}"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR_URL="${{ github.server_url }}/${{ github.repository }}/pull/${{ steps.get-pr-number.outputs.pr_number }}"
+          echo "::notice title=Release prepared::Prepared release version ${{ steps.compute-next-version.outputs.next_version }}. PR: ${PR_URL}"
 
       - name: Skip from release notes
         run: |
           gh pr edit ${{ steps.get-pr-number.outputs.pr_number }} --add-label "ignore for release"
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.CLI_ACTION_TOKEN }}

artifactory_test.go

@@ -5173,6 +5173,24 @@ func TestConfigAddWithStdinAccessToken(t *testing.T) {
 	details, err := config.GetSpecificConfig(tests.ServerId, false, false)
 	assert.NoError(t, err)
 	assert.Equal(t, "accesstoken", details.AccessToken)
+	assert.Equal(t, false, details.DisableTokenRefresh)
+}
+
+func TestConfigAddWithDisableRefreshToken(t *testing.T) {
+	initArtifactoryTest(t, "")
+
+	err := configCli.WithoutCredentials().Exec("add", tests.ServerId, "--artifactory-url="+*tests.JfrogUrl+tests.
+		ArtifactoryEndpoint, "--access-token=password", "--disable-token-refresh=true")
+	assert.NoError(t, err)
+
+	defer func() {
+		assert.NoError(t, configCli.WithoutCredentials().Exec("rm", tests.ServerId, "--quiet"))
+	}()
+
+	details, err := config.GetSpecificConfig(tests.ServerId, false, false)
+	assert.NoError(t, err)
+	assert.Equal(t, "password", details.AccessToken)
+	assert.Equal(t, true, details.DisableTokenRefresh)
 }
 
 func pipeStdinSecret(t *testing.T, secret string) func() {

go.mod

@@ -19,10 +19,10 @@ require (
 	github.com/jfrog/build-info-go v1.11.0
 	github.com/jfrog/gofrog v1.7.6
 	github.com/jfrog/jfrog-cli-artifactory v0.7.3-0.20250919153452-dd92b2c8f024
-	github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20250918084044-2eb3f15d08c1
+	github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20250924075232-db72a3ec8f50
 	github.com/jfrog/jfrog-cli-platform-services v1.10.0
 	github.com/jfrog/jfrog-cli-security v1.21.7
-	github.com/jfrog/jfrog-client-go v1.55.1-0.20250922120823-e64346ea079b
+	github.com/jfrog/jfrog-client-go v1.55.1-0.20250923151105-826d1e79e64c
 	github.com/jszwec/csvutil v1.10.0
 	github.com/manifoldco/promptui v0.9.0
 	github.com/stretchr/testify v1.11.1
@@ -40,7 +40,7 @@ require (
 	github.com/BurntSushi/toml v1.5.0 // indirect
 	github.com/CycloneDX/cyclonedx-go v0.9.2 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/ProtonMail/go-crypto v1.1.6 // indirect
+	github.com/ProtonMail/go-crypto v1.3.0 // indirect
 	github.com/VividCortex/ewma v1.2.0 // indirect
 	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
 	github.com/andybalholm/brotli v1.2.0 // indirect

go.sum

@@ -43,8 +43,8 @@ github.com/CycloneDX/cyclonedx-go v0.9.2/go.mod h1:vcK6pKgO1WanCdd61qx4bFnSsDJQ6
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
-github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
-github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
+github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=
+github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
 github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow=
 github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4=
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
@@ -363,14 +363,14 @@ github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYL
 github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
 github.com/jfrog/jfrog-cli-artifactory v0.7.3-0.20250919153452-dd92b2c8f024 h1:LWmb50WFKV8V59jmB8+/KD3TI26KmNrJnMwSf/0CEuU=
 github.com/jfrog/jfrog-cli-artifactory v0.7.3-0.20250919153452-dd92b2c8f024/go.mod h1:N1nn6tNbyAjtdhLp89tO1CstT+iWcQSzAJGvAml7Deg=
-github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20250918084044-2eb3f15d08c1 h1:Gu9GT06M9OH7E7rhNYF1tXoaMQhZOmzpaBDmJcwkUgc=
-github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20250918084044-2eb3f15d08c1/go.mod h1:nir0kLxfelcpFsXHVztjCxFIoONWyMbTXnL5dyHcZHI=
+github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20250924075232-db72a3ec8f50 h1:LGho+LPFqLy+VD/utgWDLmpL6FgxcBco3buvnMl+hJU=
+github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20250924075232-db72a3ec8f50/go.mod h1:W7rfoQaNKGuJWtsw7/yUNmSdiPoJgcV5U04TzXZa7Ak=
 github.com/jfrog/jfrog-cli-platform-services v1.10.0 h1:O+N/VAF+QjFvq9xkHpmzKLcdl9aJu3IP204Su0L14rw=
 github.com/jfrog/jfrog-cli-platform-services v1.10.0/go.mod h1:qbu4iqBST9x8LgD8HhzUm91iOB3vHqtoGmaxOnmw0ok=
 github.com/jfrog/jfrog-cli-security v1.21.7 h1:WE3sSTpCTc051sIted08Moz5yY+0DK8tuJG/fbe+iaQ=
 github.com/jfrog/jfrog-cli-security v1.21.7/go.mod h1:AYckVBA3qNmCku1MrBLpQwbr9eAZ91U/3zMa88gckD8=
-github.com/jfrog/jfrog-client-go v1.55.1-0.20250922120823-e64346ea079b h1:e26MG4YmrtwUdfmpKPXqrB1i894y6BbS1f4RRHuhprk=
-github.com/jfrog/jfrog-client-go v1.55.1-0.20250922120823-e64346ea079b/go.mod h1:tJlcnGoJAqiScMRT2qOUPUzpVUrhpxkGiLg/BWZ7PtE=
+github.com/jfrog/jfrog-client-go v1.55.1-0.20250923151105-826d1e79e64c h1:eD8kalHfqcJLX55Oj+DQpe61qU3zs2GgEgrg1tSKLsA=
+github.com/jfrog/jfrog-client-go v1.55.1-0.20250923151105-826d1e79e64c/go.mod h1:xYik+5731f7IKdJN9SVWhBwiaj2pXkzVUpxoPoA6kak=
 github.com/jhump/protoreflect v1.17.0 h1:qOEr613fac2lOuTgWN4tPAtLL7fUSbuJL5X5XumQh94=
 github.com/jhump/protoreflect v1.17.0/go.mod h1:h9+vUUL38jiBzck8ck+6G/aeMX8Z4QUY/NiJPwPNi+8=
 github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 h1:liMMTbpW34dhU4az1GN0pTPADwNmvoRSeoZ6PItiqnY=

utils/cliutils/commandsflags.go

@@ -123,12 +123,13 @@ const (
 
 	// *** Artifactory Commands' flags ***
 	// Base flags
-	url         = "url"
-	platformUrl = "platform-url"
-	user        = "user"
-	password    = "password"
-	accessToken = "access-token"
-	serverId    = "server-id"
+	url                 = "url"
+	platformUrl         = "platform-url"
+	user                = "user"
+	password            = "password"
+	accessToken         = "access-token"
+	serverId            = "server-id"
+	disableTokenRefresh = "disable-token-refresh"
 
 	passwordStdin    = "password-stdin"
 	accessTokenStdin = "access-token-stdin"
@@ -520,17 +521,18 @@ const (
 	licenseCount = "license-count"
 
 	// *** Config Commands' flags ***
-	configPrefix      = "config-"
-	configPlatformUrl = configPrefix + url
-	configRtUrl       = "artifactory-url"
-	configDistUrl     = "distribution-url"
-	configXrUrl       = "xray-url"
-	configMcUrl       = "mission-control-url"
-	configPlUrl       = "pipelines-url"
-	configAccessToken = configPrefix + accessToken
-	configUser        = configPrefix + user
-	configPassword    = configPrefix + password
-	configInsecureTls = configPrefix + InsecureTls
+	configPrefix                    = "config-"
+	configPlatformUrl               = configPrefix + url
+	configRtUrl                     = "artifactory-url"
+	configDistUrl                   = "distribution-url"
+	configXrUrl                     = "xray-url"
+	configMcUrl                     = "mission-control-url"
+	configPlUrl                     = "pipelines-url"
+	configAccessToken               = configPrefix + accessToken
+	configUser                      = configPrefix + user
+	configPassword                  = configPrefix + password
+	configInsecureTls               = configPrefix + InsecureTls
+	configDisableRefreshAccessToken = configPrefix + disableTokenRefresh
 
 	// *** Project Commands' flags ***
 	projectPath = "path"
@@ -1560,6 +1562,10 @@ var flagsMap = map[string]cli.Flag{
 		Name:  InsecureTls,
 		Usage: "[Default: false] Set to true to skip TLS certificates verification, while encrypting the Artifactory password during the config process.` `",
 	},
+	configDisableRefreshAccessToken: cli.BoolFlag{
+		Name:  disableTokenRefresh,
+		Usage: "[Default: false] Set to true to disable automatic refresh of access tokens.` `",
+	},
 	projectPath: cli.StringFlag{
 		Name:  projectPath,
 		Usage: "[Default: ./] Full path to the code project.` `",
@@ -1729,11 +1735,12 @@ var flagsMap = map[string]cli.Flag{
 var commandFlags = map[string][]string{
 	AddConfig: {
 		interactive, EncPassword, configPlatformUrl, configRtUrl, configDistUrl, configXrUrl, configMcUrl, configPlUrl, configUser, configPassword, configAccessToken, sshKeyPath, sshPassphrase, ClientCertPath,
-		ClientCertKeyPath, BasicAuthOnly, configInsecureTls, Overwrite, passwordStdin, accessTokenStdin, OidcTokenID, OidcProviderName, OidcAudience, OidcProviderType, ApplicationKey,
+		ClientCertKeyPath, BasicAuthOnly, configInsecureTls, Overwrite, passwordStdin, accessTokenStdin, OidcTokenID,
+		OidcProviderName, OidcAudience, OidcProviderType, ApplicationKey, configDisableRefreshAccessToken,
 	},
 	EditConfig: {
 		interactive, EncPassword, configPlatformUrl, configRtUrl, configDistUrl, configXrUrl, configMcUrl, configPlUrl, configUser, configPassword, configAccessToken, sshKeyPath, sshPassphrase, ClientCertPath,
-		ClientCertKeyPath, BasicAuthOnly, configInsecureTls, passwordStdin, accessTokenStdin,
+		ClientCertKeyPath, BasicAuthOnly, configInsecureTls, passwordStdin, accessTokenStdin, configDisableRefreshAccessToken,
 	},
 	DeleteConfig: {
 		deleteQuiet,

utils/cliutils/utils.go

@@ -341,6 +341,7 @@ func CreateServerDetailsFromFlags(c *cli.Context) (details *coreConfig.ServerDet
 		details.ServerId = os.Getenv(coreutils.ServerID)
 	}
 	details.InsecureTls = c.Bool(InsecureTls)
+	details.DisableTokenRefresh = c.Bool(disableTokenRefresh)
 	return
 }