Skip to content

Commit 8158631

Browse files
cx-aniket-shindecx-anand-nandeshwar
cx-aniket-shinde
and
cx-anand-nandeshwar
authored
Other/CodeMigration-bugfixes(AST-131175)
* Updated dependency slf4j and jackson * Code migration changes (exclude java wrapper) * Changed the test classes as per the junit5 * Track large jar using Git LFS * Updated ci.yml for java 17 migration. * Updated release.yml for java 17 * Update ci.yml, workflow dispatch action added for manual check * Added testing comment * Added the dependency declaration inside the pom * Resolved slf4j issue * Updated pom.xml * align changes * align changes * resolved tests failing * Mockito annotation import resolved * resolved integration test cases * resolved integration test cases * resolved integration test cases * resolved integration test cases * reverted chnages * pom changed for integration failing * reverted chnages * UI test cases * Recommit small jars as normal binaries, keep wrappers in LFS * Track plugin lib jars as normal binaries * Update ci.yml * Update ci.yml * Update ci.yml * Update ci.yml * vulnerability resolved * Removed dependency * Chagned icons * fixed UI test cases * Resolved UI test cases and preferences page enhancements * Resolved UI test cases * changes in branch for SCAResult * TestFilterState changes * BaseUITest changes * BaseUITest changes * BaseUITest changes * SCAResults changes * resolving approval comment * resolving approval comment --------- Co-authored-by: Anand Nandeshwar <73646287+cx-anand-nandeshwar@users.noreply.github.com>
1 parent f3fb593 commit 8158631

63 files changed

Lines changed: 1108 additions & 885 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
44
<classpathentry kind="output" path="bin"/>
55
</classpath>

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
/.metadata/
55
.idea/
66
.vs/
7-
.vscode/
7+
*.jar
8+
!checkmarx-ast-eclipse-plugin/lib/*.jar

‎.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
33
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
55
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6-
org.eclipse.jdt.core.compiler.compliance=1.8
6+
org.eclipse.jdt.core.compiler.compliance=17
77
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
88
org.eclipse.jdt.core.compiler.debug.localVariable=generate
99
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -13,4 +13,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
1313
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
1414
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
1515
org.eclipse.jdt.core.compiler.release=disabled
16-
org.eclipse.jdt.core.compiler.source=1.8
16+
org.eclipse.jdt.core.compiler.source=17

‎checkmarx-ast-eclipse-plugin-tests/.classpath‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,33 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
4+
<attributes>
5+
<attribute name="module" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
49
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5-
<classpathentry kind="src" path="src/test/java">
10+
<classpathentry kind="src" output="target/classes" path="src/test/java">
611
<attributes>
7-
<attribute name="test" value="true"/>
12+
<attribute name="optional" value="true"/>
13+
<attribute name="maven.pomderived" value="true"/>
814
</attributes>
915
</classpathentry>
10-
<classpathentry exported="true" kind="lib" path="lib/jmockit-1.19.jar"/>
11-
<classpathentry exported="true" kind="lib" path="lib/mockito-core-1.10.19.jar"/>
16+
<classpathentry exported="true" kind="lib" path="lib/mockito-core-5.14.2.jar"/>
1217
<classpathentry exported="true" kind="lib" path="lib/objenesis-2.2.jar"/>
13-
<classpathentry exported="true" kind="lib" path="lib/junit-4.13.2.jar"/>
18+
<classpathentry exported="true" kind="lib" path="lib/junit-jupiter-5.11.4.jar"/>
19+
<classpathentry kind="lib" path="lib/objenesis-3.3.jar"/>
20+
<classpathentry kind="lib" path="lib/powermock-api-mockito2-2.0.7.jar"/>
21+
<classpathentry kind="lib" path="lib/powermock-core-2.0.9.jar"/>
22+
<classpathentry kind="lib" path="lib/powermock-api-support-1.4.9.jar"/>
23+
<classpathentry kind="lib" path="lib/powermock-module-junit4-2.0.9.jar"/>
24+
<classpathentry kind="lib" path="lib/powermock-module-junit4-common-2.0.9.jar"/>
25+
<classpathentry kind="lib" path="lib/powermock-module-junit4-rule-2.0.9.jar"/>
26+
<classpathentry kind="lib" path="lib/powermock-reflect-2.0.9.jar"/>
27+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
28+
<attributes>
29+
<attribute name="maven.pomderived" value="true"/>
30+
</attributes>
31+
</classpathentry>
1432
<classpathentry kind="output" path="target/classes"/>
1533
</classpath>

‎checkmarx-ast-eclipse-plugin-tests/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
4-
org.eclipse.jdt.core.compiler.compliance=1.8
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
4+
org.eclipse.jdt.core.compiler.compliance=17
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
6+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
67
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7-
org.eclipse.jdt.core.compiler.release=disabled
8-
org.eclipse.jdt.core.compiler.source=1.8
8+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
9+
org.eclipse.jdt.core.compiler.release=enabled
10+
org.eclipse.jdt.core.compiler.source=17

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: checkmarx-ast-eclipse-plugin-tests
44
Bundle-SymbolicName: com.checkmarx.ast.eclipse.tests
55
Bundle-Version: 1.0.0.qualifier
6-
Require-Bundle: org.eclipse.swtbot.go
7-
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
8-
Bundle-ClassPath: ., lib/jmockit-1.19.jar, lib/mockito-core-1.10.19.jar, lib/objenesis-2.2.jar, lib/junit-4.13.2.jar
9-
Fragment-Host: com.checkmarx.eclipse.plugin;bundle-version=0.0.0
10-
6+
Fragment-Host: com.checkmarx.eclipse.plugin;bundle-version="1.0.0"
7+
Require-Bundle:
8+
org.eclipse.swtbot.swt.finder,
9+
org.eclipse.swtbot.eclipse.finder,
10+
org.eclipse.swtbot.junit5_x,
11+
org.eclipse.swt,
12+
org.eclipse.jdt.junit5.runtime,
13+
junit-jupiter-api
14+
Bundle-RequiredExecutionEnvironment: JavaSE-17
15+
Bundle-ClassPath: .,lib/mockito-core-5.14.2.jar,lib/powermock-core-*.jar
16+
Automatic-Module-Name: com.checkmarx.ast.eclipse.tests

‎checkmarx-ast-eclipse-plugin-tests/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ source.. = src/test/java
22
output.. = target/classes/
33
bin.includes = META-INF/,\
44
target/,\
5-
build.properties
5+
build.properties

‎checkmarx-ast-eclipse-plugin-tests/lib/jmockit-1.19.jar‎

-583 KB
Binary file not shown.

‎checkmarx-ast-eclipse-plugin-tests/lib/junit-4.13.2.jar‎

-376 KB
Binary file not shown.

‎checkmarx-ast-eclipse-plugin-tests/lib/mockito-core-1.10.19.jar‎

-1.12 MB
Binary file not shown.

0 commit comments

Comments
 (0)