Hello,
When we split master from the core-1.4.x branch we kept all of the
original and working in 1.4.x projects and then adjusted the
master/pom.xml to remove any projects that wouldn't compile with 1.5.
Now that wicket 1.5-RC1 will be released soon we should work on getting
as many of the non working projects in master working. Even if most are
missing from the 1.5-RC1 I can do accelerated point releases as more are
added.
For some projects it could be as simple as adding them into the pom.xml
and then working through the 1.5 migration changes directly on the
present code.
But for some projects the version in the core-1.4.x branch has been
updated since the core-1.4.x branch was created (the master branch code
is out of date).
I've found a way in git to use the subtree merge that will allow the
core-1.4.x/project files to be merged onto the master/project files,
see: https://github.com/wicketstuff/core/wiki/Helpful-Git-Commands
(scroll down to the last section)
Steps:
1. Fork the https://github.com/wicketstuff/core repository
2. Follow the steps on the wiki page to backport the changes from a
specific module.
3. Commit the merge (updating the pom.xml's back to 1.5-SNAPSHOT)
4. Add in additional commits as required to make the project compatible
with wicket 1.5-SNAPSHOT (i.e. make it build)
5. Create a pull request onto master to let us pull in your changes.
For the test I did with jdk-1.5-parent/jasperreports-parent I just
committed directly into wicketstuff/core repository but I think using
the pull functionality of github would be more verbose.
Regards,
Mike
