diff --git a/containers/java-11-maven/.devcontainer/Dockerfile b/containers/java-11-maven/.devcontainer/Dockerfile
deleted file mode 100644
index 11790d1e37..0000000000
--- a/containers/java-11-maven/.devcontainer/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-#-----------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See LICENSE in the project root for license information.
-#-----------------------------------------------------------------------------------------
-
-FROM maven:3-jdk-11
-
-# Install git, process tools
-RUN apt-get update && apt-get -y install git procps
-
-# Clean up
-RUN apt-get autoremove -y \
- && apt-get clean -y \
- && rm -rf /var/lib/apt/lists/*
-
\ No newline at end of file
diff --git a/containers/java-11-maven/.devcontainer/devcontainer.json b/containers/java-11-maven/.devcontainer/devcontainer.json
deleted file mode 100644
index 472018878c..0000000000
--- a/containers/java-11-maven/.devcontainer/devcontainer.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "name": "Java 11 & Maven",
- "dockerFile": "Dockerfile",
- "extensions": [
- "vscjava.vscode-java-pack",
- "redhat.vscode-xml"
- ]
-}
diff --git a/containers/java-11/.devcontainer/Dockerfile b/containers/java-11/.devcontainer/Dockerfile
new file mode 100644
index 0000000000..3e8e3eea72
--- /dev/null
+++ b/containers/java-11/.devcontainer/Dockerfile
@@ -0,0 +1,25 @@
+#-----------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See LICENSE in the project root for license information.
+#-----------------------------------------------------------------------------------------
+
+FROM maven:3-jdk-11
+
+# Install git, process tools
+RUN apt-get update && apt-get -y install git procps curl
+
+# Install Gradle
+ENV GRADLE_HOME /opt/gradle
+ENV GRADLE_VERSION 5.4
+ARG GRADLE_DOWNLOAD_SHA256=c8c17574245ecee9ed7fe4f6b593b696d1692d1adbfef425bef9b333e3a0e8de
+RUN curl -SL --output gradle.zip "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \
+ && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum --check - \
+ && unzip gradle.zip \
+ && rm gradle.zip \
+ && mv "gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" \
+ && ln -s "${GRADLE_HOME}/bin/gradlec" /usr/bin/gradle
+
+# Clean up
+RUN apt-get autoremove -y \
+ && apt-get clean -y \
+ && rm -rf /var/lib/apt/lists/*
diff --git a/containers/java-11/.devcontainer/devcontainer.json b/containers/java-11/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000..7fa6ca4020
--- /dev/null
+++ b/containers/java-11/.devcontainer/devcontainer.json
@@ -0,0 +1,7 @@
+{
+ "name": "Java 11",
+ "dockerFile": "Dockerfile",
+ "extensions": [
+ "vscjava.vscode-java-pack"
+ ]
+}
diff --git a/containers/java-11-maven/.npmignore b/containers/java-11/.npmignore
similarity index 100%
rename from containers/java-11-maven/.npmignore
rename to containers/java-11/.npmignore
diff --git a/containers/java-11-maven/.vscode/launch.json b/containers/java-11/.vscode/launch.json
similarity index 100%
rename from containers/java-11-maven/.vscode/launch.json
rename to containers/java-11/.vscode/launch.json
diff --git a/containers/java-11-maven/README.md b/containers/java-11/README.md
similarity index 86%
rename from containers/java-11-maven/README.md
rename to containers/java-11/README.md
index 6c3f1b4aa5..588b2ecae4 100644
--- a/containers/java-11-maven/README.md
+++ b/containers/java-11/README.md
@@ -1,14 +1,14 @@
-# Java 11 & Maven
+# Java 11
## Summary
-*Develop Java applications. Includes the JDK 11, XML tools, along with any dependencies Maven requires.*
+*Develop Java applications. Includes the JDK 11, Maven and Gradle build tools.*
| Metadata | Value |
|----------|-------|
| *Contributors* | The VS Code Java Team |
| *Definition type* | Dockerfile |
-| *Languages, platforms* | Java, Maven |
+| *Languages, platforms* | Java, Maven, Gradle |
## Using this definition with an existing folder
@@ -25,11 +25,11 @@ Beyond that, just follow these steps to use the definition:
2. To use VS Code's copy of this definition:
1. Start VS Code and open your project folder.
2. Press F1 select and **Remote-Containers: Create Container Configuration File...** from the command palette.
- 3. Select the Java 11 & Maven definition.
+ 3. Select the Java 11 definition.
3. To use latest-and-greatest copy of this definition from the repository:
1. Clone this repository.
- 2. Copy the contents of `containers/java-11-maven/.devcontainer` to the root of your project folder.
+ 2. Copy the contents of `containers/java-11/.devcontainer` to the root of your project folder.
3. Start VS Code and open your project folder.
4. After following step 2 or 3, the contents of the `.devcontainer` folder in your project can be adapted to meet your needs.
@@ -43,7 +43,7 @@ This definition includes some test code that will help you verify it is working
1. If this is your first time using a development container, please follow the [getting started steps](https://aka.ms/vscode-remote/containers/getting-started) to set up your machine.
2. Clone this repository.
3. Start VS Code, press F1, and select **Remote-Containers: Open Folder in Container...**
-4. Select the `containers/java-11-maven` folder.
+4. Select the `containers/java-11` folder.
5. After the folder has opened in the container, press F5 to start the project.
6. You should see "Hello Remote World!" in the a Debug Console after the program executes.
7. From here, you can add breakpoints or edit the contents of the `test-project` folder to do further testing.
diff --git a/containers/java-11-maven/test-project/.classpath b/containers/java-11/test-project/.classpath
similarity index 100%
rename from containers/java-11-maven/test-project/.classpath
rename to containers/java-11/test-project/.classpath
diff --git a/containers/java-11-maven/test-project/.gitignore b/containers/java-11/test-project/.gitignore
similarity index 100%
rename from containers/java-11-maven/test-project/.gitignore
rename to containers/java-11/test-project/.gitignore
diff --git a/containers/java-11-maven/test-project/.project b/containers/java-11/test-project/.project
similarity index 100%
rename from containers/java-11-maven/test-project/.project
rename to containers/java-11/test-project/.project
diff --git a/containers/java-11-maven/test-project/.settings/org.eclipse.jdt.apt.core.prefs b/containers/java-11/test-project/.settings/org.eclipse.jdt.apt.core.prefs
similarity index 100%
rename from containers/java-11-maven/test-project/.settings/org.eclipse.jdt.apt.core.prefs
rename to containers/java-11/test-project/.settings/org.eclipse.jdt.apt.core.prefs
diff --git a/containers/java-11-maven/test-project/.settings/org.eclipse.jdt.core.prefs b/containers/java-11/test-project/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from containers/java-11-maven/test-project/.settings/org.eclipse.jdt.core.prefs
rename to containers/java-11/test-project/.settings/org.eclipse.jdt.core.prefs
diff --git a/containers/java-11-maven/test-project/.settings/org.eclipse.m2e.core.prefs b/containers/java-11/test-project/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from containers/java-11-maven/test-project/.settings/org.eclipse.m2e.core.prefs
rename to containers/java-11/test-project/.settings/org.eclipse.m2e.core.prefs
diff --git a/containers/java-11-maven/test-project/pom.xml b/containers/java-11/test-project/pom.xml
similarity index 100%
rename from containers/java-11-maven/test-project/pom.xml
rename to containers/java-11/test-project/pom.xml
diff --git a/containers/java-11-maven/test-project/src/main/java/com/mycompany/app/App.java b/containers/java-11/test-project/src/main/java/com/mycompany/app/App.java
similarity index 100%
rename from containers/java-11-maven/test-project/src/main/java/com/mycompany/app/App.java
rename to containers/java-11/test-project/src/main/java/com/mycompany/app/App.java
diff --git a/containers/java-11-maven/test-project/src/main/java/module-info.java b/containers/java-11/test-project/src/main/java/module-info.java
similarity index 100%
rename from containers/java-11-maven/test-project/src/main/java/module-info.java
rename to containers/java-11/test-project/src/main/java/module-info.java
diff --git a/containers/java-11-maven/test-project/src/test/java/com/mycompany/app/AppTest.java b/containers/java-11/test-project/src/test/java/com/mycompany/app/AppTest.java
similarity index 100%
rename from containers/java-11-maven/test-project/src/test/java/com/mycompany/app/AppTest.java
rename to containers/java-11/test-project/src/test/java/com/mycompany/app/AppTest.java