You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cxf.apache.org by Colm O hEigeartaigh <co...@apache.org> on 2017/07/10 10:52:43 UTC
Re: CXF 2.6 branch
Any update? I'd like to get this release out and forget about the 2.6.x
branch then ;-)
Colm.
On Thu, Jun 22, 2017 at 6:22 PM, Jonathan S. Fisher <ex...@gmail.com>
wrote:
> It was a CNFE, CharSequence. Very strange.
>
> I did manage to find a workaround, however, I'm getting pulled elsewhere.
> I'll open another PR until I get a chance to dig in. My workaround is to
> specify an exact version of BCEL
>
>
>
> --
> View this message in context: http://cxf.547215.n5.nabble.
> com/CXF-2-6-branch-tp5780961p5781441.html
> Sent from the cxf-dev mailing list archive at Nabble.com.
>
--
Colm O hEigeartaigh
Talend Community Coder
http://coders.talend.com
Re: CXF 2.6 branch
Posted by Colm O hEigeartaigh <co...@apache.org>.
I'll call a vote shortly. Note that I removed the toolchains stuff, and
specified "1.5" for the compiler source + target as it was before - I was
having trouble using Java 7 to do mvn release:prepare with toolchains.
Colm.
On Fri, Jul 28, 2017 at 4:02 PM, jgallimore <jo...@gmail.com>
wrote:
> Ah, my bad. My local branch was out of date. Please ignore this, I'll close
> the PR. Is there anything else that needs to happen to close this off?
> Happy
> to help in any way I can.
>
> Thanks
>
> Jon
>
>
>
> --
> View this message in context: http://cxf.547215.n5.nabble.co
> m/CXF-2-6-branch-tp5780961p5782137.html
> Sent from the cxf-dev mailing list archive at Nabble.com.
>
--
Colm O hEigeartaigh
Talend Community Coder
http://coders.talend.com
Re: CXF 2.6 branch
Posted by jgallimore <jo...@gmail.com>.
Ah, my bad. My local branch was out of date. Please ignore this, I'll close
the PR. Is there anything else that needs to happen to close this off? Happy
to help in any way I can.
Thanks
Jon
--
View this message in context: http://cxf.547215.n5.nabble.com/CXF-2-6-branch-tp5780961p5782137.html
Sent from the cxf-dev mailing list archive at Nabble.com.
Re: CXF 2.6 branch
Posted by jgallimore <jo...@gmail.com>.
Sounds like I may have done something incorrectly... I apologize. Am I using
the correct branch in git? I used the 2.6.x-fixes:
https://github.com/apache/cxf/tree/2.6.x-fixes
I did also try grabbing my PR as a diff
(https://patch-diff.githubusercontent.com/raw/apache/cxf/pull/298.diff) and
applying it manually to a checkout of the 2.6.x-fixes branch :
----
Jonathans-MacBook-Pro:cxf jgallimore$ git status
On branch 2.6.x-fixes
Your branch is up-to-date with 'origin/2.6.x-fixes'.
nothing to commit, working tree clean
Jonathans-MacBook-Pro:cxf jgallimore$ git apply < ~/cxf.diff
Jonathans-MacBook-Pro:cxf jgallimore$ git status
On branch 2.6.x-fixes
Your branch is up-to-date with 'origin/2.6.x-fixes'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: api/src/main/java/org/apache/cxf/helpers/FileUtils.java
modified:
rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
no changes added to commit (use "git add" and/or "git commit -a")
----
Do let me know if I have messed up somewhere, or if there is a
better/different way to get you a patch.
I did also see Jonathan's issue with CharSequence on the Jenkins CI. I built
with JDK 1.6 here, and that didn't have that issue.
Many thanks
Jon
--
View this message in context: http://cxf.547215.n5.nabble.com/CXF-2-6-branch-tp5780961p5782130.html
Sent from the cxf-dev mailing list archive at Nabble.com.
Re: CXF 2.6 branch
Posted by Colm O hEigeartaigh <co...@apache.org>.
That patch does not apply to the 2.6.x branch?
error: patch failed: api/src/main/java/org/apache/
cxf/helpers/FileUtils.java:32
error: api/src/main/java/org/apache/cxf/helpers/FileUtils.java: patch does
not apply
error: patch failed: rt/rs/extensions/providers/
src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java:526
error: rt/rs/extensions/providers/src/main/java/org/apache/cxf/
jaxrs/provider/json/JSONProvider.java: patch does not apply
Colm.
On Wed, Jul 26, 2017 at 9:12 PM, jgallimore <jo...@gmail.com>
wrote:
> Hi
>
> I had a look at the branch, and it seems to build perfectly and all tests
> pass, except I had a couple of checkstyle errors, which I fixed in this PR:
> https://github.com/apache/cxf/pull/298
>
> If it is sill at all possible for a release, that would be incredibly
> awesome of you. I'm happy to help with it in any way that I can.
>
> Many thanks!
>
> Jon
>
>
>
> --
> View this message in context: http://cxf.547215.n5.nabble.co
> m/CXF-2-6-branch-tp5780961p5782073.html
> Sent from the cxf-dev mailing list archive at Nabble.com.
>
--
Colm O hEigeartaigh
Talend Community Coder
http://coders.talend.com
Re: CXF 2.6 branch
Posted by jgallimore <jo...@gmail.com>.
Hi
I had a look at the branch, and it seems to build perfectly and all tests
pass, except I had a couple of checkstyle errors, which I fixed in this PR:
https://github.com/apache/cxf/pull/298
If it is sill at all possible for a release, that would be incredibly
awesome of you. I'm happy to help with it in any way that I can.
Many thanks!
Jon
--
View this message in context: http://cxf.547215.n5.nabble.com/CXF-2-6-branch-tp5780961p5782073.html
Sent from the cxf-dev mailing list archive at Nabble.com.