Update Jackson, HTTP client, and bamboo dependencies

Author: tylercamp

pom.xml

@@ -19,14 +19,15 @@
     <packaging>atlassian-plugin</packaging>
 
     <properties>
-
-        <bamboo.version>6.3.2</bamboo.version>
-        <bamboo.data.version>6.3.2</bamboo.data.version>
-        <amps.version>6.3.15</amps.version>
-        <plugin.testrunner.version>1.2.3</plugin.testrunner.version>
-        <atlassian.spring.scanner.version>1.2.13</atlassian.spring.scanner.version>
-        <jersey-version>2.25.1</jersey-version>
-        <jackson-version>2.9.8</jackson-version>
+        <!-- Note: change to 7.1.1 for local testing using `atlas-*` commands due to icu4j init errors in earlier Bamboo
+                   versions when using recent Java 8 versions -->
+        <bamboo.version>7.1.1</bamboo.version>
+        <bamboo.data.version>${bamboo.version}</bamboo.data.version>
+        <amps.version>8.1.2</amps.version>
+        <plugin.testrunner.version>2.0.2</plugin.testrunner.version>
+        <atlassian.spring.scanner.version>2.1.7</atlassian.spring.scanner.version>
+        <jersey-version>2.41</jersey-version>
+        <jackson-version>2.15.2</jackson-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>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -109,11 +110,12 @@
         <dependency>
             <groupId>com.github.joschi.jackson</groupId>
             <artifactId>jackson-datatype-threetenbp</artifactId>
-            <version>2.6.4</version>
+            <version>${jackson-version}</version>
         </dependency>
 
         <!-- Base64 encoding that works in both JVM and Android -->
         <dependency>
+            <!-- TODO - update / remove -->
             <groupId>com.brsanthu</groupId>
             <artifactId>migbase64</artifactId>
             <version>2.2</version>
@@ -125,32 +127,16 @@
         <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>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <releases>
-                <enabled>true</enabled>
-                <checksumPolicy>warn</checksumPolicy>
-            </releases>
-            <snapshots>
-                <updatePolicy>never</updatePolicy>
-                <checksumPolicy>warn</checksumPolicy>
-            </snapshots>
-            <id>atlassian-public</id>
-            <url>https://maven.atlassian.com/repository/public</url>
-        </pluginRepository>
-    </pluginRepositories>
-
 </project>

src/main/java/com/codedx/client/CustomInstantDeserializer.java

@@ -1,20 +1,16 @@
 package com.codedx.client;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonTokenId;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.datatype.threetenbp.DateTimeUtils;
 import com.fasterxml.jackson.datatype.threetenbp.DecimalUtils;
 import com.fasterxml.jackson.datatype.threetenbp.deser.ThreeTenDateTimeDeserializerBase;
 import com.fasterxml.jackson.datatype.threetenbp.function.BiFunction;
 import com.fasterxml.jackson.datatype.threetenbp.function.Function;
-import org.threeten.bp.DateTimeException;
-import org.threeten.bp.Instant;
-import org.threeten.bp.OffsetDateTime;
-import org.threeten.bp.ZoneId;
-import org.threeten.bp.ZonedDateTime;
+import org.threeten.bp.*;
 import org.threeten.bp.format.DateTimeFormatter;
 import org.threeten.bp.temporal.Temporal;
 import org.threeten.bp.temporal.TemporalAccessor;
@@ -147,13 +143,25 @@ protected CustomInstantDeserializer(CustomInstantDeserializer<T> base, DateTimeF
   }
 
   @Override
-  protected JsonDeserializer<T> withDateFormat(DateTimeFormatter dtf) {
+  protected ThreeTenDateTimeDeserializerBase<T> withDateFormat(DateTimeFormatter dtf) {
     if (dtf == _formatter) {
       return this;
     }
     return new CustomInstantDeserializer<T>(this, dtf);
   }
 
+  @Override
+  protected ThreeTenDateTimeDeserializerBase<T> withLeniency(Boolean leniency) {
+    // TODO
+    return this;
+  }
+
+  @Override
+  protected ThreeTenDateTimeDeserializerBase<T> withShape(JsonFormat.Shape shape) {
+    // TODO
+    return this;
+  }
+
   @Override
   public T deserialize(JsonParser parser, DeserializationContext context) throws IOException {
     //NOTE: Timestamps contain no timezone info, and are always in configured TZ. Only
@@ -205,7 +213,7 @@ public T deserialize(JsonParser parser, DeserializationContext context) throws I
 
   private ZoneId getZone(DeserializationContext context) {
     // Instants are always in UTC, so don't waste compute cycles
-    return (_valueClass == Instant.class) ? null : DateTimeUtils.timeZoneToZoneId(context.getTimeZone());
+    return (_valueClass == Instant.class) ? null : DateTimeUtils.toZoneId(context.getTimeZone());
   }
 
   private static class FromIntegerArguments {

src/main/java/com/codedx/plugins/bamboo/CodeDxScanTask.java

@@ -2,17 +2,12 @@
 
 import com.atlassian.bamboo.build.logger.BuildLogger;
 import com.atlassian.bamboo.configuration.ConfigurationMap;
-import com.atlassian.bamboo.task.TaskContext;
-import com.atlassian.bamboo.task.TaskException;
-import com.atlassian.bamboo.task.TaskResult;
-import com.atlassian.bamboo.task.TaskResultBuilder;
-import com.atlassian.bamboo.task.TaskType;
-import com.atlassian.util.concurrent.NotNull;
-import com.codedx.plugins.bamboo.utils.Archiver;
-import com.codedx.plugins.bamboo.utils.CodeDxBuildStatistics;
+import com.atlassian.bamboo.task.*;
 import com.codedx.client.ApiClient;
 import com.codedx.client.ApiException;
 import com.codedx.client.api.*;
+import com.codedx.plugins.bamboo.utils.Archiver;
+import com.codedx.plugins.bamboo.utils.CodeDxBuildStatistics;
 import org.apache.log4j.Logger;
 
 import java.io.File;
@@ -62,8 +57,7 @@ private static class ScanTaskState {
         List<GroupedCount> groupedCounts;
     }
 
-    @NotNull
-    @java.lang.Override
+    @Override
     public TaskResult execute(final TaskContext taskContext) throws TaskException
     {
         ScanTaskState state = new ScanTaskState();