Skip to content

Commit 2bc7efc

Browse files
fix: update Maven configuration in jfrog modules to include correct server ID and repository flags
1 parent 064c7d6 commit 2bc7efc

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

registry/coder/modules/jfrog-oauth/main.test.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,12 @@ EOF`;
160160
const coderScript = findResourceInstance(state, "coder_script");
161161

162162
expect(coderScript.script).toContain("jf mvnc --global");
163+
expect(coderScript.script).toContain('--server-id-resolve="0"');
163164
expect(coderScript.script).toContain('--repo-resolve-releases "central"');
164165
expect(coderScript.script).toContain('--repo-resolve-snapshots "central"');
166+
expect(coderScript.script).toContain('--server-id-deploy="0"');
167+
expect(coderScript.script).toContain('--repo-deploy-releases "central"');
168+
expect(coderScript.script).toContain('--repo-deploy-snapshots "central"');
165169

166170
expect(coderScript.script).toContain("<servers>");
167171
expect(coderScript.script).toContain("<id>central</id>");

registry/coder/modules/jfrog-oauth/run.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,12 @@ if [ -z "${HAS_MAVEN}" ]; then
100100
else
101101
echo "☕ Configuring maven..."
102102
jf mvnc --global \
103+
--server-id-resolve="${JFROG_SERVER_ID}" \
103104
--repo-resolve-releases "${REPOSITORY_MAVEN}" \
104-
--repo-resolve-snapshots "${REPOSITORY_MAVEN}"
105+
--repo-resolve-snapshots "${REPOSITORY_MAVEN}" \
106+
--server-id-deploy="${JFROG_SERVER_ID}" \
107+
--repo-deploy-releases "${REPOSITORY_MAVEN}" \
108+
--repo-deploy-snapshots "${REPOSITORY_MAVEN}"
105109
# Create Maven config directory if it doesn't exist
106110
mkdir -p ~/.m2
107111
cat << EOF > ~/.m2/settings.xml

registry/coder/modules/jfrog-token/main.test.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,12 @@ EOF`;
198198
const coderScript = findResourceInstance(state, "coder_script");
199199

200200
expect(coderScript.script).toContain("jf mvnc --global");
201+
expect(coderScript.script).toContain('--server-id-resolve="0"');
201202
expect(coderScript.script).toContain('--repo-resolve-releases "central"');
202203
expect(coderScript.script).toContain('--repo-resolve-snapshots "central"');
204+
expect(coderScript.script).toContain('--server-id-deploy="0"');
205+
expect(coderScript.script).toContain('--repo-deploy-releases "central"');
206+
expect(coderScript.script).toContain('--repo-deploy-snapshots "central"');
203207

204208
expect(coderScript.script).toContain("<servers>");
205209
expect(coderScript.script).toContain("<id>central</id>");

registry/coder/modules/jfrog-token/run.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,12 @@ if [ -z "${HAS_MAVEN}" ]; then
9999
else
100100
echo "☕ Configuring maven..."
101101
jf mvnc --global \
102+
--server-id-resolve="${JFROG_SERVER_ID}" \
102103
--repo-resolve-releases "${REPOSITORY_MAVEN}" \
103-
--repo-resolve-snapshots "${REPOSITORY_MAVEN}"
104+
--repo-resolve-snapshots "${REPOSITORY_MAVEN}" \
105+
--server-id-deploy="${JFROG_SERVER_ID}" \
106+
--repo-deploy-releases "${REPOSITORY_MAVEN}" \
107+
--repo-deploy-snapshots "${REPOSITORY_MAVEN}"
104108
# Create Maven config directory if it doesn't exist
105109
mkdir -p ~/.m2
106110
cat << EOF > ~/.m2/settings.xml

0 commit comments

Comments
 (0)