zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ph...@apache.org
Subject zookeeper git commit: ZOOKEEPER-2594: Use TLS for downloading artifacts during build (Olaf Flebbe via phunt)
Date Wed, 05 Oct 2016 16:32:32 GMT
Repository: zookeeper
Updated Branches:
  refs/heads/branch-3.4 17b93773c -> 8bb13ba2f


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

Change-Id: If93e088ed7ae673f4fe433e145bb0f65ea34c47a


Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/8bb13ba2
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/8bb13ba2
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/8bb13ba2

Branch: refs/heads/branch-3.4
Commit: 8bb13ba2f8fde163eb0b988ff308a7b347bda97b
Parents: 17b9377
Author: Patrick Hunt <phunt@apache.org>
Authored: Wed Oct 5 09:32:01 2016 -0700
Committer: Patrick Hunt <phunt@apache.org>
Committed: Wed Oct 5 09:32:01 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                   | 3 +++
 build.xml                     | 4 ++--
 ivysettings.xml               | 9 ++-------
 src/contrib/build-contrib.xml | 2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8bb13ba2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a4f8053..f0e7799 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -22,6 +22,9 @@ IMPROVEMENTS:
   ZOOKEEPER-2557: Update gitignore to account for other file extensions.
   (Edward Ribeiro via cnauroth)
 
+  ZOOKEEPER-2594: Use TLS for downloading artifacts during build
+  (Olaf Flebbe via phunt)
+
 Release 3.4.9 - 2016-08-23
 
 Backward compatible changes:

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8bb13ba2/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index ee6834c..505597a 100644
--- a/build.xml
+++ b/build.xml
@@ -107,7 +107,7 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
 
     <property name="ivy.version" value="2.4.0"/>
     <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.lib" value="${build.dir}/lib"/>
     <property name="ivy.package.lib" value="${build.dir}/package/lib"/>
@@ -115,7 +115,7 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
     <property name="ivy.jdiff.lib" value="${build.dir}/jdiff/lib"/>
     <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="ant-task.version" value="2.1.3"/>
     <property name="ant_task_repo_url"

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8bb13ba2/ivysettings.xml
----------------------------------------------------------------------
diff --git a/ivysettings.xml b/ivysettings.xml
index 52cfa52..1d06c40 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -18,11 +18,9 @@
 -->
 
   <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"
-    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"
     value="[organisation]/[module]/[revision]/[module]-[revision]"/>
   <property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/>
@@ -33,13 +31,10 @@
       pattern="${maven2.pattern.ext}" m2compatible="true"/>
     <ibiblio name="jboss-maven2" root="${repo.jboss.org}"
       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">
       <resolver ref="maven2"/>
       <resolver ref="jboss-maven2"/>
-      <resolver ref="sun-maven2"/>
     </chain>
 
   </resolvers>

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8bb13ba2/src/contrib/build-contrib.xml
----------------------------------------------------------------------
diff --git a/src/contrib/build-contrib.xml b/src/contrib/build-contrib.xml
index fab8a5f..276516e 100644
--- a/src/contrib/build-contrib.xml
+++ b/src/contrib/build-contrib.xml
@@ -43,7 +43,7 @@
 
   <property name="ivy.version" value="2.4.0"/>
   <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.lib" value="${build.dir}/lib"/>
   <property name="ivy.test.lib" value="${build.test}/lib"/>


Mime
View raw message