This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a commit to branch MNG-6726 in repository https://gitbox.apache.org/repos/asf/maven.git
commit ad58ca489038829d5c9d54d7201ddf3eac49ad20 Author: tibordigana <[email protected]> AuthorDate: Tue Jul 30 13:07:21 2019 +0200 [MNG-6726] Integration tests should use non empty MAVEN_OPTS. Jenkinsfile and 'core-it-suite' should accept custom MAVEN_OPTS from developers and their CLI. --- Jenkinsfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index af9a395..f2f54d8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -97,7 +97,15 @@ for (String os in runITsOses) { bat "if exist apache-maven-dist.zip del /q apache-maven-dist.zip" } unstash 'dist' - withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ + + // Java 7u80 has TLS 1.2 disabled by default: need to explicitly enable + // using non-empty MAVEN_OPTS (dummy prop) to prevent from merging env vars in child IT with env vars from parent process + // child env var takes the precedence + // merging env vars between parent/child processes are performed in maven-shared-utils: + // see Commandline#addSystemEnvironment(): "Properties systemEnvVars = CommandLineUtils.getSystemEnvVars()" + def platformOptions = jdk == '7' ? '-Dhttps.protocols=TLSv1.2' : '-DdummyProp=dummy' + + withMaven(jdk: jdkName, maven: mvnName, mavenOpts: platformOptions, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ junitPublisher(ignoreAttachments: false) ]) { String cmd = "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip -Dmaven.test.failure.ignore=true -Dmaven.skip.rc=true"
