Skip to content

Commit b5643f6

Browse files
committed
Fix merge issue
1 parent 17973b1 commit b5643f6

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

graalpython/com.oracle.graal.python.test/src/tests/standalone/util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import subprocess
4343
import sys
4444

45-
MAVEN_VERSION = "3.9.6"
45+
MAVEN_VERSION = "3.9.8"
4646
GRADLE_VERSION = "8.9"
4747

4848
def run_cmd(cmd, env, cwd=None, print_out=False, gradle=False):

mx.graalpython/mx_graalpython.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import fnmatch
3030
import glob
3131
import itertools
32-
import json
3332
import os
3433
import pathlib
3534
import re
@@ -1552,6 +1551,10 @@ def graalpython_gate_runner(args, tasks):
15521551
mx_urlrewrites.rewriteurl('https://repo1.maven.org/maven2/'),
15531552
])
15541553

1554+
urls = get_wrapper_urls("graalpython/com.oracle.graal.python.test/src/tests/standalone/mvnw/.mvn/wrapper/maven-wrapper.properties", ["distributionUrl"])
1555+
if "distributionUrl" in urls:
1556+
env["MAVEN_DISTRIBUTION_URL_OVERRIDE"] = mx_urlrewrites.rewriteurl(urls["distributionUrl"])
1557+
15551558
urls = get_wrapper_urls("graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/gradle-test-project/gradle/wrapper/gradle-wrapper.properties", ["distributionUrl"])
15561559
if "distributionUrl" in urls:
15571560
env["GRADLE_DISTRIBUTION_URL_OVERRIDE"] = mx_urlrewrites.rewriteurl(urls["distributionUrl"])

0 commit comments

Comments
 (0)