Community
Participate
Working Groups
gist with script is here: https://gist.github.com/robstryker/413a256fd46993fc8da0768c830bc82a After running the script, the following mvn command succeeds: mvn clean install -Pbuild-individual-bundles -DskipTests More work will need to be done to move features around later.
The above gist is outdated. New one to come soon, or, link to new github branch from which we can see the proposed changes.
Latest gist to merge the repos: https://gist.github.com/nickboldt/1319b4a6cd2ae5803d41b5f640e0596e Latest repo, containing the 3 merged repos (javaee, javaee.tests, ejb) and several additional fixes required to make the CI build happy: https://github.com/nickboldt/webtools.javaee/tree/520040 The various steps to do after the merge are: # move org.eclipse.jst.enterprise_tests.feature to integration profile # https://github.com/nickboldt/webtools.javaee/commit/28d48a306f0cc62eb4d3ee9c6bdd480de548ab94 # move performance and generation tests to new performance profile so they're not run by default, until we can fix them # https://github.com/nickboldt/webtools.javaee/commit/b68c69661e77c514f6b82bc295b5beaf522d48de # Bug 519793 - remove org.eclipse.wst.web, org.eclipse.wst.web.ui and org.eclipse.wst.web.ui.infopop from webtools.javaee as they've moved upstream to webtools.sourceediting # https://github.com/nickboldt/webtools.javaee/commit/5f805c49812231ea154d0f83b9053913aced7a11 # Bug 520040 - add update site generation # https://github.com/nickboldt/webtools.javaee/commit/f8380e7edd956f2d4b20766db893bd89fc37cd3a # add upstream deps to common, servertools, sse, jsdt; inherit webtools_common_site from parent pom # https://github.com/nickboldt/webtools.javaee/commit/0678fd4e348dd724e6d8b8bfcc3e88bdb36160b5 # remove jem and jem.tests features as they're empty (archived) # https://github.com/nickboldt/webtools.javaee/commit/17b3fd13778dc91bd5b868a8ba045b323ea797a6 # comment out 9 features which we have to move down to jsf, webservices, or releng # https://github.com/nickboldt/webtools.javaee/commit/7f44e6c0fcd303ed4b1252fee33a541fdf98e104
With the above gist run, and the patches applied, you can now build javaee+tests+ejb in one operation: mvn clean install -Pintegration I've also set up a jenkins job* in case that's an easier way to review the content of the resulting update site (ie., some features have been removed) and see which tests are run / skipped. https://hudson.eclipse.org/webtools/view/webtools_R3_10/job/webtools-jeetools_R3_10_fork/ * - The job will run when a free slave appears. Sadly, our HIPP can only run two parallel builds at a time and is currently otherwise engaged.
Job ran green. Here's the update site: https://hudson.eclipse.org/webtools/view/webtools_R3_10/job/webtools-jeetools_R3_10_fork/lastSuccessfulBuild/artifact/site/target/repository/
More commits to apply against the merged repo (added to the gist script too, but posted here for completeness: # Bug 527825: Allow for Servlet 3.1 listeners to be added to EE8 projects # https://github.com/nickboldt/webtools.javaee/commit/d0b17d5ed805d8ddce321fe7807bce4dc97c549f git cherry-pick d0b17d5ed805d8ddce321fe7807bce4dc97c549f # since features have been commmented out, add the plugins into the update site so downstream can consume them (eg., Dali) # https://github.com/nickboldt/webtools.javaee/commit/bf2a65bbeeb3518c7fb2bfe7ee669a69fe8f6d7a git cherry-pick bf2a65bbeeb3518c7fb2bfe7ee669a69fe8f6d7a
I'm going to assume Wayne (EMO) is happy with this merge as it follows the same logic / process as we used for #520044 when merging sourceediting repos. (In reply to Rob Stryker from https://bugs.eclipse.org/bugs/show_bug.cgi?id=520044#c22 ) > Yes, authors and dates are preserved. > > Very similar scripts have now been run against servertools (to merge 3 > repos, last week) and webtools-common (to merge several repos, 5 months > ago). > > The scripts all preserve author, history, time of commit, etc. Then Wayne said ( https://bugs.eclipse.org/bugs/show_bug.cgi?id=520044#c23 ) +1 Have at it. Wayne, if you disagree or have concerns, please post them here. --- I'll also assume webmaster is OK with this change too, again since this is a similar change to that in https://bugs.eclipse.org/bugs/show_bug.cgi?id=520044#c20
+1 for this merge.
I've merged Nick's changes to master.
This was resolved. However, a new bug has been opened regarding what to do with the enterprise and web features. https://bugs.eclipse.org/bugs/show_bug.cgi?id=528792 I've put it in ws for now, as a suggested heirarchy of WTP would put webservices near the top of the stack for the entire product, and would make a great place to hold these features. However, it's possible more should be done here. We need to investigate to what extent people depend on these features and whether a new set of features may make more sense.
