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 2016/02/29 01:26:24 UTC

[1/2] cxf git commit: [CXF-6806]don't mark the optional encoding parameter as required for cxf-java2wadl-plugin

Repository: cxf
Updated Branches:
  refs/heads/master 66fc0d982 -> 3132adfe2


[CXF-6806]don't mark the optional encoding parameter as required for cxf-java2wadl-plugin


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7d5a70ba
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7d5a70ba
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7d5a70ba

Branch: refs/heads/master
Commit: 7d5a70baaee9bd95d7fffe0b1f4fcf972390e997
Parents: e61a83d
Author: Freeman Fang <fr...@gmail.com>
Authored: Mon Feb 29 08:07:02 2016 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Mon Feb 29 08:07:02 2016 +0800

----------------------------------------------------------------------
 .../org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java    | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/7d5a70ba/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
index be3dc32..c7e1ef1 100644
--- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
+++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
@@ -49,7 +49,6 @@ public class ParseJavaDocMojo extends AbstractMojo {
      * The source encoding.
      * 
      * @parameter defaultValue = "${project.build.sourceEncoding}"
-     * @required
      */
     private String encoding;
     


[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf

Posted by ff...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3132adfe
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3132adfe
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3132adfe

Branch: refs/heads/master
Commit: 3132adfe2b59d0cc5d82bed24c75d4cad08b9593
Parents: 7d5a70b 66fc0d9
Author: Freeman Fang <fr...@gmail.com>
Authored: Mon Feb 29 08:25:40 2016 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Mon Feb 29 08:25:40 2016 +0800

----------------------------------------------------------------------
 .../cxf/attachment/ContentDisposition.java      | 20 ++++++++++++++++++++
 .../cxf/attachment/AttachmentUtilTest.java      |  7 +++++++
 .../WebFaultOutInterceptorTestCase.java         | 14 ++++++--------
 .../cxf/rs/security/jose/jws/JwsHeaders.java    | 13 +++++++++++++
 .../jose/jws/JwsCompactReaderWriterTest.java    |  2 +-
 .../security/jose/jws/JwsJsonConsumerTest.java  |  5 +++++
 .../security/jose/jws/JwsJsonProducerTest.java  |  4 ++--
 7 files changed, 54 insertions(+), 11 deletions(-)
----------------------------------------------------------------------