From a3dc11834030add08529e4a53a4b3b92ab29ba26 Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot Date: Wed, 12 Nov 2025 11:25:34 +0000 Subject: [PATCH 1/6] fix(jfrog-oauth): replace deprecated --repo-resolve flag for Maven config Replace deprecated --repo-resolve with --repo-resolve-releases and --repo-resolve-snapshots for jf mvn-config command. Verified with JFrog CLI v2.82.0. --- registry/coder/modules/jfrog-oauth/run.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/registry/coder/modules/jfrog-oauth/run.sh b/registry/coder/modules/jfrog-oauth/run.sh index 6e4e06425..b6a55aa20 100644 --- a/registry/coder/modules/jfrog-oauth/run.sh +++ b/registry/coder/modules/jfrog-oauth/run.sh @@ -99,7 +99,9 @@ if [ -z "${HAS_MAVEN}" ]; then not_configured maven else echo "☕ Configuring maven..." - jf mvnc --global --repo-resolve "${REPOSITORY_MAVEN}" + jf mvnc --global \ + --repo-resolve-releases "${REPOSITORY_MAVEN}" \ + --repo-resolve-snapshots "${REPOSITORY_MAVEN}" # Create Maven config directory if it doesn't exist mkdir -p ~/.m2 cat << EOF > ~/.m2/settings.xml From b5ed3b5f59af75a985d9ebe84140f520dc86e39d Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot Date: Wed, 12 Nov 2025 11:26:33 +0000 Subject: [PATCH 2/6] fix(jfrog-token): replace deprecated --repo-resolve flag for Maven config Same fix as jfrog-oauth - replace --repo-resolve with --repo-resolve-releases and --repo-resolve-snapshots. --- registry/coder/modules/jfrog-token/run.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/registry/coder/modules/jfrog-token/run.sh b/registry/coder/modules/jfrog-token/run.sh index 7f53da00a..0409a828a 100644 --- a/registry/coder/modules/jfrog-token/run.sh +++ b/registry/coder/modules/jfrog-token/run.sh @@ -98,7 +98,9 @@ if [ -z "${HAS_MAVEN}" ]; then not_configured maven else echo "☕ Configuring maven..." - jf mvnc --global --repo-resolve "${REPOSITORY_MAVEN}" + jf mvnc --global \ + --repo-resolve-releases "${REPOSITORY_MAVEN}" \ + --repo-resolve-snapshots "${REPOSITORY_MAVEN}" # Create Maven config directory if it doesn't exist mkdir -p ~/.m2 cat << EOF > ~/.m2/settings.xml From f4c0a8c65debd67065b71576ba2e6d3497bd37b4 Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot Date: Wed, 12 Nov 2025 11:36:26 +0000 Subject: [PATCH 3/6] test: update Maven config assertions for new flags Update test expectations to check for separate --repo-resolve-releases and --repo-resolve-snapshots flags instead of deprecated --repo-resolve. --- registry/coder/modules/jfrog-oauth/main.test.ts | 8 +++++++- registry/coder/modules/jfrog-token/main.test.ts | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/registry/coder/modules/jfrog-oauth/main.test.ts b/registry/coder/modules/jfrog-oauth/main.test.ts index 940d166bd..a1017aeb2 100644 --- a/registry/coder/modules/jfrog-oauth/main.test.ts +++ b/registry/coder/modules/jfrog-oauth/main.test.ts @@ -160,7 +160,13 @@ EOF`; const coderScript = findResourceInstance(state, "coder_script"); expect(coderScript.script).toContain( - 'jf mvnc --global --repo-resolve "central"', + 'jf mvnc --global', + ); + expect(coderScript.script).toContain( + '--repo-resolve-releases "central"', + ); + expect(coderScript.script).toContain( + '--repo-resolve-snapshots "central"', ); expect(coderScript.script).toContain(""); diff --git a/registry/coder/modules/jfrog-token/main.test.ts b/registry/coder/modules/jfrog-token/main.test.ts index 419b5f28f..a26836902 100644 --- a/registry/coder/modules/jfrog-token/main.test.ts +++ b/registry/coder/modules/jfrog-token/main.test.ts @@ -198,7 +198,13 @@ EOF`; const coderScript = findResourceInstance(state, "coder_script"); expect(coderScript.script).toContain( - 'jf mvnc --global --repo-resolve "central"', + 'jf mvnc --global', + ); + expect(coderScript.script).toContain( + '--repo-resolve-releases "central"', + ); + expect(coderScript.script).toContain( + '--repo-resolve-snapshots "central"', ); expect(coderScript.script).toContain(""); From 4d1522005385b52f4f2f2537df301fe879606325 Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot Date: Wed, 12 Nov 2025 11:53:03 +0000 Subject: [PATCH 4/6] style: apply formatting to test files --- registry/coder/modules/jfrog-oauth/main.test.ts | 12 +++--------- registry/coder/modules/jfrog-token/main.test.ts | 12 +++--------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/registry/coder/modules/jfrog-oauth/main.test.ts b/registry/coder/modules/jfrog-oauth/main.test.ts index a1017aeb2..3df4495e5 100644 --- a/registry/coder/modules/jfrog-oauth/main.test.ts +++ b/registry/coder/modules/jfrog-oauth/main.test.ts @@ -159,15 +159,9 @@ EOF`; const coderScript = findResourceInstance(state, "coder_script"); - expect(coderScript.script).toContain( - 'jf mvnc --global', - ); - expect(coderScript.script).toContain( - '--repo-resolve-releases "central"', - ); - expect(coderScript.script).toContain( - '--repo-resolve-snapshots "central"', - ); + expect(coderScript.script).toContain("jf mvnc --global"); + expect(coderScript.script).toContain('--repo-resolve-releases "central"'); + expect(coderScript.script).toContain('--repo-resolve-snapshots "central"'); expect(coderScript.script).toContain(""); expect(coderScript.script).toContain("central"); diff --git a/registry/coder/modules/jfrog-token/main.test.ts b/registry/coder/modules/jfrog-token/main.test.ts index a26836902..1bf72957c 100644 --- a/registry/coder/modules/jfrog-token/main.test.ts +++ b/registry/coder/modules/jfrog-token/main.test.ts @@ -197,15 +197,9 @@ EOF`; const coderScript = findResourceInstance(state, "coder_script"); - expect(coderScript.script).toContain( - 'jf mvnc --global', - ); - expect(coderScript.script).toContain( - '--repo-resolve-releases "central"', - ); - expect(coderScript.script).toContain( - '--repo-resolve-snapshots "central"', - ); + expect(coderScript.script).toContain("jf mvnc --global"); + expect(coderScript.script).toContain('--repo-resolve-releases "central"'); + expect(coderScript.script).toContain('--repo-resolve-snapshots "central"'); expect(coderScript.script).toContain(""); expect(coderScript.script).toContain("central"); From 6d1cab2d759d6c09a5418fd2c61e613f42747e4a Mon Sep 17 00:00:00 2001 From: DevelopmentCats Date: Wed, 12 Nov 2025 12:37:49 -0600 Subject: [PATCH 5/6] chore: update versions for jfrog modules --- registry/coder/modules/jfrog-oauth/README.md | 6 +++--- registry/coder/modules/jfrog-token/README.md | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/registry/coder/modules/jfrog-oauth/README.md b/registry/coder/modules/jfrog-oauth/README.md index eaddfee6a..b2a129d1f 100644 --- a/registry/coder/modules/jfrog-oauth/README.md +++ b/registry/coder/modules/jfrog-oauth/README.md @@ -16,7 +16,7 @@ Install the JF CLI and authenticate package managers with Artifactory using OAut module "jfrog" { count = data.coder_workspace.me.start_count source = "registry.coder.com/coder/jfrog-oauth/coder" - version = "1.2.0" + version = "1.2.1" agent_id = coder_agent.example.id jfrog_url = "https://example.jfrog.io" username_field = "username" # If you are using GitHub to login to both Coder and Artifactory, use username_field = "username" @@ -47,7 +47,7 @@ Configure the Python pip package manager to fetch packages from Artifactory whil module "jfrog" { count = data.coder_workspace.me.start_count source = "registry.coder.com/coder/jfrog-oauth/coder" - version = "1.2.0" + version = "1.2.1" agent_id = coder_agent.example.id jfrog_url = "https://example.jfrog.io" username_field = "email" @@ -76,7 +76,7 @@ The [JFrog extension](https://open-vsx.org/extension/JFrog/jfrog-vscode-extensio module "jfrog" { count = data.coder_workspace.me.start_count source = "registry.coder.com/coder/jfrog-oauth/coder" - version = "1.2.0" + version = "1.2.1" agent_id = coder_agent.example.id jfrog_url = "https://example.jfrog.io" username_field = "username" # If you are using GitHub to login to both Coder and Artifactory, use username_field = "username" diff --git a/registry/coder/modules/jfrog-token/README.md b/registry/coder/modules/jfrog-token/README.md index 065d7e8ea..c457cc6e0 100644 --- a/registry/coder/modules/jfrog-token/README.md +++ b/registry/coder/modules/jfrog-token/README.md @@ -13,7 +13,7 @@ Install the JF CLI and authenticate package managers with Artifactory using Arti ```tf module "jfrog" { source = "registry.coder.com/coder/jfrog-token/coder" - version = "1.2.0" + version = "1.2.1" agent_id = coder_agent.example.id jfrog_url = "https://XXXX.jfrog.io" artifactory_access_token = var.artifactory_access_token @@ -42,7 +42,7 @@ For detailed instructions, please see this [guide](https://coder.com/docs/v2/lat ```tf module "jfrog" { source = "registry.coder.com/coder/jfrog-token/coder" - version = "1.2.0" + version = "1.2.1" agent_id = coder_agent.example.id jfrog_url = "https://YYYY.jfrog.io" artifactory_access_token = var.artifactory_access_token # An admin access token @@ -81,7 +81,7 @@ The [JFrog extension](https://open-vsx.org/extension/JFrog/jfrog-vscode-extensio ```tf module "jfrog" { source = "registry.coder.com/coder/jfrog-token/coder" - version = "1.2.0" + version = "1.2.1" agent_id = coder_agent.example.id jfrog_url = "https://XXXX.jfrog.io" artifactory_access_token = var.artifactory_access_token @@ -101,7 +101,7 @@ data "coder_workspace" "me" {} module "jfrog" { source = "registry.coder.com/coder/jfrog-token/coder" - version = "1.2.0" + version = "1.2.1" agent_id = coder_agent.example.id jfrog_url = "https://XXXX.jfrog.io" artifactory_access_token = var.artifactory_access_token From e5f07fd08a97136aa4b4ee3e151cefc1c337e26f Mon Sep 17 00:00:00 2001 From: DevelopmentCats Date: Wed, 12 Nov 2025 14:13:06 -0600 Subject: [PATCH 6/6] fix: update Maven configuration in jfrog modules to include correct server ID and repository flags --- registry/coder/modules/jfrog-oauth/main.test.ts | 4 ++++ registry/coder/modules/jfrog-oauth/run.sh | 6 +++++- registry/coder/modules/jfrog-token/main.test.ts | 4 ++++ registry/coder/modules/jfrog-token/run.sh | 6 +++++- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/registry/coder/modules/jfrog-oauth/main.test.ts b/registry/coder/modules/jfrog-oauth/main.test.ts index 3df4495e5..a9c3a082a 100644 --- a/registry/coder/modules/jfrog-oauth/main.test.ts +++ b/registry/coder/modules/jfrog-oauth/main.test.ts @@ -160,8 +160,12 @@ EOF`; const coderScript = findResourceInstance(state, "coder_script"); expect(coderScript.script).toContain("jf mvnc --global"); + expect(coderScript.script).toContain('--server-id-resolve="0"'); expect(coderScript.script).toContain('--repo-resolve-releases "central"'); expect(coderScript.script).toContain('--repo-resolve-snapshots "central"'); + expect(coderScript.script).toContain('--server-id-deploy="0"'); + expect(coderScript.script).toContain('--repo-deploy-releases "central"'); + expect(coderScript.script).toContain('--repo-deploy-snapshots "central"'); expect(coderScript.script).toContain(""); expect(coderScript.script).toContain("central"); diff --git a/registry/coder/modules/jfrog-oauth/run.sh b/registry/coder/modules/jfrog-oauth/run.sh index b6a55aa20..52f1e851e 100644 --- a/registry/coder/modules/jfrog-oauth/run.sh +++ b/registry/coder/modules/jfrog-oauth/run.sh @@ -100,8 +100,12 @@ if [ -z "${HAS_MAVEN}" ]; then else echo "☕ Configuring maven..." jf mvnc --global \ + --server-id-resolve="${JFROG_SERVER_ID}" \ --repo-resolve-releases "${REPOSITORY_MAVEN}" \ - --repo-resolve-snapshots "${REPOSITORY_MAVEN}" + --repo-resolve-snapshots "${REPOSITORY_MAVEN}" \ + --server-id-deploy="${JFROG_SERVER_ID}" \ + --repo-deploy-releases "${REPOSITORY_MAVEN}" \ + --repo-deploy-snapshots "${REPOSITORY_MAVEN}" # Create Maven config directory if it doesn't exist mkdir -p ~/.m2 cat << EOF > ~/.m2/settings.xml diff --git a/registry/coder/modules/jfrog-token/main.test.ts b/registry/coder/modules/jfrog-token/main.test.ts index 1bf72957c..cabd7e80f 100644 --- a/registry/coder/modules/jfrog-token/main.test.ts +++ b/registry/coder/modules/jfrog-token/main.test.ts @@ -198,8 +198,12 @@ EOF`; const coderScript = findResourceInstance(state, "coder_script"); expect(coderScript.script).toContain("jf mvnc --global"); + expect(coderScript.script).toContain('--server-id-resolve="0"'); expect(coderScript.script).toContain('--repo-resolve-releases "central"'); expect(coderScript.script).toContain('--repo-resolve-snapshots "central"'); + expect(coderScript.script).toContain('--server-id-deploy="0"'); + expect(coderScript.script).toContain('--repo-deploy-releases "central"'); + expect(coderScript.script).toContain('--repo-deploy-snapshots "central"'); expect(coderScript.script).toContain(""); expect(coderScript.script).toContain("central"); diff --git a/registry/coder/modules/jfrog-token/run.sh b/registry/coder/modules/jfrog-token/run.sh index 0409a828a..182b37a2b 100644 --- a/registry/coder/modules/jfrog-token/run.sh +++ b/registry/coder/modules/jfrog-token/run.sh @@ -99,8 +99,12 @@ if [ -z "${HAS_MAVEN}" ]; then else echo "☕ Configuring maven..." jf mvnc --global \ + --server-id-resolve="${JFROG_SERVER_ID}" \ --repo-resolve-releases "${REPOSITORY_MAVEN}" \ - --repo-resolve-snapshots "${REPOSITORY_MAVEN}" + --repo-resolve-snapshots "${REPOSITORY_MAVEN}" \ + --server-id-deploy="${JFROG_SERVER_ID}" \ + --repo-deploy-releases "${REPOSITORY_MAVEN}" \ + --repo-deploy-snapshots "${REPOSITORY_MAVEN}" # Create Maven config directory if it doesn't exist mkdir -p ~/.m2 cat << EOF > ~/.m2/settings.xml