Set the https.protocol system property even for regular builds when r…

…unning on Java 7
arcticgeek · Jul 25, 2018 · 5918182 · 5918182
1 parent 43ddccb
commit 5918182
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git 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"/>

diff --git 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"/>