diff --git a/checkmarx-ast-eclipse-plugin/.classpath b/checkmarx-ast-eclipse-plugin/.classpath index eab62b93..022bff35 100644 --- a/checkmarx-ast-eclipse-plugin/.classpath +++ b/checkmarx-ast-eclipse-plugin/.classpath @@ -9,14 +9,14 @@ - - + + - + - + \ No newline at end of file diff --git a/checkmarx-ast-eclipse-plugin/META-INF/MANIFEST.MF b/checkmarx-ast-eclipse-plugin/META-INF/MANIFEST.MF index 70cd3b0b..8060fbe4 100644 --- a/checkmarx-ast-eclipse-plugin/META-INF/MANIFEST.MF +++ b/checkmarx-ast-eclipse-plugin/META-INF/MANIFEST.MF @@ -22,11 +22,11 @@ Bundle-Activator: com.checkmarx.eclipse.Activator Bundle-ClassPath: lib/slf4j-simple-1.7.5.jar, lib/slf4j-reload4j-1.7.36.jar, lib/slf4j-api-1.7.5.jar, - lib/jackson-annotations-2.12.4.jar, - lib/jackson-core-2.12.4.jar, + lib/jackson-annotations-2.15.2.jar, + lib/jackson-core-2.15.2.jar, lib/commons-lang3-3.12.0.jar, lib/ast-cli-java-wrapper-2.4.4.jar, - lib/jackson-databind-2.13.4.2.jar, + lib/jackson-databind-2.15.2.jar, lib/org.eclipse.mylyn.commons.ui_3.25.2.v20200813-0821.jar, lib/org.apache.commons.lang_2.6.0.v20220406-2305.jar, lib/org-eclipse-mylyn-commons-core.jar, diff --git a/checkmarx-ast-eclipse-plugin/build.properties b/checkmarx-ast-eclipse-plugin/build.properties index 6c7fee31..2756ab33 100644 --- a/checkmarx-ast-eclipse-plugin/build.properties +++ b/checkmarx-ast-eclipse-plugin/build.properties @@ -4,12 +4,12 @@ bin.includes = plugin.xml,\ icons/,\ lib/slf4j-simple-1.7.5.jar,\ lib/slf4j-reload4j-1.7.36.jar,\ - lib/slf4j-api-1.7.5.jar, \ - lib/jackson-annotations-2.12.4.jar,\ - lib/jackson-core-2.12.4.jar,\ + lib/slf4j-api-1.7.5.jar,\ + lib/jackson-annotations-2.15.2.jar,\ + lib/jackson-core-2.15.2.jar,\ lib/commons-lang3-3.12.0.jar,\ lib/ast-cli-java-wrapper-2.4.4.jar,\ - lib/jackson-databind-2.13.4.2.jar,\ + lib/jackson-databind-2.15.2.jar,\ lib/org.eclipse.mylyn.commons.ui_3.25.2.v20200813-0821.jar,\ .,\ lib/org.apache.commons.lang_2.6.0.v20220406-2305.jar,\ diff --git a/checkmarx-ast-eclipse-plugin/lib/jackson-annotations-2.12.4.jar b/checkmarx-ast-eclipse-plugin/lib/jackson-annotations-2.12.4.jar deleted file mode 100644 index cb572729..00000000 Binary files a/checkmarx-ast-eclipse-plugin/lib/jackson-annotations-2.12.4.jar and /dev/null differ diff --git a/checkmarx-ast-eclipse-plugin/lib/jackson-annotations-2.15.2.jar b/checkmarx-ast-eclipse-plugin/lib/jackson-annotations-2.15.2.jar new file mode 100644 index 00000000..f8799c3f Binary files /dev/null and b/checkmarx-ast-eclipse-plugin/lib/jackson-annotations-2.15.2.jar differ diff --git a/checkmarx-ast-eclipse-plugin/lib/jackson-core-2.12.4.jar b/checkmarx-ast-eclipse-plugin/lib/jackson-core-2.12.4.jar deleted file mode 100644 index ec9de19b..00000000 Binary files a/checkmarx-ast-eclipse-plugin/lib/jackson-core-2.12.4.jar and /dev/null differ diff --git a/checkmarx-ast-eclipse-plugin/lib/jackson-core-2.15.2.jar b/checkmarx-ast-eclipse-plugin/lib/jackson-core-2.15.2.jar new file mode 100644 index 00000000..a0e74865 Binary files /dev/null and b/checkmarx-ast-eclipse-plugin/lib/jackson-core-2.15.2.jar differ diff --git a/checkmarx-ast-eclipse-plugin/lib/jackson-databind-2.13.4.2.jar b/checkmarx-ast-eclipse-plugin/lib/jackson-databind-2.13.4.2.jar deleted file mode 100644 index 5b653d60..00000000 Binary files a/checkmarx-ast-eclipse-plugin/lib/jackson-databind-2.13.4.2.jar and /dev/null differ diff --git a/checkmarx-ast-eclipse-plugin/lib/jackson-databind-2.15.2.jar b/checkmarx-ast-eclipse-plugin/lib/jackson-databind-2.15.2.jar new file mode 100644 index 00000000..86f9a866 Binary files /dev/null and b/checkmarx-ast-eclipse-plugin/lib/jackson-databind-2.15.2.jar differ diff --git a/checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/utils/PluginConstants.java b/checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/utils/PluginConstants.java index 0caa47d9..6e33ab59 100644 --- a/checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/utils/PluginConstants.java +++ b/checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/utils/PluginConstants.java @@ -15,7 +15,7 @@ public class PluginConstants { public static final String NO_CHANGES = "No changes..."; public static final String BTN_UPDATE = "Update"; public static final String BTN_LOADING = "Loading"; - public static final String DEFAULT_COMMENT_TXT = "Enter comment"; + public static final String DEFAULT_COMMENT_TXT = "Notes"; public static final String LOADING_BFL = "Loading BFL"; public static final String BFL_FOUND = "Indicates the Best Fix Location. Speed up your remediation by fixing multiple vulnerabilities at once"; public static final String BFL_NOT_FOUND = "Best fix Location not available for given results"; diff --git a/checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/CheckmarxView.java b/checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/CheckmarxView.java index bedfc12a..f7c87b3f 100644 --- a/checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/CheckmarxView.java +++ b/checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/CheckmarxView.java @@ -1371,7 +1371,7 @@ public void widgetSelected(SelectionEvent event) { Job job = new Job("Checkmarx: Updating triage information...") { String comment = commentText.getText() != null - && !commentText.getText().equalsIgnoreCase("Enter comment") ? commentText.getText() + && !commentText.getText().equalsIgnoreCase("Notes") ? commentText.getText() : ""; @Override