Skip to content
This repository has been archived by the owner on Jun 24, 2024. It is now read-only.

Commit

Permalink
IAS-11362: Fix dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@emcanearney-r7
emcanearney-r7 committed Jan 23, 2024
1 parent 2a7bda0 commit de828c3
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 22 deletions.
74 changes: 57 additions & 17 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<properties>
<bamboo.version>9.0.4</bamboo.version>
<bamboo.data.version>9.0.4</bamboo.data.version>
<amps.version>6.3.21</amps.version>
<amps.version>8.10.1</amps.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. -->
Expand All @@ -41,7 +41,6 @@
<gson-fire-version>1.8.0</gson-fire-version>
<mockito-core.version>2.8.9</mockito-core.version>
<log4j.version>1.2.17-atlassian-18</log4j.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<apache-logging.version>2.21.1</apache-logging.version>
<json.version>20231013</json.version>
<plexus-utils.version>4.0.0</plexus-utils.version>
Expand Down Expand Up @@ -130,19 +129,34 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
</exclusion>
<exclusion>
<groupId>org.tmatesoft.sqljet</groupId>
<artifactId>sqljet</artifactId>
</exclusion>
<!-- New after changing build plugin-->
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>

<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
Expand All @@ -165,12 +179,40 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
<version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${maven-core.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -233,6 +275,12 @@
<artifactId>atlassian-plugins-osgi-testrunner</artifactId>
<version>${plugin.testrunner.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -242,13 +290,6 @@
<scope>provided</scope>
</dependency>

<!-- rapid7 InsightAppSec Java Client -->
<!--<dependency>-->
<!--<groupId>com.rapid7.ias</groupId>-->
<!--<artifactId>insightappsec-client</artifactId>-->
<!--<version>0.1.0</version>-->
<!--</dependency>-->
<!-- rapid7 InsightAppSec Java Client dependencies -->
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
Expand Down Expand Up @@ -300,14 +341,13 @@
<plugins>
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-bamboo-plugin</artifactId>
<artifactId>bamboo-maven-plugin</artifactId>
<version>${amps.version}</version>
<extensions>true</extensions>
<configuration>
<productVersion>${bamboo.version}</productVersion>
<productDataVersion>${bamboo.data.version}</productDataVersion>
<enableQuickReload>true</enableQuickReload>
<enableFastdev>false</enableFastdev>

<!-- See here for an explanation of default instructions: -->
<!-- https://developer.atlassian.com/docs/advanced-topics/configuration-of-instructions-in-atlassian-plugins -->
Expand Down
5 changes: 0 additions & 5 deletions src/main/java/com/rapid7/ias/bamboo/impl/InsightAppSecRuntimeDataProvider.java
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
package com.rapid7.ias.bamboo.impl;

import com.atlassian.bamboo.ResultKey;
import com.atlassian.bamboo.credentials.CredentialsAccessor;
import com.atlassian.bamboo.credentials.CredentialsData;
import com.atlassian.bamboo.security.SecureToken;
import com.atlassian.bamboo.security.SecureTokenService;
import com.atlassian.bamboo.serialization.WhitelistedSerializable;
import com.atlassian.bamboo.task.RuntimeTaskDataProvider;
import com.atlassian.bamboo.task.TaskDefinition;
import com.atlassian.bamboo.task.runtime.RuntimeTaskDefinition;
import com.atlassian.bamboo.v2.build.CommonContext;
import com.atlassian.bamboo.v2.build.agent.messages.AuthenticableMessage;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;

Expand Down

0 comments on commit de828c3

Please sign in to comment.