You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by li...@apache.org on 2022/06/24 07:27:13 UTC

[dolphinscheduler] 03/03: [feat] ui build no inherit from maven proxy (#10590)

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

liudongkai pushed a commit to branch 3.0.0-beta-2-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git

commit c27fa1ab0de9506802289b751af7b4d8b27646ee
Author: Jiajie Zhong <zh...@hotmail.com>
AuthorDate: Fri Jun 24 13:35:36 2022 +0800

    [feat] ui build no inherit from maven proxy (#10590)
    
    Users may set in for maven setting.xml. but
    frontend-maven-plugin will inherit proxy setting
    from it. And pnpm not support both `--proxy` and
    `--https-proxy` and will fail ui build. This patch
    make pnpm run without inherits maven proxy.
    
    ref: https://github.com/eirslett/frontend-maven-plugin#proxy-settings
    and https://github.com/eirslett/frontend-maven-plugin/blob/9f39dbad0948237ada4e7b19bf90690f94a61b81/frontend-maven-plugin/src/main/java/com/github/eirslett/maven/plugins/frontend/mojo/PnpmMojo.java#L28
    
    (cherry picked from commit 15a86071d14c83b6a40557ea49ea39ac46cd9057)
---
 dolphinscheduler-ui/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml
index 76144ad270..9624cb941a 100644
--- a/dolphinscheduler-ui/pom.xml
+++ b/dolphinscheduler-ui/pom.xml
@@ -43,6 +43,9 @@
             <groupId>com.github.eirslett</groupId>
             <artifactId>frontend-maven-plugin</artifactId>
             <version>${frontend-maven-plugin.version}</version>
+            <configuration>
+              <pnpmInheritsProxyConfigFromMaven>false</pnpmInheritsProxyConfigFromMaven>
+            </configuration>
             <executions>
               <execution>
                 <id>install node and pnpm</id>