Update build-info and bamboo core (#208)

jfrog · Dec 13, 2023 · 52c8d31 · 52c8d31
1 parent 603dd54
commit 52c8d31
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
     </scm>
 
     <properties>
-        <bamboo.version>9.3.0</bamboo.version>
+        <bamboo.version>9.3.3</bamboo.version>
         <bamboo.data.version>${bamboo.version}</bamboo.data.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>
@@ -40,8 +40,8 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <!--Skip integration tests unless explicitly requested with -DskipITs=false-->
         <skipITs>true</skipITs>
-        <buildinfo.version>2.39.9</buildinfo.version>
-        <buildinfo.gradle.version>4.31.9</buildinfo.gradle.version>
+        <buildinfo.version>2.41.8</buildinfo.version>
+        <buildinfo.gradle.version>4.33.7</buildinfo.gradle.version>
     </properties>
 
     <profiles>

diff --git a/src/main/java/org/jfrog/bamboo/task/ArtifactoryTaskBase.java b/src/main/java/org/jfrog/bamboo/task/ArtifactoryTaskBase.java
@@ -47,7 +47,7 @@ protected void reportUsage(ServerConfig serverConfig, String taskName, Log log)
         UsageReporter usageReporter = new UsageReporter("bamboo-artifactory-plugin/" + Utils.getPluginVersion(pluginAccessor), featureIdArray);
 
         try {
-            usageReporter.reportUsage(serverConfig.getUrl(), serverConfig.getUsername(), serverConfig.getPassword(), "", null, log);
+            usageReporter.reportUsage(serverConfig.getUrl(), serverConfig.getUsername(), serverConfig.getPassword(), "", null, null, log);
             log.info("Usage info sent successfully.");
         } catch (Exception ex) {
             log.info("Failed sending usage report to Artifactory: " + ex);

diff --git a/src/main/java/org/jfrog/bamboo/util/generic/GenericData.java b/src/main/java/org/jfrog/bamboo/util/generic/GenericData.java
@@ -1,25 +1,19 @@
 package org.jfrog.bamboo.util.generic;
 
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.jfrog.build.extractor.ci.BuildInfo;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.jfrog.build.api.BuildBean.ROOT;
-
 /**
  * This class goal is to represent JSON structure that will be share between
  * the Generic Resolve and Generic Deploy tasks.
  *
  * @author Lior Hasson
  */
 
-@XStreamAlias(ROOT)
 public class GenericData implements Serializable {
-
-    @XStreamAlias("build")
     private List<BuildInfo> builds;
 
     public List<BuildInfo> getBuilds() {

diff --git a/src/main/resources/Third-Parties-Usage.html b/src/main/resources/Third-Parties-Usage.html
@@ -33,12 +33,6 @@
             <td width="33%"><b>Third party URL</b></td>
             <td width="33%"><b>Licensed under</b></td>
         </tr>
-        <tr>
-            <td>XStream Core</td>
-            <td><p><a href=http://xstream.codehaus.org>http://xstream.codehaus.org</a></p></td>
-            <td>BSD License <p><a href=http://www.opensource.org/licenses/bsd-license.php>http://www.opensource.org/licenses/bsd-license.php</a>
-            </p></td>
-        </tr>
         <tr>
             <td>Commons Codec</td>
             <td><p><a href=http://commons.apache.org/codec/>http://commons.apache.org/codec/</a></p></td>