diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 620eae00f69a31b502207988db849767ccc6cbef..9bfc071cd6eb54058f5736e5731cf9b1ef1e9c40 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,6 +13,7 @@ cache: package: stage: deploy script: + - export DATAPORT_PROXY=$DATAPORT_PROXY - mvn $MAVEN_CLI_OPTS package artifacts: paths: diff --git a/.m2/settings.xml b/.m2/settings.xml index 0a02e4e49651fb8afb7390496e2b5898a44e1d46..7a5f70a3c596b4aace20d91aa649c39633573ebc 100644 --- a/.m2/settings.xml +++ b/.m2/settings.xml @@ -37,14 +37,6 @@ <proxies> <proxy> <id>dataport-proxy</id> - <active>false</active> - <protocol>http</protocol> - <host>10.65.108.2</host> - <port>${env.DATAPORT_PROXY_PORT}</port> - <nonProxyHosts>localhost,127.0.0.1,*.dataport.de</nonProxyHosts> - </proxy> - <proxy> - <id>dataport-gitlab-proxy</id> <active>true</active> <protocol>http</protocol> <host>${env.DATAPORT_PROXY}</host>