Unverified Commit 76ffd41c authored by Jakub Čábera's avatar Jakub Čábera Committed by GitHub

[java] Support groovy installations (#779)

* [java] Support groovy installations

Fix java test failing with non existent 19 version of `open` distro

* fix: Typo

* feat: Implement code review comments

---------
Co-authored-by: 's avatarSamruddhi Khandale <skhandale@microsoft.com>
parent 65fb90b7
{ {
"id": "java", "id": "java",
"version": "1.2.2", "version": "1.3.0",
"name": "Java (via SDKMAN!)", "name": "Java (via SDKMAN!)",
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/java", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
"description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.", "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
"ms", "ms",
"open", "open",
"oracle", "oracle",
"tem" "tem",
"amzn"
], ],
"default": "ms", "default": "ms",
"description": "Select or enter a JDK distribution" "description": "Select or enter a JDK distribution"
...@@ -74,6 +75,22 @@ ...@@ -74,6 +75,22 @@
], ],
"default": "latest", "default": "latest",
"description": "Select or enter an Ant version" "description": "Select or enter an Ant version"
},
"installGroovy": {
"type": "boolean",
"default": false,
"description": "Install Groovy, powerful, optionally typed and dynamic language with static-typing and static compilation capabilities"
},
"groovyVersion": {
"type": "string",
"proposals": [
"latest",
"2.5.22",
"3.0.19",
"4.0.16"
],
"default": "latest",
"description": "Select or enter a Groovy version"
} }
}, },
"customizations": { "customizations": {
......
...@@ -16,6 +16,8 @@ INSTALL_MAVEN="${INSTALLMAVEN:-"false"}" ...@@ -16,6 +16,8 @@ INSTALL_MAVEN="${INSTALLMAVEN:-"false"}"
MAVEN_VERSION="${MAVENVERSION:-"latest"}" MAVEN_VERSION="${MAVENVERSION:-"latest"}"
INSTALL_ANT="${INSTALLANT:-"false"}" INSTALL_ANT="${INSTALLANT:-"false"}"
ANT_VERSION="${ANTVERSION:-"latest"}" ANT_VERSION="${ANTVERSION:-"latest"}"
INSTALL_GROOVY="${INSTALLGROOVY:-"false"}"
GROOVY_VERSION="${GROOVYVERSION:-"latest"}"
JDK_DISTRO="${JDKDISTRO}" JDK_DISTRO="${JDKDISTRO}"
export SDKMAN_DIR="${SDKMAN_DIR:-"/usr/local/sdkman"}" export SDKMAN_DIR="${SDKMAN_DIR:-"/usr/local/sdkman"}"
...@@ -190,6 +192,11 @@ if [[ "${INSTALL_MAVEN}" = "true" ]] && ! mvn --version > /dev/null; then ...@@ -190,6 +192,11 @@ if [[ "${INSTALL_MAVEN}" = "true" ]] && ! mvn --version > /dev/null; then
sdk_install maven ${MAVEN_VERSION} sdk_install maven ${MAVEN_VERSION}
fi fi
# Install Groovy
if [[ "${INSTALL_GROOVY}" = "true" ]] && ! groovy --version > /dev/null; then
sdk_install groovy "${GROOVY_VERSION}"
fi
# Clean up # Clean up
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
......
...@@ -24,5 +24,11 @@ check "maven" mvn --version ...@@ -24,5 +24,11 @@ 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 cd /tmp && mvn archetype:generate -DgroupId=com.mycompany.app -DartifactId=my-app -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4 -DinteractiveMode=false
check "m2 exists" grep ".m2" <(ls -la /root) check "m2 exists" grep ".m2" <(ls -la /root)
check "groovy" groovy --version
cat << EOF > /tmp/test.groovy
println("verify")
EOF
check "groovy works" test "$(groovy /tmp/test.groovy)" = "verify"
# Report result # Report result
reportResults reportResults
...@@ -24,5 +24,11 @@ check "maven" mvn --version ...@@ -24,5 +24,11 @@ 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 cd /tmp && mvn archetype:generate -DgroupId=com.mycompany.app -DartifactId=my-app -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4 -DinteractiveMode=false
check "m2 exists" grep ".m2" <(ls -la /home/vscode) check "m2 exists" grep ".m2" <(ls -la /home/vscode)
check "groovy" groovy --version
cat << EOF > /tmp/test.groovy
println("verify")
EOF
check "groovy works" test "$(groovy /tmp/test.groovy)" = "verify"
# Report result # Report result
reportResults reportResults
...@@ -24,5 +24,7 @@ check "maven version" grep "Apache Maven 3.6.3" <(mvn --version) ...@@ -24,5 +24,7 @@ check "maven version" grep "Apache Maven 3.6.3" <(mvn --version)
cd /tmp && mvn archetype:generate -DgroupId=com.mycompany.app -DartifactId=my-app -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4 -DinteractiveMode=false cd /tmp && mvn archetype:generate -DgroupId=com.mycompany.app -DartifactId=my-app -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4 -DinteractiveMode=false
check "m2 exists" grep ".m2" <(ls -la /root) check "m2 exists" grep ".m2" <(ls -la /root)
check "groovy version" grep "Groovy Version: 2.5.22" <(groovy --version)
# Report result # Report result
reportResults reportResults
...@@ -5,7 +5,7 @@ set -e ...@@ -5,7 +5,7 @@ set -e
# Optional: Import test library # Optional: Import test library
source dev-container-features-test-lib source dev-container-features-test-lib
check "java version openjdk 19 installed" grep "openjdk 19." <(java --version) check "java version openjdk 21 installed" grep "openjdk 21." <(java --version)
# Report result # Report result
reportResults reportResults
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"image": "ubuntu:focal", "image": "ubuntu:focal",
"features": { "features": {
"java": { "java": {
"version": "19", "version": "21",
"jdkDistro": "open" "jdkDistro": "open"
} }
} }
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
} }
} }
}, },
"install_ant_and_gradle_and_maven_for_user": { "install_ant_and_gradle_and_maven_and_groovy_for_user": {
"image": "ubuntu:focal", "image": "ubuntu:focal",
"remoteUser": "vscode", "remoteUser": "vscode",
"features": { "features": {
...@@ -28,22 +28,24 @@ ...@@ -28,22 +28,24 @@
"version": "latest", "version": "latest",
"installAnt": true, "installAnt": true,
"installGradle": true, "installGradle": true,
"installMaven": true "installMaven": true,
"installGroovy": true
} }
} }
}, },
"install_ant_and_gradle_and_maven": { "install_ant_and_gradle_and_maven_and_groovy": {
"image": "ubuntu:focal", "image": "ubuntu:focal",
"features": { "features": {
"java": { "java": {
"version": "latest", "version": "latest",
"installAnt": true, "installAnt": true,
"installGradle": true, "installGradle": true,
"installMaven": true "installMaven": true,
"installGroovy": true
} }
} }
}, },
"install_ant_and_gradle_and_maven_with_specific_version": { "install_ant_and_gradle_and_maven_and_groovy_with_specific_version": {
"image": "ubuntu:focal", "image": "ubuntu:focal",
"features": { "features": {
"java": { "java": {
...@@ -53,13 +55,15 @@ ...@@ -53,13 +55,15 @@
"installGradle": "true", "installGradle": "true",
"gradleVersion": "6.8.3", "gradleVersion": "6.8.3",
"installMaven": "true", "installMaven": "true",
"mavenVersion": "3.6.3" "mavenVersion": "3.6.3",
"installGroovy": "true",
"groovyVersion": "2.5.22"
} }
} }
}, },
"install_non_conventional_version": { "install_non_conventional_version": {
"image": "ubuntu:focal", "image": "ubuntu:focal",
"features":{ "features": {
"java": { "java": {
"version": "21", "version": "21",
"jdkDistro": "graalce" "jdkDistro": "graalce"
......
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