GitHub user ahgittin opened a pull request:

    https://github.com/apache/incubator-brooklyn/pull/859

    Put OSGi test deps back

    This updates all the OSGi and JAR tests which were moved and disabled in 
#810.  They are in the original places for want of anything better as discussed 
there.  @rdowner this should save you any more build-fix-version-mismatch woes 
(though now likely you've solved them)!
    
    Tests not yet passing, for early review only

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/ahgittin/incubator-brooklyn 
osgi-test-deps-back

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/incubator-brooklyn/pull/859.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #859
    
----
commit 97e4ab9dfc856412a2f2ea82aceea68ad5b7d4de
Author: Alex Heneveld <[email protected]>
Date:   2015-08-20T12:42:33Z

    Revert "Align groupId with that of the test bundles"
    
    This reverts commit b23543fab5a79e12a8155dd5669a8c8d9fa8cb4e.

commit af63680c68897280578cc3fb85c4ee7055b588da
Author: Alex Heneveld <[email protected]>
Date:   2015-08-20T12:42:45Z

    Revert "[BROOKLYN-161] Ignore tests until osgi test support is in place"
    
    This reverts commit 190f5141c3d3ee8df820273a8c51ae2f3813604f.

commit ddb4808c3b9531efaf03d260a645e373f99e98fc
Author: Alex Heneveld <[email protected]>
Date:   2015-08-20T12:43:05Z

    Revert "[BROOKLYN-161] Remove generated jars from source repo"
    
    This reverts commit 89324dbc1fb4acabd253a520974e5a1802757f0f.

commit 7ce6c492c52f2cb3a4200b79ec1bf4177f72bf5e
Author: Alex Heneveld <[email protected]>
Date:   2015-08-20T12:46:34Z

    restore the osgi bundles (original code -- will not yet compile)

commit d7f0de23b920cf23316ebfa0f931736b9224aa94
Author: Alex Heneveld <[email protected]>
Date:   2015-08-20T12:50:28Z

    update the osgi tests code for BROOKLYN-162 refactoring (replacing newly 
restored old files in original location with the updated files we made in the 
temporary location)

commit 51b560d9d04658b5d261ed45a99c72683b68b808
Author: Alex Heneveld <[email protected]>
Date:   2015-08-20T12:52:58Z

    remove the temporary test-bundles location of osgi test jars, and remove 
from pom

commit 8fe885e5f8b3110934a1985ce3e66ba0af8cab64
Author: Alex Heneveld <[email protected]>
Date:   2015-08-20T12:59:13Z

    update osgi test entities pom file, and improve README

commit c42f5f8b219064a8d92aafe6f7084254fe6ecfcb
Author: Alex Heneveld <[email protected]>
Date:   2015-08-20T12:52:22Z

    restore test bundle osgi jar files, until a better mechanism for having 
them is determined

commit 56debeb16a15d0ae69f739802296ed4feef23369
Author: Alex Heneveld <[email protected]>
Date:   2015-08-20T13:31:25Z

    update the standalone brooklyn-AppInCatalog.jar to refer to new packages, 
and re-enable disabled test

commit 0814b644ac33b58b06e723f5606dd2a3aae18911
Author: Alex Heneveld <[email protected]>
Date:   2015-08-20T13:40:38Z

    update the osgi tests with new BROOKLYN-162 package prefix

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---

Reply via email to