浏览代码

ZOOKEEPER-2594: Use TLS for downloading artifacts during build (Olaf Flebbe via phunt)

Change-Id: I36e634370553710030772abba328cf2b691fa888
Patrick Hunt 8 年之前
父节点
当前提交
8d0154bcc2
共有 4 个文件被更改,包括 8 次插入10 次删除
  1. 3 0
      CHANGES.txt
  2. 2 2
      build.xml
  3. 2 7
      ivysettings.xml
  4. 1 1
      src/contrib/build-contrib.xml

+ 3 - 0
CHANGES.txt

@@ -527,6 +527,9 @@ IMPROVEMENTS:
   ZOOKEEPER-2557: Update gitignore to account for other file extensions.
   ZOOKEEPER-2557: Update gitignore to account for other file extensions.
   (Edward Ribeiro via cnauroth)
   (Edward Ribeiro via cnauroth)
 
 
+  ZOOKEEPER-2594: Use TLS for downloading artifacts during build
+  (Olaf Flebbe via phunt)
+
 Release 3.5.0 - 8/4/2014
 Release 3.5.0 - 8/4/2014
 
 
 NEW FEATURES:
 NEW FEATURES:

+ 2 - 2
build.xml

@@ -113,7 +113,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
 
 
     <property name="ivy.version" value="2.4.0"/>
     <property name="ivy.version" value="2.4.0"/>
     <property name="ivy.url"
     <property name="ivy.url"
-              value="http://repo2.maven.org/maven2/org/apache/ivy/ivy" />
+              value="https://repo1.maven.org/maven2/org/apache/ivy/ivy" />
     <property name="ivy.home" value="${user.home}/.ant" />
     <property name="ivy.home" value="${user.home}/.ant" />
     <property name="ivy.lib" value="${build.dir}/lib"/>
     <property name="ivy.lib" value="${build.dir}/lib"/>
     <property name="ivy.package.lib" value="${build.dir}/package/lib"/>
     <property name="ivy.package.lib" value="${build.dir}/package/lib"/>
@@ -121,7 +121,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     <property name="ivy.jdiff.lib" value="${build.dir}/jdiff/lib"/>
     <property name="ivy.jdiff.lib" value="${build.dir}/jdiff/lib"/>
     <property name="ivysettings.xml" value="${basedir}/ivysettings.xml"/>
     <property name="ivysettings.xml" value="${basedir}/ivysettings.xml"/>
     
     
-    <property name="mvnrepo" value="http://repo2.maven.org/maven2"/>
+    <property name="mvnrepo" value="https://repo1.maven.org/maven2"/>
     <property name="tsk.org" value="/org/apache/maven/maven-ant-tasks/"/>
     <property name="tsk.org" value="/org/apache/maven/maven-ant-tasks/"/>
     <property name="ant-task.version" value="2.1.3"/>
     <property name="ant-task.version" value="2.1.3"/>
     <property name="ant_task_repo_url"
     <property name="ant_task_repo_url"

+ 2 - 7
ivysettings.xml

@@ -18,11 +18,9 @@
 -->
 -->
 
 
   <property name="repo.maven.org"
   <property name="repo.maven.org"
-    value="http://repo1.maven.org/maven2/" override="false"/>
+    value="https://repo1.maven.org/maven2/" override="false"/>
   <property name="repo.jboss.org"
   <property name="repo.jboss.org"
-    value="http://repository.jboss.org/nexus/content/groups/public/" override="false"/>
-  <property name="repo.sun.org"
-    value="http://download.java.net/maven/2/" override="false"/>
+    value="https://repository.jboss.org/nexus/content/groups/public/" override="false"/>
   <property name="maven2.pattern"
   <property name="maven2.pattern"
     value="[organisation]/[module]/[revision]/[module]-[revision]"/>
     value="[organisation]/[module]/[revision]/[module]-[revision]"/>
   <property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/>
   <property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/>
@@ -33,13 +31,10 @@
       pattern="${maven2.pattern.ext}" m2compatible="true"/>
       pattern="${maven2.pattern.ext}" m2compatible="true"/>
     <ibiblio name="jboss-maven2" root="${repo.jboss.org}"
     <ibiblio name="jboss-maven2" root="${repo.jboss.org}"
       pattern="${maven2.pattern.ext}" m2compatible="true"/>
       pattern="${maven2.pattern.ext}" m2compatible="true"/>
-    <ibiblio name="sun-maven2" root="${repo.sun.org}"
-      pattern="${maven2.pattern.ext}" m2compatible="true"/>
 
 
     <chain name="default" dual="true">
     <chain name="default" dual="true">
       <resolver ref="maven2"/>
       <resolver ref="maven2"/>
       <resolver ref="jboss-maven2"/>
       <resolver ref="jboss-maven2"/>
-      <resolver ref="sun-maven2"/>
     </chain>
     </chain>
 
 
   </resolvers>
   </resolvers>

+ 1 - 1
src/contrib/build-contrib.xml

@@ -43,7 +43,7 @@
 
 
   <property name="ivy.version" value="2.4.0"/>
   <property name="ivy.version" value="2.4.0"/>
   <property name="ivy.url"
   <property name="ivy.url"
-            value="http://repo2.maven.org/maven2/org/apache/ivy/ivy" />
+            value="https://repo1.maven.org/maven2/org/apache/ivy/ivy" />
   <property name="ivy.home" value="${user.home}/.ant" />
   <property name="ivy.home" value="${user.home}/.ant" />
   <property name="ivy.lib" value="${build.dir}/lib"/>
   <property name="ivy.lib" value="${build.dir}/lib"/>
   <property name="ivy.test.lib" value="${build.test}/lib"/>
   <property name="ivy.test.lib" value="${build.test}/lib"/>