git - Maintaining patches of third-party Java library dependencies -

-

my java project has dependency on third-party library, let's call xyz.jar. project maintained in git , xyz in svn. xyz included in project maven dependency gets downloaded automatically part of build process.

i need make minor tweaks source of xyz, still want updates project maintainers. options have?

currently, best option seems to this:

  1. fork svn repo xyz new git repo using git svn clone.
  2. hack on git repo.
  3. build xyz-hacked.jar git repo , export artifact maven library server.

when new changes come out xyz, can git svn rebase keep git repo date.

what best practices here? can improve on approach?

edit

i know there some manual work involved, e.g. resolving merge conflicts , ensuring patches compatible latest xyz. i'm not looking general, automated code merge solution. i'm trying find out best practices , tools in situation.

gradle

i don't think gradle-specific question, in case there's gradle-specific answer: i'm using gradle include xyz.jar 'compile' dependency.

no matter approach use, labor-intensive.

explicit conflicts occur, more insidious, change anywhere in base can totally break local mods, change in source file local mods don't touch (i.e. interface signature depend on).

each , every rebase require manual merging , complete regression testing on 3rd party library , applciations depend on library.

by definition, not automatable.


Comments

Post a Comment

Popular posts from this blog

html5 - What is breaking my page when printing? -

-
Image
i have questioner , don't know why when printing it's creating break before first question. live demo (link) i able resolve issue removing fieldset container had wrapped in.. having fieldset element causing of fields grouped together, , since not fit on first page, being pushed second page. removing fieldset element, able firefox print first 2 questions on page 1 identically chrome. it seems not new problem firefox , fieldset not playing nice found old bugzilla ticket 2008 has persisted , still being commented on in 2014 (link) if retaining fieldset important, found solution else came here (link) <script type='text/javascript'> $(window).bind('beforeprint', function(){ $('fieldset').each( function(item) { $(this).replacewith($('<div class="fieldset">' + this.innerhtml + '</div>')); } ) }); $(window).bind(
Read more

c# - must be a non-abstract type with a public parameterless constructor in redis -

-
when save object, got below error must non-abstract type public parameterless constructor in order use parameter 't' in generic type or method 'servicestack.redis.redisclient.store<t>(t) redisclass.getinstnace().store(msg); // error here redisclass.getinstnace().save(); as third party's class, can not edit how save object? could create wrapper around third party object call constructor, store wrapper? e.g. public class mywrapper { public thirdpartyobject thirdpartyinstance { get; set; } public mywrapper() { thirdpartyinstance = new thirdpartyobject("constructors"); } }
Read more

ajax - PHP/JSON Login script (Twitter style) not setting sessions -

-
i'm having trouble getting twitter style login work properly, reason gets stuck at session_register("useremail"); session_register("userpass"); and doesn't redirect after it. if enter wrong account data, works , appropriate error message pops up. this full code: <?php if(empty($_post['email']) || empty($_post['password'])) { die(msg(0,"all fields required")); } if(!(preg_match("/^[\.a-z0-9_\-\+]+[@][a-z0-9_\-]+([.][a-z0-9_\-]+)+[a-z]{1,4}$/", $_post['email']))) die(msg(0,"you haven't provided valid e-mail")); $host="localhost"; $username="root"; $password="x"; $db_name="x"; $tbl_name="x"; mysql_connect("$host", "$username", "$password")or die("cannot connect"); mysql_select_db("$db_name")or die("cannot select db"); $useremail=$_post['email']; $userpass=
Read more