Hi, Patches always against trunk. You need Java 8 for that. The person who backports to 5.x takes care of porting to Java 7.
Uwe Am 17. Oktober 2015 00:38:02 MESZ, schrieb Ryan Josal <[email protected]>: >Thanks a lot for the info Shawn. HowToContribute also had a ton of >good >info. A couple other questions: > >*) what version of Java is best to run the test suite with? >*) What branch is best to create a patch from so that it doesn't cause >conflict for who applies it? I guess if it's from the 5.3 branch >and I mark it as 5.3.0 in Jira that will help? >*) After I log a Jira and submit a patch, what next to make it get >noticed, >if anything? > >Ryan > >On Friday, October 16, 2015, Shawn Heisey <[email protected]> wrote: > >> Replying on dev, but with the text from solr-user, since I wrote most >of >> this before you sent to dev. >> >> General info: The canonical and official repository for Lucene/Solr >is >> in SVN. There are two public git mirrors. One at git.apache.org, >one >> is at github. >> >> On 10/16/2015 11:07 AM, Ryan Josal wrote: >> > *) how do I properly fork it outside of github to my own company's >git >> > system? >> >> I am not familiar with how to do this. I imagine that there are ways >to >> use the .git directory in a cloned repository to put a project into a >> local git server, or maybe use the github repo directly to populate >your >> own server. Once you figure out exactly what to do, here's where >> Lucene/Solr lives on github: >> >> https://github.com/apache/lucene-solr >> >> Here's Apache's git mirror: >> >> git://git.apache.org/lucene-solr.git >> >> You could simply maintain a fork on github in your own github >account, >> and do whatever is required there to keep it current with the apache >> github repo. >> >> https://help.github.com/articles/fork-a-repo/ >> >> > *) how do I pull new changes? I think I would expect to sync new >changes >> > when there is a new public release. What branches do I need to >work >> > with/on? >> >> If you want to closely track what's going into the next release, you >> want the stable branch, which is currently branch_5x. Eventually >> branch_5x will disappear and branch_6x will be created. There is a >> branch for each minor version, and a tag for each release. >> >> https://svn.apache.org/repos/asf/lucene/dev/branches/branch_5x/ >> https://svn.apache.org/repos/asf/lucene/dev/branches/ >> https://svn.apache.org/repos/asf/lucene/dev/tags/ >> >> Bleeding edge development happens in trunk. Most commits that happen >on >> trunk are merged to the stable branch, usually a short time after the >> trunk commit, but some changes are trunk-only. >> >> https://svn.apache.org/repos/asf/lucene/dev/trunk/ >> >> The git and github mirrors should have all branches and tags that >live >> in SVN. >> >> > *) how do I test my changes? What part of the test suites do I run >for >> > what changes? >> >> The build system has extensive testing capability built in. At the >top >> level of your local working copy, type "ant test-help" for some >> comprehensive info. Exactly what tests to run will depend on the >nature >> of the change you've made, and whether you've built any new tests >> specifically for your change. Running all of the tests (maybe after >> changing to the solr directory) is prudent in most situations. >> >> > *) how do I build a new version when I'm ready to go to prod? This >is >> > slightly more unclear to me now that it isn't just a war. >> >> Change to the solr directory and type "ant server" to get a runnable >> server, complete with start scripts, right in the local working copy. >> Type "ant package" to get .tgz and .zip files that are similar to >what >> you actually download from the Solr website. >> >> The following wiki page has some additional information: >> >> http://wiki.apache.org/solr/HowToContribute >> >> In response to your latest message on the solr-user thread: >> >> You don't need to fork Solr to maintain local patches. You can check >> out branch_5x (and maybe the minor version branch) from svn or git >and >> just do "svn up" or "git pull" to download the latest from upstream. >If >> there are any conflicts between your changes and upstream work, >you'll >> need to resolve those. >> >> Thanks, >> Shawn >> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: [email protected] ><javascript:;> >> For additional commands, e-mail: [email protected] ><javascript:;> >> >> -- Uwe Schindler H.-H.-Meier-Allee 63, 28213 Bremen http://www.thetaphi.de
