You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by ff...@apache.org on 2019/01/18 08:35:29 UTC

[cxf] branch 3.2.x-fixes updated (d14c174 -> 0d24cf1)

This is an automated email from the ASF dual-hosted git repository.

ffang pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.


    from d14c174  Recording .gitmergeinfo Changes
     new 466bdfa  [CXF-7946]OperationResourceInfoComparator should consider methods parameters
     new 41cb05e  [CXF-7948]Upgrade to asm 7
     new 36d3250  Recording .gitmergeinfo Changes
     new 0d24cf1  [CXF-7948]address conflicts

The 14432 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmergeinfo                                                |  1 +
 parent/pom.xml                                               |  4 ++--
 .../cxf/jaxrs/model/OperationResourceInfoComparator.java     |  3 +++
 .../src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 12 ++++++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)