Le dimanche 7 avril 2013 22:29:29 Jason van Zyl a écrit : > On Apr 7, 2013, at 7:32 PM, Hervé BOUTEMY <[email protected]> wrote: > > while working on site publication, I found that all my work on > > maven-aether- provider unit tests had simply been pruned when merging > > Aether. I will need to re-do the work, step by step :( > > I don't think you need to redo anything. If you can find the commits I can > work them back in. I'd like to figure out how they got pruned. yes, I know that using a SCM means that I won't completely "re-do" it from scratch but dig into history to find relevant commits then re-apply them.
I already had a look, but these are non-trivial merges because it all starts with MavenRepositorySystemSession (in maven-aether-provider) class being removed in favor of MavenRepositorySystemUtils in commit 82b345e0094813b34fcac85e64dde2d5e02b4cc9. Since it was the basis for unit tests started with commit 5f92449d5d628f3c40f8a4082bcedc369e96bd2d, I fully understand that there is a strong conflict, even if I can't find where my classes were removed (if file modification is easy to track, file removal isn't, or I don't know how to do). I just tried to cherry pick a commit, but it causes too much conflicts: I'll better manually get the latest state before delete and work on reimport. Regards, Hervé > > From my perspective, maven-reporting-exec is ready to release: I'll do it > > tomorrow if nobody objects. > > > > I'd like some review on DOXIA-484 before releasing Doxia 1.4 > > > > And I still didn't have a look at dependency:tree... > > > > > > Regards, > > > > Hervé > > > > Le lundi 1 avril 2013 08:12:09 Jason van Zyl a écrit : > >> Here are the release bits for 3.1.0-alpha-1: > >> > >> Release notes: > >> https://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=10500&version > >> =18 967 > >> > >> Staging repository: > >> https://repository.apache.org/content/repositories/maven-042/ > >> > >> Staged distribution: > >> https://repository.apache.org/content/repositories/maven-042/org/apache/m > >> ave n/apache-maven/3.1.0-alpha-1/ > >> > >> Anyone trying this in advance should know that the Site, Dependency, and > >> Shade plugin are not going to work. We are aware of this and those > >> responsible for those plugins are looking into it. > >> > >> Thanks, > >> > >> Jason > >> > >> ---------------------------------------------------------- > >> Jason van Zyl > >> Founder & CTO, Sonatype > >> Founder, Apache Maven > >> http://twitter.com/jvanzyl > >> --------------------------------------------------------- > >> > >> We know what we are, but know not what we may be. > >> > >> -- Shakespeare > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: [email protected] > > For additional commands, e-mail: [email protected] > > Thanks, > > Jason > > ---------------------------------------------------------- > Jason van Zyl > Founder & CTO, Sonatype > Founder, Apache Maven > http://twitter.com/jvanzyl > --------------------------------------------------------- > > A party which is not afraid of letting culture, > business, and welfare go to ruin completely can > be omnipotent for a while. > > -- Jakob Burckhardt --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
