[rules-dev] osgi pull request conflicts

[Charles Moulliard]

Some notes on this approach and the current state:

   - *All common felix properties have been extracted to the
   droolsjbpm-parent pom.* Individual modules should not define any of
   these specifically.
      - If you want to add/remove/change any of those, change them in the
      parent pom only:
         -
         https://github.com/droolsjbpm/droolsjbpm-build-bootstrap/blob/master/pom.xml
         - These are currently in the parent pom:
         - <extensions>true</extensions>
         - <excludeDependencies>true</excludeDependencies>
         - <
         _removeheaders
         _removeheaders>Ignore-Package</_removeheaders>
            - What does this mean? Christiano wants to remove this.
            - @charles are you ok with removing this?
            -
      - >> <_removeheaders> allow to clean OSGI Metadata generated in the
      MANIFEST file. This option will remove here Ignore-Package. If such info
      does not appear in the MANIFEST generated, I'm fine to remove it
      -
      - <_nouses>true</_nouses>
            - What does this mean? Christiano wants this.
            - >> No diea
      -
      - <_snapshot>${osgi-version-qualifier}</_snapshot>
            - Christiano: "To make eclipse happy"
            -
         <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${osgi.version.qualifier}</Bundle-Version>
            - Christiano: "To make eclipse happy"
         - There are not added (because less code is better maintainable):
      - <DynamicImport-Package>*</> has been removed everywhere, as per
         Christiano's change
            - @charles @christiano If you need it anyway, edit the
            droolsjbpm-parent pom and supply a pull request
            -
            - >> If no classes are created dynamically, then we don't need
      it. But it we required that we add it. To be investigated later on.
      -
      - <Bundle-ActivationPolicy>lazy</> has not been added anywhere, as
      Charles didn't seem to need it
      - @christiano @charles If you need it anyway, edit the
         droolsjbpm-parent pom and supply a pull request
      - >> I was not aware of that option and we don't use it for karaf,
      camel, servicemix, cxf or activemq
   -
   - Generally, christiano's imports/export statements survived. (I found
   they to contain little or no dead imports/exports.)
      - Some of Charles imports/export statement changes were added too.
      - The original state of the imports/exports was mostly ignored as
      they were totally out-of-date.
   - >> Will make a new test to verify
   - 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.
   - Some modules currently have singleton=true, others don't. This seems
      to be the way you guys wanted: it's differs per module
         - Pull Request to add/remove singleton as needed welcome
      - >> We don't need this option singleton:=true
      -
      - Empty<Private-Package> have been removed everywhere
   - <Require-Bundle> has been removed everywhere.
      - This makes our build and release procedure far less complex (no
      more separate osgi.version property).
         - Don't add it back pls: I strongly prefer it stays dead.
         - >> This is a good practice to avoid to use Require-Bundle



On Tue, Mar 26, 2013 at 12:54 PM, Geoffrey De Smet
<ge0ffrey.spam at gmail.com>wrote:

>  Christiano, Charles,
>
> Your pull requests conflicted massively with each other :(
>
> I 've done my best to apply the best of both worlds.
> Due to the conflict, changes might be lost. Sorry if that has happened.
> Contradicting conflicts have been written below.
>
> Some notes on this approach and the current state:
>
>    - *All common felix properties have been extracted to the
>    droolsjbpm-parent pom.* Individual modules should not define any of
>    these specifically.
>       - If you want to add/remove/change any of those, change them in the
>       parent pom only:
>          -
>          https://github.com/droolsjbpm/droolsjbpm-build-bootstrap/blob/master/pom.xml
>           - These are currently in the parent pom:
>          - <extensions>true</extensions>
>          - <excludeDependencies>true</excludeDependencies>
>           - <_removeheaders>Ignore-Package</_removeheaders>
>             - What does this mean? Christiano wants to remove this.
>             - @charles are you ok with removing this?
>              - <_nouses>true</_nouses>
>             - What does this mean? Christiano wants this.
>              - <_snapshot>${osgi-version-qualifier}</_snapshot>
>             - Christiano: "To make eclipse happy"
>              -
>          <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${osgi.version.qualifier}</Bundle-Version>
>             - Christiano: "To make eclipse happy"
>            - There are not added (because less code is better
>       maintainable):
>        - <DynamicImport-Package>*</> has been removed everywhere, as per
>          Christiano's change
>             - @charles @christiano If you need it anyway, edit the
>             droolsjbpm-parent pom and supply a pull request
>                - <Bundle-ActivationPolicy>lazy</> has not been added
>          anywhere, as Charles didn't seem to need it
>           - @christiano @charles If you need it anyway, edit the
>             droolsjbpm-parent pom and supply a pull request
>           - Generally, christiano's imports/export statements survived.
>    (I found they to contain little or no dead imports/exports.)
>       - Some of Charles imports/export statement changes were added too.
>       - The original state of the imports/exports was mostly ignored as
>       they were totally out-of-date.
>    - 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.
>     - Some modules currently have singleton=true, others don't. This
>       seems to be the way you guys wanted: it's differs per module
>          - Pull Request to add/remove singleton as needed welcome
>        - Empty<Private-Package> have been removed everywhere
>    - <Require-Bundle> has been removed everywhere.
>       - This makes our build and release procedure far less complex (no
>       more separate osgi.version property).
>          - Don't add it back pls: I strongly prefer it stays dead.
>
> I've now spend a lot of time on drools OSGi, and I really need to focus on
> optaplanner issues.
> Edson has agreed to look into future osgi related pull requests for drools.
>
>
> _______________________________________________
> rules-dev mailing list
> rules-dev at lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/rules-dev
>



-- 
Charles Moulliard
Apache Committer / Sr. Enterprise Architect (RedHat)
Twitter : @cmoulliard | Blog : http://cmoulliard.blogspot.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.jboss.org/pipermail/rules-dev/attachments/20130326/2dba33f4/attachment-0001.html