Allow buck-plugin to specify bundle-classpath to support deps embed
With current implementation of buck-plugin, we cannot specify
bundle-classpath and embedded-dependency separately.
Also due to incorrect order of property assignment for Analyzer,
some property values such as imported packages and exported packages
are unexpected initialized. With this patch, those issues will be
resolved.
Change-Id: I7994523f1d4baea55cb76d94bd177b1f9f5b557f
diff --git a/tools/build/buck-plugin/src/main/java/org/onosproject/onosjar/OnosJarDescription.java b/tools/build/buck-plugin/src/main/java/org/onosproject/onosjar/OnosJarDescription.java
index 76f5b40..3f27760 100644
--- a/tools/build/buck-plugin/src/main/java/org/onosproject/onosjar/OnosJarDescription.java
+++ b/tools/build/buck-plugin/src/main/java/org/onosproject/onosjar/OnosJarDescription.java
@@ -248,7 +248,7 @@
args.groupId, args.bundleName, args.bundleVersion,
args.bundleLicense, args.bundleDescription, args.importPackages,
args.exportPackages, includedResourcesString,
- args.dynamicimportPackages, args.privatePackages, args.embeddedDependencies),
+ args.dynamicimportPackages, args.privatePackages, args.embeddedDependencies, args.bundleClasspath),
args.resourcesRoot,
args.manifestFile,
args.mavenCoords,
@@ -330,5 +330,6 @@
public Optional<ImmutableSortedMap<String, SourcePath>> includeResources;
public Optional<String> dynamicimportPackages;
public Optional<String> embeddedDependencies;
+ public Optional<String> bundleClasspath;
}
}
\ No newline at end of file