Repository: ant-ivy Updated Branches: refs/heads/master 43ddccb85 -> 5918182e0
Set the https.protocol system property even for regular builds when running on Java 7 Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/5918182e Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/5918182e Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/5918182e Branch: refs/heads/master Commit: 5918182e0d6836d89c42260da9de4428d4cbcec0 Parents: 43ddccb Author: Jaikiran Pai <[email protected]> Authored: Wed Jul 25 10:50:59 2018 +0530 Committer: Jaikiran Pai <[email protected]> Committed: Wed Jul 25 10:50:59 2018 +0530 ---------------------------------------------------------------------- build-release.xml | 6 ------ build.xml | 9 +++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5918182e/build-release.xml ---------------------------------------------------------------------- diff --git a/build-release.xml b/build-release.xml index b8621e2..e2b887e 100644 --- a/build-release.xml +++ b/build-release.xml @@ -24,12 +24,6 @@ <import file="build.xml"/> - <!-- Java 7 runs into TLS protocol issues when dealing with repositories - that no longer support older protocols --> - <condition property="java.sysprop.https.protocols" value="" else="TLSv1.2"> - <javaversion atleast="1.8"/> - </condition> - <macrodef name="run-tutorial"> <attribute name="antfile"/> <attribute name="output"/> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5918182e/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 69a39cd..2ea3114 100644 --- a/build.xml +++ b/build.xml @@ -23,6 +23,12 @@ <property file="build.properties"/> <property name="final.name" value="ivy.jar"/> + <!-- Java 7 runs into TLS protocol issues when dealing with repositories + that no longer support older protocols --> + <condition property="java.sysprop.https.protocols" value="" else="TLSv1.2"> + <javaversion atleast="1.8"/> + </condition> + <target name="init-ivy-user-home" unless="ivy.use.local.home"> <condition property="ivy.home" value="${env.IVY_HOME}"> @@ -435,6 +441,9 @@ <syspropertyset> <propertyref prefix="http"/> </syspropertyset> + <!-- We select specific HTTPS protocols, based on the Java version we are running + on --> + <sysproperty key="https.protocols" value="${java.sysprop.https.protocols}"/> <!-- Added this to test IVY-65 --> <jvmarg value="-Duser.region=TR"/>
