Merge branch '1.3.1-SNAPSHOT'

secdec · Sep 25, 2018 · d76bc47 · d76bc47
2 parents e0e2e3f + 60845bd
commit d76bc47
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 20 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.github.secdec.astam-correlator</groupId>
     <artifactId>master-pom</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <packaging>pom</packaging>
 
     <name>ThreadFix</name>

diff --git a/ssvl-converter/pom.xml b/ssvl-converter/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <groupId>com.github.secdec.astam-correlator</groupId>
         <artifactId>master-pom</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <artifactId>ssvl-converter</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
 
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>

diff --git a/threadfix-astam/pom.xml b/threadfix-astam/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.github.secdec.astam-correlator</groupId>
         <artifactId>master-pom</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/threadfix-cli-importers/pom.xml b/threadfix-cli-importers/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>master-pom</artifactId>
         <groupId>com.github.secdec.astam-correlator</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/threadfix-cli-lib/pom.xml b/threadfix-cli-lib/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.secdec.astam-correlator</groupId>
         <artifactId>master-pom</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <artifactId>threadfix-cli-lib</artifactId>

diff --git a/threadfix-cli/pom.xml b/threadfix-cli/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.secdec.astam-correlator</groupId>
         <artifactId>master-pom</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <artifactId>threadfix-cli</artifactId>

diff --git a/threadfix-data-access/pom.xml b/threadfix-data-access/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>master-pom</artifactId>
         <groupId>com.github.secdec.astam-correlator</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/threadfix-data-migration/pom.xml b/threadfix-data-migration/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>master-pom</artifactId>
         <groupId>com.github.secdec.astam-correlator</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/threadfix-entities/pom.xml b/threadfix-entities/pom.xml
@@ -97,7 +97,7 @@
     <parent>
         <groupId>com.github.secdec.astam-correlator</groupId>
         <artifactId>master-pom</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <dependencies>

diff --git a/threadfix-entities/src/main/java/com/denimgroup/threadfix/data/interfaces/Endpoint.java b/threadfix-entities/src/main/java/com/denimgroup/threadfix/data/interfaces/Endpoint.java
@@ -96,14 +96,18 @@ public static class Info {
 
         int startingLineNumber;
 
-        public static Info fromEndpoint(Endpoint endpoint) {
+        public static Info fromEndpoint(Endpoint endpoint, boolean includeSourceFile) {
             Info info = new Info();
             info.parameters = endpoint.getParameters();
             info.httpMethod = endpoint.getHttpMethod();
             info.urlPath = endpoint.getUrlPath();
-            info.filePath = endpoint.getFilePath();
             info.csvLine = endpoint.getCSVLine();
-            info.startingLineNumber = endpoint.getStartingLineNumber();
+
+            if (includeSourceFile) {
+                info.filePath = endpoint.getFilePath();
+                info.startingLineNumber = endpoint.getStartingLineNumber();
+            }
+
             return info;
         }
 

diff --git a/threadfix-ham/pom.xml b/threadfix-ham/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.github.secdec.astam-correlator</groupId>
         <artifactId>master-pom</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/threadfix-importers/pom.xml b/threadfix-importers/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>master-pom</artifactId>
         <groupId>com.github.secdec.astam-correlator</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/threadfix-main/pom.xml b/threadfix-main/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.secdec.astam-correlator</groupId>
         <artifactId>master-pom</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
 
     <artifactId>threadfix</artifactId>
@@ -158,7 +158,7 @@
                                       tofile="target/classes/downloads/release-2.zap" />
                                 <copy file="${project.build.directory}/../../threadfix-sonar-plugin/target/sonar-threadfix-plugin-${project.version}.jar"
                                       tofile="target/classes/downloads/sonar-threadfix-plugin.jar" />-->
-                                <copy file="${project.build.directory}/../../ssvl-converter/target/ssvl-converter-1.3.0-jar-with-dependencies.jar"
+                                <copy file="${project.build.directory}/../../ssvl-converter/target/ssvl-converter-1.3.1-jar-with-dependencies.jar"
                                       tofile="target/classes/downloads/ssvl-converter.jar" />
                             </tasks>
                         </configuration>

diff --git a/...n/src/main/java/com/denimgroup/threadfix/webapp/controller/rest/PluginRestController.java b/...n/src/main/java/com/denimgroup/threadfix/webapp/controller/rest/PluginRestController.java
@@ -202,7 +202,7 @@ private Endpoint.Info[] getEndpointInfo(List<Endpoint> endpoints) {
         Endpoint.Info[] endpointsInfos = new Endpoint.Info[allEndpoints.size()];
 
         for (int i = 0; i < allEndpoints.size(); i++) {
-            endpointsInfos[i] = Endpoint.Info.fromEndpoint(allEndpoints.get(i));
+            endpointsInfos[i] = Endpoint.Info.fromEndpoint(allEndpoints.get(i), true);
         }
 
         return endpointsInfos;

diff --git a/threadfix-offline/pom.xml b/threadfix-offline/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>master-pom</artifactId>
         <groupId>com.github.secdec.astam-correlator</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/threadfix-service-interfaces/pom.xml b/threadfix-service-interfaces/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>master-pom</artifactId>
         <groupId>com.github.secdec.astam-correlator</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>