From 5ab8700c1c0ae31e08b1f9bb08721a87d8b8bb78 Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Thu, 24 May 2018 23:16:16 +0200 Subject: [PATCH] [JENKINS-51183] - Support Directory references in BOM --- .../lib/model/bom/ComponentReference.java | 8 ++++++++ .../tools/warpackager/lib/model/bom/Reference.java | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/custom-war-packager-lib/src/main/java/io/jenkins/tools/warpackager/lib/model/bom/ComponentReference.java b/custom-war-packager-lib/src/main/java/io/jenkins/tools/warpackager/lib/model/bom/ComponentReference.java index 51d2a8a..832f052 100644 --- a/custom-war-packager-lib/src/main/java/io/jenkins/tools/warpackager/lib/model/bom/ComponentReference.java +++ b/custom-war-packager-lib/src/main/java/io/jenkins/tools/warpackager/lib/model/bom/ComponentReference.java @@ -54,6 +54,10 @@ public DependencyInfo toWARDependencyInfo() { dep.source.git = "https://github.com/jenkinsci/" + dep.artifactId + "-plugin.git"; dep.source.branch = ref; // It may be actually commit as well, but the CWP's logic will work } + + if (dir != null) { + dep.source.dir = dir; + } return dep; } @@ -70,6 +74,10 @@ public DependencyInfo toDependencyInfo() { dep.source.git = "https://github.com/jenkinsci/" + dep.artifactId + "-plugin.git"; dep.source.branch = ref; // It may be actually commit as well, but the CWP's logic will work } + + if (dir != null) { + dep.source.dir = dir; + } return dep; } } diff --git a/custom-war-packager-lib/src/main/java/io/jenkins/tools/warpackager/lib/model/bom/Reference.java b/custom-war-packager-lib/src/main/java/io/jenkins/tools/warpackager/lib/model/bom/Reference.java index b68a2af..ea2fa57 100644 --- a/custom-war-packager-lib/src/main/java/io/jenkins/tools/warpackager/lib/model/bom/Reference.java +++ b/custom-war-packager-lib/src/main/java/io/jenkins/tools/warpackager/lib/model/bom/Reference.java @@ -14,6 +14,9 @@ public class Reference { @CheckForNull String version; + @CheckForNull + String dir; + public void setVersion(@CheckForNull String version) { this.version = version; } @@ -22,6 +25,10 @@ public void setRef(@CheckForNull String ref) { this.ref = ref; } + public void setDir(@CheckForNull String dir) { + this.dir = dir; + } + @CheckForNull public String getRef() { return ref; @@ -31,4 +38,9 @@ public String getRef() { public String getVersion() { return version; } + + @CheckForNull + public String getDir() { + return dir; + } }