I have to admit some of the changes that got merged back into the trunk look a bit odd:
e.g. links to the current web site being replaced with the old one - location="http://xalan.apache.org/dist/LICENSE.txt"/> + location="http://xml.apache.org/dist/LICENSE.txt"/> e.g. absolute paths to someone's Windows machine in the .classpath - <classpathentry kind="lib" path="lib/xml-apis.jar"/> - <classpathentry kind="lib" path="lib/xercesImpl.jar"/> + <classpathentry kind="lib" path="C:/vcs/svn/apache/xalan-j/branches/xalan-j_2_7_1_maint/java/lib/endorsed/xml-apis.jar"/> + <classpathentry kind="lib" path="C:/vcs/svn/apache/xalan-j/branches/xalan-j_2_7_1_maint/java/lib/endorsed/xercesImpl.jar"/> e.g. the trunk's project name changed to the branch - <name>xalan-java-trunk</name> + <name>apache-xalan-j-2.7.1-maint-main</name> Not sure that we can just apply a diff from the branch to the trunk without a bit of manual surgery to retain more current stuff that was already on the trunk. Thanks. Michael Glavassevich XML Technologies and WAS Development IBM Toronto Lab E-mail: [email protected] E-mail: [email protected] Gary Gregory <[email protected]> wrote on 04/17/2014 08:03:51 AM: > From: Gary Gregory <[email protected]> > To: "[email protected]" <[email protected]>, > Cc: Gareth Reakes <[email protected]> > Date: 04/17/2014 08:06 AM > Subject: Re: [Xalan-J] 2.7.2 Developer Note > > Yes, in principle, the branches changes should be merged back to > trunk . The problem I see is that the state of trunk is not known > (yet). For example, building it has different Java version > requirements and I cannot tell if this is intentional or not. > Gary > > On Tue, Apr 15, 2014 at 7:48 PM, <[email protected]> wrote: > FYI: > > The [Xalan-J] 2.7.2 seems to be implemented in "branches" and the > changes not yet merged or committed back into the "trunk". > > I just finished reviewing the differences and believe that a > merge back into the "trunk" is appropriate. > > I am starting my review of the website documentation. > > My sincere thanks goes to all those committers and members > for their work on the Java security issue. > > Sincerely, > Steven J. Hathaway > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > > > > -- > E-Mail: [email protected] | [email protected] > Java Persistence with Hibernate, Second Edition > JUnit in Action, Second Edition > Spring Batch in Action > Blog: http://garygregory.wordpress.com > Home: http://garygregory.com/ > Tweet! http://twitter.com/GaryGregory --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
