You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@abdera.apache.org by James M Snell <ja...@gmail.com> on 2006/06/19 21:46:39 UTC
JDK 1.4.2 backport
Current Abdera depends on a number of Java5 features. However, I've
purposefully limited those dependencies to ones that are easy to
backport to 1.4.2. There is a definite demand for a 1.4.2
implementation. One of the key reasons I would like to keep the parser
and core branches as stable as possible is so that we can maintain a
1.4.2 branch that is periodically sync'd with the trunk. For each
milestone, we would make both the Java5 and 1.4.2 versions available.
By the end of this week, I should have the first 1.4.2 backport ready to
go. What would be the best way to maintain the backport in the svn?
- James
Re: JDK 1.4.2 backport
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On 6/19/06, James M Snell <ja...@gmail.com> wrote:
> Current Abdera depends on a number of Java5 features. However, I've
> purposefully limited those dependencies to ones that are easy to
> backport to 1.4.2. There is a definite demand for a 1.4.2
> implementation. One of the key reasons I would like to keep the parser
> and core branches as stable as possible is so that we can maintain a
> 1.4.2 branch that is periodically sync'd with the trunk. For each
> milestone, we would make both the Java5 and 1.4.2 versions available.
>
> By the end of this week, I should have the first 1.4.2 backport ready to
> go. What would be the best way to maintain the backport in the svn?
First, create a branch off of the trunk for the backport:
$ svn copy https://svn.apache.org/repos/asf/incubator/abdera/java/trunk
https://svn.apache.org/repos/asf/incubator/abdera/java/branches/jdk14-backport
Then, check out the backport branch, make your changes, and commit them there.
As changes are made on the trunk, merge them into the branch. For
example, if we created the branch in revision 10, and them committed
some changes on the trunk in revisions 12, 15, and 20, you could merge
them into the branch like this:
(From a branch working copy)
$ svn merge -r 10:20
https://svn.apache.org/repos/asf/incubator/abdera/java/trunk .
Then resolve any conflicts (edit the files to fix the conflict, then
run 'svn resolved' on the file in question) and check the changes in
to the trunk.
The next time, the changes up to r20 will have already been merged, so
you'd merge from 20:30 (or whatever the newest change on the trunk
was).
-garrett
Re: JDK 1.4.2 backport
Posted by James M Snell <ja...@gmail.com>.
I'm looking into this. Should have an answer either later today or
tomorrow.
- James
Garrett Rooney wrote:
> On 6/19/06, James M Snell <ja...@gmail.com> wrote:
>> Maintaining the backport as a separate branch is indeed a pain, however,
>> I very much prefer keeping the java5 features in the trunk as I believe
>> they provide a very real benefit. I'll volunteer now to be the one
>> responsible for maintaining the separate image.
>
> What about the suggestion of using Retrotranslater or something similar?
>
> -garrett
>
Re: JDK 1.4.2 backport
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On 6/19/06, James M Snell <ja...@gmail.com> wrote:
> Maintaining the backport as a separate branch is indeed a pain, however,
> I very much prefer keeping the java5 features in the trunk as I believe
> they provide a very real benefit. I'll volunteer now to be the one
> responsible for maintaining the separate image.
What about the suggestion of using Retrotranslater or something similar?
-garrett
Re: JDK 1.4.2 backport
Posted by James M Snell <ja...@gmail.com>.
Maintaining the backport as a separate branch is indeed a pain, however,
I very much prefer keeping the java5 features in the trunk as I believe
they provide a very real benefit. I'll volunteer now to be the one
responsible for maintaining the separate image.
- James
Paul Querna wrote:
> James M Snell wrote:
>> Current Abdera depends on a number of Java5 features. However, I've
>> purposefully limited those dependencies to ones that are easy to
>> backport to 1.4.2. There is a definite demand for a 1.4.2
>> implementation. One of the key reasons I would like to keep the parser
>> and core branches as stable as possible is so that we can maintain a
>> 1.4.2 branch that is periodically sync'd with the trunk. For each
>> milestone, we would make both the Java5 and 1.4.2 versions available.
>
> I personally think a separate branch is a bad idea. Keeping two
> branches that are otherwise identical is generally a pain in the ass.
>
> If there really is a need for 1.4.2 compat, is there any reason to not
> do that in trunk, since it would still work with 1.5?
>
> -Paul
>
>
>
>
>
>
>
>
>
>
>
>
Re: JDK 1.4.2 backport
Posted by Paul Querna <ch...@force-elite.com>.
James M Snell wrote:
> Current Abdera depends on a number of Java5 features. However, I've
> purposefully limited those dependencies to ones that are easy to
> backport to 1.4.2. There is a definite demand for a 1.4.2
> implementation. One of the key reasons I would like to keep the parser
> and core branches as stable as possible is so that we can maintain a
> 1.4.2 branch that is periodically sync'd with the trunk. For each
> milestone, we would make both the Java5 and 1.4.2 versions available.
I personally think a separate branch is a bad idea. Keeping two
branches that are otherwise identical is generally a pain in the ass.
If there really is a need for 1.4.2 compat, is there any reason to not
do that in trunk, since it would still work with 1.5?
-Paul
Re: JDK 1.4.2 backport
Posted by Martin Cooper <ma...@apache.org>.
On 6/19/06, James M Snell <ja...@gmail.com> wrote:
>
> Current Abdera depends on a number of Java5 features. However, I've
> purposefully limited those dependencies to ones that are easy to
> backport to 1.4.2. There is a definite demand for a 1.4.2
> implementation. One of the key reasons I would like to keep the parser
> and core branches as stable as possible is so that we can maintain a
> 1.4.2 branch that is periodically sync'd with the trunk. For each
> milestone, we would make both the Java5 and 1.4.2 versions available.
Have you considered using a tool like Retrotranslator or Retroweaver to
provide JDK 1.4 compatibility? That would be a lot simpler than having to
maintain a branch. Just FYI, we're expecting to use one of these (probably
the former) to make the Struts Action 2 framework available to JDK
1.4developers.
--
Martin Cooper
By the end of this week, I should have the first 1.4.2 backport ready to
> go. What would be the best way to maintain the backport in the svn?
>
> - James
>