Merge pull request #16 from checkmarx-ltd/merge_last_release

1. Support for new SonarQube APIs and support for older backward compatibility 2. cx.proxyBypass JVM property can be defined to avoid proxy usage for CxSAST communication from MVN, Sonar scanner as well as SonarQube Web portal 3. Support for missing Checkmarx Rules 4. Fix to handle disabled force authentication setting of SonarQube
checkmarx-ltd · Jun 30, 2021 · 4829104 · 4829104
2 parents e696418 + c7adb61
commit 4829104
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 .idea
 target
-*.iml
+*.iml
+/bin/
+.project
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>checkmarx.com</groupId>
     <artifactId>com.checkmarx.sonar.cxplugin</artifactId>
     <packaging>sonar-plugin</packaging>
-    <version>2021.0.3</version>
+    <version>2021.2.1</version>
     <name>Checkmarx plugin</name>
     <description>Checkmarx plugin</description>
 
@@ -140,8 +140,18 @@
                     <groupId>javax.ws.rs</groupId>
                     <artifactId>javax.ws.rs-api</artifactId>
                 </exclusion>
+				<exclusion>
+				    <groupId>org.glassfish.jersey.core</groupId>
+				    <artifactId>jersey-common</artifactId>				    
+				</exclusion>				                
             </exclusions>
         </dependency>
+		<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.core/jersey-common -->
+		<dependency>
+		    <groupId>org.glassfish.jersey.core</groupId>
+		    <artifactId>jersey-common</artifactId>
+		    <version>3.0.1</version>
+		</dependency>
 
         <!-- mapping between objects and jsons-->
         <dependency>
@@ -163,7 +173,7 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20080701</version>
+            <version>20210307</version>
         </dependency>
         <!--        <dependency>-->
         <!--            <groupId>com.sun.xml.ws</groupId>-->
@@ -198,6 +208,10 @@
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
+				<exclusion>
+				    <groupId>org.apache.httpcomponents</groupId>
+				    <artifactId>httpclient</artifactId>				    
+				</exclusion>				                
             </exclusions>
         </dependency>
         <dependency>
@@ -211,12 +225,24 @@
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency>
+        </dependency>  
+        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
+		<dependency>
+		    <groupId>org.apache.httpcomponents</groupId>
+		    <artifactId>httpclient</artifactId>
+		    <version>4.5.13</version>
+		</dependency>
+
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.9.10.5</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.10</version>
         </dependency>
+        <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>2.9.10.8</version>
+    </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
@@ -229,10 +255,21 @@
             <version>2020.2.4.NO.SCA</version>
             <exclusions>
                 <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
+		            <groupId>com.fasterxml.jackson.core</groupId>
+        		    <artifactId>jackson-databind</artifactId>
                 </exclusion>
-
+                <exclusion>
+                	<groupId>com.checkmarx</groupId>
+    				<artifactId>cx-ws-fs-agent</artifactId>
+                 </exclusion>
+               <exclusion>
+				    <groupId>io.vertx</groupId>
+				    <artifactId>vertx-web</artifactId>
+                </exclusion>
+                <exclusion>
+				    <groupId>org.apache.velocity</groupId>
+    				<artifactId>velocity</artifactId>
+    			</exclusion>
                 <exclusion>
                     <groupId>log4j</groupId>
                     <artifactId>log4j</artifactId>
@@ -262,7 +299,13 @@
                     <artifactId>commons-logging-api</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency>
+   			</dependency>		        
+            <dependency>
+               <groupId>commons-logging</groupId>
+               <artifactId>commons-logging</artifactId>
+               <scope>provided</scope>
+               <version>1.2</version>
+           </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-ext</artifactId>

diff --git a/src/main/resources/static/jquery-3.3.1.min.js b/src/main/resources/static/jquery-3.3.1.min.js
diff --git a/src/main/resources/static/jquery-3.5.1.min.js b/src/main/resources/static/jquery-3.5.1.min.js
diff --git a/src/main/resources/static/project_configuration.js b/src/main/resources/static/project_configuration.js
@@ -30,7 +30,7 @@ window.registerExtension('checkmarx/project_configuration', function (options) {
 
     var script = document.createElement("script");
     script.type = "text/javascript";
-    script.src = staticUrl + '/jquery-3.3.1.min.js';
+    script.src = staticUrl + '/jquery-3.5.1.min.js';
     // Perform the rest of the init process after jQuery loads.
     script.onload = init;
     document.body.appendChild(script);