Skip to content

Commit 43f1294

Browse files
committed
Merge branch 'dev' of https://github.com/jfrog/jfrog-cli-security into update-new-maven-dep-tree-version
2 parents a69afe7 + 593c8be commit 43f1294

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

.github/actions/install-and-setup/action.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,11 @@ runs:
102102
branch: swift-6.1-release
103103
tag: 6.1-RELEASE
104104
if: ${{ inputs.install-swift == 'true' && runner.os == 'Windows'}}
105+
106+
# Ensure Java 11 remains active after all installations (Swift setup might override it)
107+
- name: Force Java 11 on Windows
108+
if: runner.os == 'Windows'
109+
shell: powershell
110+
run: |
111+
echo "JAVA_HOME=$env:JAVA_HOME_11_X64" >> $env:GITHUB_ENV
112+
echo "$env:JAVA_HOME_11_X64\bin" >> $env:GITHUB_PATH
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)