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 2020/03/14 01:35:36 UTC

[cxf] branch 3.3.x-fixes updated (c19ce1e -> a8d37d6)

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

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


    from c19ce1e  CXF-8240 - STSClient produces wrong element order for TokenType
     new 1ad6004  [CXF-8241]cxf-codegen-plugin not using the proxy port configured in settings.xml
     new a8d37d6  Recording .gitmergeinfo Changes

The 2 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 +
 .../src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)


[cxf] 02/02: Recording .gitmergeinfo Changes

Posted by ff...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit a8d37d6280d3e6236eb4d2884870092eb56e8b3a
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Fri Mar 13 21:35:02 2020 -0400

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 2e94399..75431d5 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -159,6 +159,7 @@ M 169be66c11851d723e4a8d93f752e0b3dff1fa60
 M 180578d01f361d77ce7f42dd760fa8d5f245ce7e
 M 224fa741d6753053c6f47d361f8cc7e93fd34ed9
 M 2275d49772676ac72bc14ebbc3173719cd72e635
+M 29f9d03b69ee071d3b83e4f0509a6b6e01b96564
 M 2cde96f38fc835f7d0eb1e303037e572110c3399
 M 325ed0436bc9cfa9150b3504a54b5911b47e3266
 M 3b119ca6630f1384b93cd718d0cd95ccabc81e91


[cxf] 01/02: [CXF-8241]cxf-codegen-plugin not using the proxy port configured in settings.xml

Posted by ff...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 1ad60044c2155ceea039417fe09e2f5fc5deb10a
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Fri Mar 13 21:34:30 2020 -0400

    [CXF-8241]cxf-codegen-plugin not using the proxy port configured in settings.xml
    
    (cherry picked from commit 29f9d03b69ee071d3b83e4f0509a6b6e01b96564)
---
 .../src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
index acb0e11..4b34f4f 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
@@ -464,7 +464,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
                 });
 
                 System.setProperty(HTTP_PROXY_USER, authUser);
-                System.setProperty(HTTP_PROXY_PORT, authPassword);
+                System.setProperty(HTTP_PROXY_PASSWORD, authPassword);
             }
 
         }