<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
</head>
<body bgcolor="#FFFFFF" text="#000000">
Christiano, Charles,<br>
<br>
Your pull requests conflicted massively with each other :(<br>
<br>
I 've done my best to apply the best of both worlds.<br>
Due to the conflict, changes might be lost. Sorry if that has
happened.<br>
Contradicting conflicts have been written below.<br>
<br>
Some notes on this approach and the current state:<br>
<ul>
<li><b>All common felix properties have been extracted to the
droolsjbpm-parent pom.</b> Individual modules should not
define any of these specifically.</li>
<ul>
<li>If you want to add/remove/change any of those, change them
in the parent pom only:</li>
<ul>
<li><a class="moz-txt-link-freetext" href="https://github.com/droolsjbpm/droolsjbpm-build-bootstrap/blob/master/pom.xml">https://github.com/droolsjbpm/droolsjbpm-build-bootstrap/blob/master/pom.xml</a><br>
</li>
</ul>
<li>These are currently in the parent pom:</li>
<ul>
<li><extensions>true</extensions></li>
<li><excludeDependencies>true</excludeDependencies><br>
</li>
<li><_removeheaders>Ignore-Package</_removeheaders></li>
<ul>
<li>What does this mean? Christiano wants to remove this.</li>
<li>@charles are you ok with removing this?<br>
</li>
</ul>
<li><_nouses>true</_nouses></li>
<ul>
<li>What does this mean? Christiano wants this.<br>
</li>
</ul>
<li><_snapshot>${osgi-version-qualifier}</_snapshot></li>
<ul>
<li>Christiano: "To make eclipse happy"<br>
</li>
</ul>
<li><Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${osgi.version.qualifier}</Bundle-Version></li>
<ul>
<li>Christiano: "To make eclipse happy"</li>
</ul>
</ul>
</ul>
<ul>
<li>There are not added (because less code is better
maintainable):<br>
</li>
<ul>
<li><DynamicImport-Package>*</> has been removed
everywhere, as per Christiano's change</li>
<ul>
<li>@charles @christiano If you need it anyway, edit the
droolsjbpm-parent pom and supply a pull request<br>
</li>
</ul>
</ul>
</ul>
<ul>
<ul>
<li><Bundle-ActivationPolicy>lazy</> has not been
added anywhere, as Charles didn't seem to need it<br>
</li>
<ul>
<li>@christiano @charles If you need it anyway, edit the
droolsjbpm-parent pom and supply a pull request</li>
</ul>
</ul>
</ul>
<li>Generally, christiano's imports/export statements survived. (I
found they to contain little or no dead imports/exports.)</li>
<ul>
<li>Some of Charles imports/export statement changes were added
too.</li>
<li>The original state of the imports/exports was mostly ignored
as they were totally out-of-date.</li>
</ul>
<li>The singleton discussion is lost to me. As Charles is
supplying the unit test in droolsjbpm, I believe he should make
the call which modules should be singleton and which should not,
taking Christiano's advice into consideration of course.<br>
</li>
<ul>
<li>Some modules currently have singleton=true, others don't.
This seems to be the way you guys wanted: it's differs per
module</li>
<ul>
<li>Pull Request to add/remove singleton as needed welcome</li>
</ul>
</ul>
<li>Empty<Private-Package> have been removed everywhere</li>
<li><Require-Bundle> has been removed everywhere.</li>
<ul>
<li>This makes our build and release procedure far less complex
(no more separate osgi.version property).</li>
<ul>
<li>Don't add it back pls: I strongly prefer it stays dead.<br>
</li>
</ul>
</ul>
</ul>
<p>I've now spend a lot of time on drools OSGi, and I really need to
focus on optaplanner issues.<br>
Edson has agreed to look into future osgi related pull requests
for drools.<br>
</p>
<br>
</body>
</html>