Merge pull request #20 from rapid7/DF-4166

DF-4166

help.md

@@ -73,6 +73,7 @@ If the scan gating doesn't appear to occur as expected, confirm that the vulnera
 
 # Version History
 
+* 1.1.2 - Update dependencies
 * 1.1.1 - Add new regions to InsightAppSec Region dropdown. Use search endpoint to retrieve scan-configs.
 * 1.1.0 - Support for Atlassian Bamboo 7.0.X, Implements RuntimeDataProvider to assist with pre-fetch of API Key for tasks run on remote agents
 * 1.0.0 - Initial integration

manifest.json

@@ -21,8 +21,13 @@
         "sourceUrl": "https://github.com/rapid7/insightappsec-bamboo-plugin",
         "licenseUrl": "https://github.com/rapid7/insightappsec-bamboo-plugin/blob/master/LICENSE"
     },
-    "version": "1.1.1",
+    "version": "1.1.2",
     "versionHistory": [
+        {
+            "version": "1.1.2",
+            "date": "",
+            "changes": "Update dependencies."
+        },
         {
             "version": "1.1.1",
             "date": "",

pom.xml

@@ -5,13 +5,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.rapid7.ias.bamboo</groupId>
     <artifactId>insightappsec-bamboo-plugin</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
+
     <scm>
         <url>https://github.com/rapid7/insightappsec-bamboo-plugin</url>
         <connection>scm:git:[email protected]:rapid7/insightappsec-bamboo-plugin.git</connection>
         <developerConnection>scm:git:[email protected]:rapid7/insightappsec-bamboo-plugin.git</developerConnection>
-      <tag>HEAD</tag>
-  </scm>
+        <tag>HEAD</tag>
+    </scm>
 
     <organization>
         <name>Rapid7</name>
@@ -23,10 +24,10 @@
     <packaging>atlassian-plugin</packaging>
 
     <properties>
-        <bamboo.version>7.1.1</bamboo.version>
-        <bamboo.data.version>7.1.1</bamboo.data.version>
+        <bamboo.version>8.1.1</bamboo.version>
+        <bamboo.data.version>8.1.1</bamboo.data.version>
         <amps.version>6.3.21</amps.version>
-        <plugin.testrunner.version>1.2.3</plugin.testrunner.version>
+        <plugin.testrunner.version>2.0.1</plugin.testrunner.version>
         <atlassian.spring.scanner.version>1.2.13</atlassian.spring.scanner.version>
         <!-- This key is used to keep the consistency between the key in atlassian-plugin.xml and the key to generate bundle. -->
         <atlassian.plugin.key>${project.groupId}.${project.artifactId}</atlassian.plugin.key>
@@ -36,7 +37,7 @@
         <!-- Rapid7 InsightAppSec Java Client dependency versions -->
         <swagger-core-version>1.5.15</swagger-core-version>
         <okhttp-version>2.7.5</okhttp-version>
-        <gson-version>2.8.1</gson-version>
+        <gson-version>2.8.9</gson-version>
         <gson-fire-version>1.8.0</gson-fire-version>
         <mockito-core.version>2.8.9</mockito-core.version>
     </properties>
@@ -47,6 +48,12 @@
             <artifactId>atlassian-bamboo-web</artifactId>
             <version>${bamboo.version}</version>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.codehaus.woodstox</groupId>
+                    <artifactId>stax2-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -69,11 +76,18 @@
             <version>1</version>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
+            <version>3.0.16</version>
+            <scope>compile</scope>
+        </dependency>
 
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
 
@@ -97,11 +111,6 @@
             <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.2.2-atlassian-1</version>
-        </dependency>
 
         <!-- rapid7 InsightAppSec Java Client -->
         <!--<dependency>-->
@@ -134,11 +143,13 @@
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
             <version>${gson-version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>io.gsonfire</groupId>
             <artifactId>gson-fire</artifactId>
             <version>${gson-fire-version}</version>
+            <scope>compile</scope>
         </dependency>
 
         <!-- Additional dependencies -->
@@ -182,6 +193,10 @@
                             *;version="0";resolution:=optional
                         </Import-Package>
 
+                        <Require-Capability>
+                            osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=1.8))"
+                        </Require-Capability>
+
                         <!-- Ensure plugin is spring powered -->
                         <Spring-Context>*</Spring-Context>
                     </instructions>
@@ -201,6 +216,7 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <includeExclude>-com.atlassian.plugin.spring.scanner.annotation.*</includeExclude>
                     <scannedDependencies>
                         <dependency>
                             <groupId>com.atlassian.plugin</groupId>
@@ -212,12 +228,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <distributionManagement>
-        <repository>
-            <id>local</id>
-            <name>Local repository</name>
-            <url>file://${user.home}/.m2/repository</url>
-        </repository>
-    </distributionManagement>
 </project>

src/main/java/com/rapid7/ias/bamboo/impl/InsightAppSecHelper.java

@@ -20,7 +20,7 @@
 
 public class InsightAppSecHelper {
 
-    private String USER_AGENT = "r7:insightappsec-bamboo/1.1.1";
+    private String USER_AGENT = "r7:insightappsec-bamboo/1.1.2";
     private String SCAN_CONFIG_QUERY = "scanconfig.app.id='%1$s' && scanconfig.name='%2$s'";
 
     private UtilityLogger logger;