You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2016/10/05 16:30:52 UTC
zookeeper git commit: ZOOKEEPER-2594: Use TLS for downloading
artifacts during build (Olaf Flebbe via phunt)
Repository: zookeeper
Updated Branches:
refs/heads/master ec20c5434 -> 8d0154bcc
ZOOKEEPER-2594: Use TLS for downloading artifacts during build (Olaf Flebbe via phunt)
Change-Id: I36e634370553710030772abba328cf2b691fa888
Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/8d0154bc
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/8d0154bc
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/8d0154bc
Branch: refs/heads/master
Commit: 8d0154bcc21e58b6166eb5e360f72ce37699e072
Parents: ec20c54
Author: Patrick Hunt <ph...@apache.org>
Authored: Wed Oct 5 09:30:00 2016 -0700
Committer: Patrick Hunt <ph...@apache.org>
Committed: Wed Oct 5 09:30:00 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/8d0154bc/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3e75f01..e10bbdc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -527,6 +527,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.5.0 - 8/4/2014
NEW FEATURES:
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8d0154bc/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 96c9ef8..5328035 100644
--- a/build.xml
+++ b/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.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"/>
@@ -121,7 +121,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.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/8d0154bc/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/8d0154bc/src/contrib/build-contrib.xml
----------------------------------------------------------------------
diff --git a/src/contrib/build-contrib.xml b/src/contrib/build-contrib.xml
index 848d45b..d006448 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"/>