Merge pull request #5263 from bjhargrave/decoration-phase2

Decoration phase2

Author: bjhargrave

Diff for: biz.aQute.bndlib/src/aQute/bnd/build/Project.java

@@ -619,8 +619,7 @@ public List<Container> getBundles(Strategy strategyx, String spec, String source
 		Parameters bundles = parseHeader(spec);
 		if (source != null) {
 			Instructions decorator = new Instructions(mergeProperties(source + "+"));
-			// TODO change the decorated call to remove the second arg.
-			decorator.decorate(bundles, true);
+			decorator.decorate(bundles);
 			decorator = new Instructions(mergeProperties(source + "++"));
 			decorator.decorate(bundles, true);
 		}

Diff for: biz.aQute.bndlib/src/aQute/bnd/osgi/Builder.java

@@ -402,8 +402,7 @@ public boolean hasSources() {
 	@Override
 	protected Jar getExtra() throws Exception {
 		Parameters conditionals = getMergedParameters(CONDITIONAL_PACKAGE);
-		// TODO change the decorated call to remove the second arg.
-		conditionals.putAll(decorated(CONDITIONALPACKAGE, true));
+		conditionals.putAll(decorated(CONDITIONALPACKAGE));
 		if (conditionals.isEmpty())
 			return null;
 		logger.debug("do Conditional Package {}", conditionals);
@@ -629,11 +628,9 @@ private void doExpand(Jar dot) throws Exception {
 		}
 
 		Parameters private_package = getParameters(PRIVATE_PACKAGE);
-		// TODO change the decorated call to remove the second arg.
-		Parameters privatepackage = decorated(PRIVATEPACKAGE, true);
+		Parameters privatepackage = decorated(PRIVATEPACKAGE);
 		Parameters testpackage = new Parameters();
-		// TODO change the decorated call to remove the second arg.
-		Parameters includepackage = decorated(INCLUDEPACKAGE, true);
+		Parameters includepackage = decorated(INCLUDEPACKAGE);
 
 		if (buildInstrs.undertest()) {
 			String h = mergeProperties(Constants.TESTPACKAGES, "test;presence:=optional");
@@ -905,8 +902,7 @@ private Instruction matches(Instructions instructions, String pack, Set<Instruct
 	private void doIncludeResources(Jar jar) throws Exception {
 		Parameters includes = parseHeader(getProperty("Bundle-Includes"));
 		if (includes.isEmpty()) {
-			// TODO change the decorated call to remove the second arg.
-			includes = decorated(Constants.INCLUDERESOURCE, true);
+			includes = decorated(Constants.INCLUDERESOURCE);
 			includes.putAll(getMergedParameters(Constants.INCLUDE_RESOURCE));
 		} else {
 			warning("Please use -includeresource instead of Bundle-Includes");

Diff for: cnf/build.bnd

@@ -38,7 +38,7 @@ Bundle-Version:         ${base.version}.${tstamp}-SNAPSHOT
     "org.osgi.namespace.*";~version=latest;~maven-scope=provided,\
     "org.osgi.service.*.annotations";~version=latest;~maven-scope=provided
 
--conditionalpackage+: \
+-conditionalpackage++: \
     =!aQute.lib.exceptions.*
 
 -testpath+: \