Merge lp://staging/~verterok/bzr-eclipse/builds-with-tycho into lp://staging/~verterok/bzr-eclipse/trunk
Proposed by
Guillermo Gonzalez
| Status: | Merged |
|---|---|
| Merged at revision: | 223 |
| Proposed branch: | lp://staging/~verterok/bzr-eclipse/builds-with-tycho |
| Merge into: | lp://staging/~verterok/bzr-eclipse/trunk |
| Diff against target: |
796 lines (+395/-96) 25 files modified
.bzrignore (+10/-0) HowToCompileAndRun.txt (+4/-4) INSTALL (+1/-1) org.apache.commons.logging/pom.xml (+3/-2) org.kxml2/pom.xml (+3/-2) org.vcs.bazaar.eclipse.client/pom.xml (+17/-7) org.vcs.bazaar.eclipse.core.tests/pom.xml (+49/-28) org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/AbstractCoreTestCase.java (+1/-0) org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/TestCaseWithProject.java (+8/-3) org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/WorkspaceUtil.java (+7/-2) org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/core/BundledPluginsTest.java (+2/-1) org.vcs.bazaar.eclipse.core/.settings/org.eclipse.mylar.tasklist.prefs (+0/-4) org.vcs.bazaar.eclipse.core/pom.xml (+14/-0) org.vcs.bazaar.eclipse.feature/.project (+23/-17) org.vcs.bazaar.eclipse.feature/pom.xml (+14/-0) org.vcs.bazaar.eclipse.site/.project (+23/-0) org.vcs.bazaar.eclipse.site/pom.xml (+14/-0) org.vcs.bazaar.eclipse.site/site.xml (+17/-0) org.vcs.bazaar.eclipse.tests-feature/.project (+6/-0) org.vcs.bazaar.eclipse.tests-feature/feature.xml (+1/-1) org.vcs.bazaar.eclipse.tests-feature/pom.xml (+14/-0) org.vcs.bazaar.eclipse.ui/.settings/org.eclipse.mylar.tasklist.prefs (+0/-4) org.vcs.bazaar.eclipse.ui/pom.xml (+14/-0) pom.xml (+146/-17) redstone.xmlrpc/pom.xml (+4/-3) |
| To merge this branch: | bzr merge lp://staging/~verterok/bzr-eclipse/builds-with-tycho |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| xaav | Pending | ||
|
Review via email:
|
|||
Description of the change
This branch adds a "site" project and changes all the pom.xml and fix some issues with the tests in order to make use of tycho to run tests and build the update-site.
To post a comment you must log in.
Revision history for this message
| Guillermo Gonzalez (verterok) wrote | # |
Revision history for this message
| Guillermo Gonzalez (verterok) wrote | # |
Revision history for this message
| xaav (xaav) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hi Geoff,
I requested a review for this, as it changes the dependencies :)
(Let me know if you can't review it)
In order to test it you need to get maven 3.0.x, and run: mvn-3 clean compile integration-test
That should build it and run the unittests in org.vcs.
Cheers,