Found and fixed the mysterious resolution errors downloading libraries

romanchyla · Jan 31, 2021 · 930a1e6 · 930a1e6
1 parent 900867b
commit 930a1e6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 23 deletions.
diff --git a/common-build.xml b/common-build.xml
@@ -62,6 +62,9 @@
 	<property name="ivy.bootstrap.version" value="2.5.0" />
 	<property name="ivy.default.configuration" value="*"/>
 	<property name="ivy.sync" value="true"/>
+
+    <property name="ivy.resolution-cache.dir" location="${common.build.dir}/ivy-resolution-cache"/>
+    <property name="ivy.lock-strategy" value="artifact-lock-nio"/>
 
 	<property name="junit.jar" value="junit-4.10.jar"/>
 	<property name="junit-location.jar" value="${common.dir}/lib/${junit.jar}"/>

diff --git a/contrib/antlrqueryparser/ivy.xml b/contrib/antlrqueryparser/ivy.xml
@@ -17,7 +17,7 @@
    under the License.    
 -->
 <ivy-module version="2.0">
-    <info organisation="montysolr" module="antlrqueryparser"/>
+    <info organisation="org.apache.lucene" module="antlrqueryparser"/>
 
     <dependencies>
 

diff --git a/contrib/examples/ivy.xml b/contrib/examples/ivy.xml
@@ -17,7 +17,7 @@
    under the License.    
 -->
 <ivy-module version="2.0">
-    <info organisation="montysolr" module="examples"/>
+    <info organisation="org.apache.solr" module="examples"/>
 
     <dependencies>
       <dependency org="org.antlr" name="antlr-runtime" rev="3.5.2"/>

diff --git a/ivy-settings.xml b/ivy-settings.xml
@@ -17,50 +17,39 @@
    under the License.    
 -->
 <ivysettings>
+  <!-- This file is included by default by top-level-ivy-settings.xml,
+       which loads ivy-versions.properties as Ivy variables.          -->
+
   <settings defaultResolver="default"/>
 
   <property name="local-maven2-dir" value="${user.home}/.m2/repository/" />
-
-  <properties file="${ivy.settings.dir}/ivy-versions.properties" override="false"/>
-
+
   <include url="${ivy.default.settings.dir}/ivysettings-public.xml"/>
   <include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
   <include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
   <include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>
 
-  <caches lockStrategy="artifact-lock" resolutionCacheDir="${common.build.dir}/ivy-resolution-cache" /> 
+  <caches lockStrategy="${ivy.lock-strategy}" resolutionCacheDir="${ivy.resolution-cache.dir}" />
 
   <resolvers>
-    <ibiblio name="sonatype-releases" root="http://oss.sonatype.org/content/repositories/releases" m2compatible="true" />
-    <ibiblio name="maven.restlet.org" root="http://maven.restlet.org" m2compatible="true" />
-    <ibiblio name="cloudera" root="http://repository.cloudera.com/artifactory/repo" m2compatible="true" />
-    <ibiblio name="releases.cloudera.com" root="http://repository.cloudera.com/content/repositories/releases" m2compatible="true" />
-
-    <!-- needed only for newer svnkit releases, e.g. 1.8.x -->
-    <ibiblio name="svnkit-releases" root="http://maven.tmatesoft.com/content/repositories/releases" m2compatible="true" />
+    <ibiblio name="sonatype-releases" root="https://oss.sonatype.org/content/repositories/releases" m2compatible="true" />
+    <ibiblio name="maven.restlet.com" root="https://maven.restlet.com" m2compatible="true" />
+    <ibiblio name="releases.cloudera.com" root="https://repository.cloudera.com/cloudera/libs-release-local" m2compatible="true" />
 
-    <!-- you might need to tweak this from china so it works -->
-    <ibiblio name="working-chinese-mirror" root="https://repo1.maven.org/maven2" m2compatible="true" />
-
-    <!--
     <filesystem name="local-maven-2" m2compatible="true" local="true">
       <artifact
           pattern="${local-maven2-dir}/[organisation]/[module]/[revision]/[module]-[revision].[ext]" />
       <ivy
           pattern="${local-maven2-dir}/[organisation]/[module]/[revision]/[module]-[revision].pom" />
     </filesystem>
-    -->
 
     <chain name="default" returnFirst="true" checkmodified="true" changingPattern=".*SNAPSHOT">
       <resolver ref="local"/>
       <!-- <resolver ref="local-maven-2" /> -->
       <resolver ref="main"/>
-      <resolver ref="cloudera"/>
-      <resolver ref="releases.cloudera.com"/>
+      <resolver ref="maven.restlet.com" />
       <resolver ref="sonatype-releases" />
-      <resolver ref="maven.restlet.org" />
-      <resolver ref="svnkit-releases" />
-      <resolver ref="working-chinese-mirror" />
+      <resolver ref="releases.cloudera.com"/>
     </chain>
   </resolvers>