Merge pull request #2395 from danielabutano/psi

pointing to more stable ebi repo see #2324
intermine · Sep 22, 2021 · ea5c1ca · ea5c1ca
2 parents b6abaee + af56462
commit ea5c1ca
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/bio/build.gradle b/bio/build.gradle
@@ -14,7 +14,7 @@ subprojects {
         mavenLocal()
         mavenCentral()
         maven {
-            url 'https://www.ebi.ac.uk/intact/maven/nexus/content/repositories/ebi-repo/'
+            url 'https://www.ebi.ac.uk/Tools/maven/repos/content/groups/ebi-repo/'
         }
     }
 

diff --git a/bio/sources/build.gradle b/bio/sources/build.gradle
@@ -32,7 +32,7 @@ subprojects {
         mavenLocal()
         mavenCentral()
         maven {
-            url 'https://www.ebi.ac.uk/intact/maven/nexus/content/repositories/ebi-repo/'
+            url 'https://www.ebi.ac.uk/Tools/maven/repos/content/groups/ebi-repo/'
         }
     }
 

diff --git a/bio/sources/psi-complexes/build.gradle b/bio/sources/psi-complexes/build.gradle
@@ -17,14 +17,20 @@ sourceSets {
     }
 }
 
+configurations {
+    provided
+    compile.extendsFrom provided
+}
+
 dependencies {
     compile group: 'org.intermine', name: 'bio-model', version: bioVersion, transitive: false
     compile group: 'org.intermine', name: 'intermine-integrate', version: imVersion
-    compile group: 'uk.ac.ebi.chebi.webapps.chebiWS.client', name: 'chebiWS-client', version: '2.4'
-    compile group: 'psidev.psi.mi.jami', name: 'jami-commons', version: '1.1.3'
-    compile group: 'psidev.psi.mi.jami', name: 'jami-core', version: '1.2.2'
-    compile group: 'psidev.psi.mi.jami', name: 'jami-mitab', version: '1.1.2'
-    compile group: 'psidev.psi.mi.jami', name: 'jami-xml', version: '1.1.3'
+    //compile group: 'uk.ac.ebi.chebi.webapps.chebiWS.client', name: 'chebiWS-client', version: '2.4'
+    provided fileTree(dir: 'libs', include: '*.jar')
+    compile group: 'psidev.psi.mi.jami', name: 'jami-commons', version: '3.0.0'
+    compile group: 'psidev.psi.mi.jami', name: 'jami-core', version: '3.0.0'
+    compile group: 'psidev.psi.mi.jami', name: 'jami-mitab', version: '3.0.0'
+    compile group: 'psidev.psi.mi.jami', name: 'jami-xml', version: '3.0.0'
     bioModel group: 'org.intermine', name: 'bio-model', version: bioVersion, transitive: false
     compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.0'
 }

diff --git a/bio/sources/psi-complexes/libs/chebiWS-client-2.4.jar b/bio/sources/psi-complexes/libs/chebiWS-client-2.4.jar
diff --git a/bio/webapp/build.gradle b/bio/webapp/build.gradle
@@ -34,10 +34,10 @@ dependencies {
 
     compile (project(':bio-tools')) { transitive = false }
     compile group: "org.intermine", name: "intermine-jbrowse-endpoint", version: System.getProperty("imVersion")
-    compile group: 'psidev.psi.mi.jami.bridges', name: 'bridges-core', version: '1.1.0'
-    compile group: 'psidev.psi.mi.jami.bridges', name: 'jami-ols', version: '1.1.0'
-    compile group: 'psidev.psi.mi.jami', name: 'jami-core', version: '1.2.3'
-    compile group: 'psidev.psi.mi.jami', name: 'jami-interactionviewer-json', version: '2.0.4'
+    compile group: 'psidev.psi.mi.jami.bridges', name: 'bridges-core', version: '3.0.0'
+    compile group: 'psidev.psi.mi.jami.bridges', name: 'jami-ols', version: '3.0.0'
+    compile group: 'psidev.psi.mi.jami', name: 'jami-core', version: '3.0.0'
+    compile group: 'psidev.psi.mi.jami', name: 'jami-interactionviewer-json', version: '3.0.0'
     compile group: "org.biojava", name: "biojava-core", version: "4.2.0"
     compile group: "org.biojava", name: "biojava-genome", version: "4.2.0"
     compile group: "org.biojava", name: "biojava-ontology", version: "4.2.0"