[JENKINS-51183] - Support Directory references in BOM

jenkinsci · May 24, 2018 · 5ab8700 · 5ab8700
1 parent 66768f5
commit 5ab8700
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/...ager-lib/src/main/java/io/jenkins/tools/warpackager/lib/model/bom/ComponentReference.java b/...ager-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/...-war-packager-lib/src/main/java/io/jenkins/tools/warpackager/lib/model/bom/Reference.java b/...-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;
+    }
 }