diff options
Diffstat (limited to 'bigtop-packages/src/common/zookeeper/patch5-ZOOKEEPER-2594.diff')
| -rw-r--r-- | bigtop-packages/src/common/zookeeper/patch5-ZOOKEEPER-2594.diff | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/bigtop-packages/src/common/zookeeper/patch5-ZOOKEEPER-2594.diff b/bigtop-packages/src/common/zookeeper/patch5-ZOOKEEPER-2594.diff deleted file mode 100644 index 1d5af01b..00000000 --- a/bigtop-packages/src/common/zookeeper/patch5-ZOOKEEPER-2594.diff +++ /dev/null @@ -1,66 +0,0 @@ -diff -ur zookeeper-3.4.6/build.xml zookeeper-3.4.6-new/build.xml ---- zookeeper-3.4.6/build.xml 2014-02-20 10:14:08.000000000 +0000 -+++ zookeeper-3.4.6-new/build.xml 2016-10-02 08:15:52.140641227 +0000 -@@ -107,7 +107,7 @@ - - <property name="ivy.version" value="2.2.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 @@ - <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" -Only in zookeeper-3.4.6-new/: build.xml.orig -diff -ur zookeeper-3.4.6/ivysettings.xml zookeeper-3.4.6-new/ivysettings.xml ---- zookeeper-3.4.6/ivysettings.xml 2014-02-20 10:14:08.000000000 +0000 -+++ zookeeper-3.4.6-new/ivysettings.xml 2016-10-02 08:15:52.140641227 +0000 -@@ -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> -diff -ur zookeeper-3.4.6/src/contrib/build-contrib.xml zookeeper-3.4.6-new/src/contrib/build-contrib.xml ---- zookeeper-3.4.6/src/contrib/build-contrib.xml 2014-02-20 10:14:09.000000000 +0000 -+++ zookeeper-3.4.6-new/src/contrib/build-contrib.xml 2016-10-02 08:15:52.140641227 +0000 -@@ -43,7 +43,7 @@ - - <property name="ivy.version" value="2.2.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"/> -Only in zookeeper-3.4.6-new/src/contrib: build-contrib.xml.orig |