diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9d6246269..c1229fe51 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -25,14 +25,27 @@ This project uses Google Java style formatting rules. Install extensions [Language Support for Java(TM) by Red Hat](https://marketplace.visualstudio.com/items?itemName=redhat.java) and [Checkstyle for Java ](https://marketplace.visualstudio.com/items?itemName=shengchen.vscode-checkstyle) and add the following to settings.json. ``` - "[java]": { - "editor.defaultFormatter": "redhat.java", - "editor.formatOnSave": true, - }, - "java.format.settings.url": "https://raw.githubusercontent.com/google/styleguide/gh-pages/eclipse-java-google-style.xml", - "java.saveActions.organizeImports": true, - "java.checkstyle.version": "10.3", - "java.checkstyle.configuration": "https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml" + "java.configuration.updateBuildConfiguration": "interactive", + "[java]": { + "editor.defaultFormatter": "redhat.java", + "editor.formatOnSave": true, + "editor.tabSize": 2, + "editor.insertSpaces": true, + "editor.detectIndentation": false + }, + "java.format.settings.url": "https://raw.githubusercontent.com/google/styleguide/gh-pages/eclipse-java-google-style.xml", + "java.saveActions.organizeImports": true, + "java.checkstyle.version": "10.18.1", + "java.checkstyle.configuration": "${workspaceFolder}/checkstyle_neqsim.xml", + "java.debug.settings.hotCodeReplace": "never", + "[xml]": { + "editor.tabSize": 4, + "editor.insertSpaces": false + }, + "[json]": { + "editor.tabSize": 4, + "editor.insertSpaces": true + } ``` Note: workspace/project specific settings are located in folder .vscode. diff --git a/pom.xml b/pom.xml index 83503a2db..11872f8f9 100644 --- a/pom.xml +++ b/pom.xml @@ -115,7 +115,7 @@ com.google.code.gson gson - 2.11.0 + 2.12.1 diff --git a/pomJava21.xml b/pomJava21.xml index 01750f8d4..6b02ec837 100644 --- a/pomJava21.xml +++ b/pomJava21.xml @@ -114,7 +114,7 @@ com.google.code.gson gson - 2.10.1 + 2.12.1 diff --git a/pomJava8.xml b/pomJava8.xml index 03953bce4..5443b73b4 100644 --- a/pomJava8.xml +++ b/pomJava8.xml @@ -114,7 +114,7 @@ com.google.code.gson gson - 2.10.1 + 2.12.1