Merge branch 'master' of https://github.com/Microsoft/vscode-dev-cont…

…ainers
microsoft · Apr 19, 2019 · 4382a6e · 4382a6e
2 parents a68bec6 + a31934c
commit 4382a6e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 4 deletions.
diff --git a/containers/java-8-maven/.devcontainer/Dockerfile b/containers/java-8-maven/.devcontainer/Dockerfile
@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See LICENSE in the project root for license information.
 #-----------------------------------------------------------------------------------------
 
-FROM maven:3.6-jdk-8
+FROM maven:3-jdk-8
 
 # Install git, process tools
 RUN apt-get update && apt-get -y install git procps

diff --git a/containers/java-8-maven/.devcontainer/devcontainer.json b/containers/java-8-maven/.devcontainer/devcontainer.json
@@ -1,7 +1,8 @@
 {
-	"name": "Java 8",
+	"name": "Java 8 & Maven",
 	"dockerFile": "Dockerfile",
 	"extensions": [
-		"vscjava.vscode-java-pack"		
+		"vscjava.vscode-java-pack",
+		"redhat.vscode-xml"
 	]
 }
diff --git a/containers/java-8-maven/README.md b/containers/java-8-maven/README.md
@@ -2,7 +2,7 @@
 
 ## Summary
 
-*Develop Java 8 based applications. Includes the JDK along with any dependencies Maven requires.*
+*Develop Java 8 based applications. Includes the JDK, XML tools, along with any dependencies Maven requires.*
 
 | Metadata | Value |  
 |----------|-------|

diff --git a/containers/java-8-maven/test-project/.settings/org.eclipse.jdt.core.prefs b/containers/java-8-maven/test-project/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.5
diff --git a/...ien/TensorFlow-Examples/devcontainer.json → ...en/TensorFlow-Examples/.devcontainer.json b/...ien/TensorFlow-Examples/devcontainer.json → ...en/TensorFlow-Examples/.devcontainer.json
diff --git a/...ithub.com/django/django/devcontainer.json → ...thub.com/django/django/.devcontainer.json b/...ithub.com/django/django/devcontainer.json → ...thub.com/django/django/.devcontainer.json
diff --git a/...m/spmallick/learnopencv/devcontainer.json → .../spmallick/learnopencv/.devcontainer.json b/...m/spmallick/learnopencv/devcontainer.json → .../spmallick/learnopencv/.devcontainer.json