Skip to content

Commit 66ea411

Browse files
Merge branch 'main' into other/Brand_images
2 parents 38f9bad + 04f1263 commit 66ea411

17 files changed

Lines changed: 276 additions & 106 deletions

File tree

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.1.jar filter=lfs diff=
44
checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.2.jar filter=lfs diff=lfs merge=lfs -text
55
checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.3.jar filter=lfs diff=lfs merge=lfs -text
66
checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.4.jar filter=lfs diff=lfs merge=lfs -text
7+
checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.9.jar filter=lfs diff=lfs merge=lfs -text

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Each line is a file pattern followed by one or more owners
33

44
# Specify the default owners for the entire repository
5-
* @greensd4 @AlvoBen @pedrompflopes
5+
* @cx-anurag-dalke

ast-cli-java-wrapper.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.4
1+
2.4.9

checkmarx-ast-eclipse-plugin-tests/src/test/java/checkmarx/ast/eclipse/plugin/tests/ui/BaseUITest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static void beforeClass() throws Exception {
6060
// Used to decrease tests velocity
6161
SWTBotPreferences.PLAYBACK_DELAY = 500;
6262

63-
SWTBotPreferences.TIMEOUT = 20000;
63+
SWTBotPreferences.TIMEOUT = 30000;
6464

6565
_bot = new SWTWorkbenchBot();
6666

checkmarx-ast-eclipse-plugin-tests/src/test/java/checkmarx/ast/eclipse/plugin/tests/ui/TestUI.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
1919
import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarButton;
2020
import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarDropDownButton;
21+
import org.junit.Ignore;
2122
import org.junit.Test;
2223
import org.junit.runner.RunWith;
2324

@@ -68,6 +69,7 @@ public void testAddCheckmarxASTPlugin() throws TimeoutException {
6869
}
6970

7071
@Test
72+
@Ignore("Disabled due we changed behaviour of credeantials to show Open Setting window on clearing credentials")
7173
public void testMissingSetCheckmarxServerUrl() throws TimeoutException {
7274
// Test Connection
7375
testSuccessfulConnection(false);

checkmarx-ast-eclipse-plugin/.classpath

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111
<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.5.jar"/>
1212
<classpathentry exported="true" kind="lib" path="lib/jackson-annotations-2.15.2.jar"/>
1313
<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.15.2.jar"/>
14-
<classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.12.0.jar"/>
15-
<classpathentry exported="true" kind="lib" path="lib/ast-cli-java-wrapper-2.4.4.jar"/>
14+
<classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.18.0.jar"/>
15+
<classpathentry exported="true" kind="lib" path="lib/ast-cli-java-wrapper-2.4.9.jar"/>
1616
<classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.15.2.jar"/>
1717
<classpathentry exported="true" kind="lib" path="lib/org.eclipse.mylyn.commons.ui_3.25.2.v20200813-0821.jar"/>
1818
<classpathentry exported="true" kind="lib" path="lib/org.apache.commons.lang_2.6.0.v20220406-2305.jar"/>
1919
<classpathentry exported="true" kind="lib" path="lib/org-eclipse-mylyn-commons-core.jar"/>
20-
<classpathentry kind="src" path="src/"/>
20+
<classpathentry kind="lib" path="lib/commons-lang3-3.18.0.jar"/>
21+
<classpathentry kind="src" path="src"/>
2122
<classpathentry kind="output" path="target/classes"/>
2223
</classpath>

checkmarx-ast-eclipse-plugin/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ Bundle-ClassPath: lib/slf4j-simple-1.7.5.jar,
2424
lib/slf4j-api-1.7.5.jar,
2525
lib/jackson-annotations-2.15.2.jar,
2626
lib/jackson-core-2.15.2.jar,
27-
lib/commons-lang3-3.12.0.jar,
28-
lib/ast-cli-java-wrapper-2.4.4.jar,
27+
lib/commons-lang3-3.18.0.jar,
28+
lib/ast-cli-java-wrapper-2.4.9.jar,
2929
lib/jackson-databind-2.15.2.jar,
3030
lib/org.eclipse.mylyn.commons.ui_3.25.2.v20200813-0821.jar,
3131
lib/org.apache.commons.lang_2.6.0.v20220406-2305.jar,

checkmarx-ast-eclipse-plugin/build.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ bin.includes = plugin.xml,\
77
lib/slf4j-api-1.7.5.jar,\
88
lib/jackson-annotations-2.15.2.jar,\
99
lib/jackson-core-2.15.2.jar,\
10-
lib/commons-lang3-3.12.0.jar,\
11-
lib/ast-cli-java-wrapper-2.4.4.jar,\
10+
lib/commons-lang3-3.18.0.jar,\
11+
lib/ast-cli-java-wrapper-2.4.9.jar,\
1212
lib/jackson-databind-2.15.2.jar,\
1313
lib/org.eclipse.mylyn.commons.ui_3.25.2.v20200813-0821.jar,\
1414
.,\

checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.4.jar

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:4281ad842e573940d8552bea60e617e53cdfd204614f0fa14d469b05a2773a94
3+
size 133938172

0 commit comments

Comments
 (0)