From 6cd8742449180410f1d29d1d98ad08905c41f4df Mon Sep 17 00:00:00 2001
From: BJ Hargrave <bj@hargrave.dev>
Date: Fri, 23 Sep 2022 14:01:02 -0400
Subject: [PATCH] resource: Add addResource method to ResourceBuilder

Signed-off-by: BJ Hargrave <bj@hargrave.dev>
---
 .../aQute/bnd/osgi/resource/ResourceBuilder.java  | 15 +++++++++++++--
 .../src/aQute/bnd/osgi/resource/package-info.java |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/resource/ResourceBuilder.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/resource/ResourceBuilder.java
index 412b119f94a..558c3753ab4 100644
--- a/biz.aQute.bndlib/src/aQute/bnd/osgi/resource/ResourceBuilder.java
+++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/resource/ResourceBuilder.java
@@ -73,13 +73,19 @@ public class ResourceBuilder {
 
 	private boolean								built			= false;
 
+	public ResourceBuilder() {}
+
 	public ResourceBuilder(Resource source) {
+		this();
+		addResource(source);
+	}
+
+	public ResourceBuilder addResource(Resource source) {
 		addCapabilities(source.getCapabilities(null));
 		addRequirements(source.getRequirements(null));
+		return this;
 	}
 
-	public ResourceBuilder() {}
-
 	public ResourceBuilder addCapability(Capability capability) {
 		CapReqBuilder builder = CapReqBuilder.clone(capability);
 		return addCapability(builder);
@@ -833,6 +839,11 @@ public Resource build() {
 			return null;
 		}
 
+		@Override
+		public ResourceBuilder addResource(Resource source) {
+			return ResourceBuilder.this.addResource(source);
+		}
+
 		@Override
 		public ResourceBuilder addCapability(Capability capability) {
 			return ResourceBuilder.this.addCapability(capability);
diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/resource/package-info.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/resource/package-info.java
index 3a825f3eda9..b12cd2b4137 100644
--- a/biz.aQute.bndlib/src/aQute/bnd/osgi/resource/package-info.java
+++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/resource/package-info.java
@@ -1,4 +1,4 @@
-@Version("4.2.0")
+@Version("4.3.0")
 package aQute.bnd.osgi.resource;
 
 import org.osgi.annotation.versioning.Version;