Unverified Commit 9a92823e authored by Samruddhi Khandale's avatar Samruddhi Khandale Committed by GitHub

Java: Fix gradle bug - sets GRADLE_USER_HOME incorrectly (#152)

* fix gradle bug

* modify tests
parent 811a93f0
{
"id": "java",
"version": "1.0.7",
"version": "1.0.8",
"name": "Java (via SDKMAN!)",
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
"description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
......@@ -41,8 +41,6 @@
},
"containerEnv": {
"SDKMAN_DIR": "/usr/local/sdkman",
"GRADLE_USER_HOME": "${HOME}/.gradle",
"M2": "${HOME}/.m2",
"JAVA_HOME": "/usr/local/sdkman/candidates/java/current",
"PATH": "/usr/local/sdkman/bin:/usr/local/sdkman/candidates/java/current/bin:/usr/local/sdkman/candidates/gradle/current/bin:/usr/local/sdkman/candidates/maven/current/bin:${PATH}"
}
......
......@@ -167,13 +167,11 @@ fi
# Install Gradle
if [[ "${INSTALL_GRADLE}" = "true" ]] && ! gradle --version > /dev/null; then
sdk_install gradle latest
updaterc '[ -z "${GRADLE_USER_HOME}" ] && export GRADLE_USER_HOME=${HOME}/.gradle'
fi
# Install Maven
if [[ "${INSTALL_MAVEN}" = "true" ]] && ! mvn --version > /dev/null; then
sdk_install maven latest
updaterc '[ -z "$M2" ] && export M2=$HOME/.m2'
fi
echo "Done!"
......@@ -5,9 +5,17 @@ set -e
# Optional: Import test library
source dev-container-features-test-lib
check "user is root" whoami | grep root
check "java" java --version
check "gradle" gradle --version
cd /tmp && gradle init --type basic --dsl groovy --incubating --project-name test
check "GRADLE_USER_HOME exists" ls -la /root | grep ".gradle"
check "maven" mvn --version
cd /tmp && mvn archetype:generate -DgroupId=com.mycompany.app -DartifactId=my-app -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4 -DinteractiveMode=false
check "m2 exists" ls -la /root | grep ".m2"
# Report result
reportResults
#!/bin/bash
set -e
# Optional: Import test library
source dev-container-features-test-lib
check "user is vscode" whoami | grep vscode
check "java" java --version
check "gradle" gradle --version
cd /tmp && gradle init --type basic --dsl groovy --incubating --project-name test
check "GRADLE_USER_HOME exists" ls -la /home/vscode | grep ".gradle"
check "maven" mvn --version
cd /tmp && mvn archetype:generate -DgroupId=com.mycompany.app -DartifactId=my-app -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4 -DinteractiveMode=false
check "m2 exists" ls -la /home/vscode | grep ".m2"
# Report result
reportResults
......@@ -8,6 +8,20 @@
}
}
},
"install_gradle_and_maven_for_user": {
"image": "ubuntu:focal",
"remoteUser": "vscode",
"features": {
"common-utils": {
"username": "vscode"
},
"java": {
"version": "latest",
"installGradle": true,
"installMaven": true
}
}
},
"install_gradle_and_maven": {
"image": "ubuntu:focal",
"features": {
......@@ -18,4 +32,4 @@
}
}
}
}
\ No newline at end of file
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment