From 783232a3fbd8e14e3bb6e06839a25b70c30bb504 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?=
<34712686+asmfstatoil@users.noreply.github.com>
Date: Thu, 6 Feb 2025 06:34:14 +0100
Subject: [PATCH] Bump gson (#1269)
* chore: update gson dep
* chore: update Contributing.md
---
CONTRIBUTING.md | 29 +++++++++++++++++++++--------
pom.xml | 2 +-
pomJava21.xml | 2 +-
pomJava8.xml | 2 +-
4 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9d62462697..c1229fe51d 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 83503a2db7..11872f8f9d 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 01750f8d40..6b02ec8377 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 03953bce48..5443b73b40 100644
--- a/pomJava8.xml
+++ b/pomJava8.xml
@@ -114,7 +114,7 @@
com.google.code.gson
gson
- 2.10.1
+ 2.12.1