Merge pull request #2385 from danielabutano/dev

Intermine 5.0.3
intermine · Jun 30, 2021 · b07c55d · b07c55d
2 parents 4f2fafe + d1568bd
commit b07c55d
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ InterMine
 
 Master: [![InterMine CI](https://github.com/intermine/intermine/workflows/InterMine%20CI/badge.svg?branch=master)](https://github.com/intermine/intermine/actions?query=workflow%3A%22InterMine+CI%22)
 Dev: [![InterMine CI](https://github.com/intermine/intermine/workflows/InterMine%20CI/badge.svg?branch=dev)](https://github.com/intermine/intermine/actions?query=workflow%3A%22InterMine+CI%22)
-[![Version](http://img.shields.io/badge/version-5.0.2-blue.svg?style=flat)](https://github.com/intermine/intermine/releases)
+[![Version](http://img.shields.io/badge/version-5.0.3-blue.svg?style=flat)](https://github.com/intermine/intermine/releases)
 [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/intermine/intermine/blob/master/LICENSE)
 [![Research software impact](http://depsy.org/api/package/pypi/intermine/badge.svg)](http://depsy.org/package/python/intermine)
 [![Conda](https://anaconda.org/anaconda/conda-build/badges/installer/conda.svg)](https://anaconda.org/bioconda/intermine)

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
@@ -7,6 +7,12 @@
  * information or http://www.gnu.org/copyleft/lesser.html.
  *
  */
+InterMine 5.0.3 (June 2021)
+
+#2375 - Update interpro_keys.properties
+#2376 - Update interpro-go_keys.properties
+#2384 - Enrichment widget not working when changing background population
+
 InterMine 5.0.2 (May 2021)
 
 #2335 - BioGrid data change causing loader to throw Exception

diff --git a/bio/build.gradle b/bio/build.gradle
@@ -1,6 +1,6 @@
 subprojects {
     group = 'org.intermine'
-    version = '5.0.2'
+    version = '5.0.3'
 
     apply plugin: "java"
     apply plugin: "maven"

diff --git a/bio/gradle.properties b/bio/gradle.properties
@@ -1,11 +1,11 @@
-systemProp.imVersion=5.0.2
-systemProp.bioVersion=5.0.2
+systemProp.imVersion=5.0.3
+systemProp.bioVersion=5.0.3
 
 # some unit tests need additional classes that aren't in the core model.
 # we use flymine's model. don't touch!
-systemProp.flymineVersion=[4.0, )
+systemProp.flymineVersion=4.0.0
 
 systemProp.javax.xml.stream.XMLOutputFactory=com.sun.xml.internal.stream.XMLOutputFactoryImpl
 #don't touch. to install locally without the 'unknown property'error
 ossrhUsername=
-ossrhPassword=
+ossrhPassword=
diff --git a/bio/postprocess-test/build.gradle b/bio/postprocess-test/build.gradle
@@ -17,7 +17,7 @@ ext {
 
 subprojects {
     group = 'org.intermine'
-    version = '5.0.2'
+    version = '5.0.3'
 
     apply plugin: 'java'
     apply plugin: 'maven'

diff --git a/bio/postprocess-test/gradle.properties b/bio/postprocess-test/gradle.properties
@@ -1,6 +1,6 @@
-systemProp.imVersion=5.0.2
-systemProp.bioVersion=5.0.2
+systemProp.imVersion=5.0.3
+systemProp.bioVersion=5.0.3
 
-systemProp.flymineVersion=[4.0, )
+systemProp.flymineVersion=4.0.0
 
 systemProp.javax.xml.stream.XMLOutputFactory = com.sun.xml.internal.stream.XMLOutputFactoryImpl
diff --git a/bio/postprocess/build.gradle b/bio/postprocess/build.gradle
@@ -16,7 +16,7 @@ ext {
 
 subprojects {
     group = 'org.intermine'
-    version = '5.0.2'
+    version = '5.0.3'
 
     apply plugin: 'java'
     apply plugin: 'maven'

diff --git a/bio/postprocess/gradle.properties b/bio/postprocess/gradle.properties
@@ -1,5 +1,5 @@
-systemProp.imVersion=5.0.2
-systemProp.bioVersion=5.0.2
+systemProp.imVersion=5.0.3
+systemProp.bioVersion=5.0.3
 
 systemProp.javax.xml.stream.XMLOutputFactory = com.sun.xml.internal.stream.XMLOutputFactoryImpl
 

diff --git a/bio/sources/build.gradle b/bio/sources/build.gradle
@@ -16,7 +16,7 @@ ext {
 
 subprojects {
     group = 'org.intermine'
-    version = '5.0.2'
+    version = '5.0.3'
 
     apply plugin: 'java'
     apply plugin: 'maven'

diff --git a/bio/sources/gradle.properties b/bio/sources/gradle.properties
@@ -1,9 +1,9 @@
-systemProp.imVersion=5.0.2
-systemProp.bioVersion=5.0.2
+systemProp.imVersion=5.0.3
+systemProp.bioVersion=5.0.3
 
 # some unit tests need additional classes that aren't in the core model.
 # we use flymine's model. don't touch!
-systemProp.flymineVersion=[4.0, )
+systemProp.flymineVersion=4.0.0
 
 systemProp.javax.xml.stream.XMLOutputFactory = com.sun.xml.internal.stream.XMLOutputFactoryImpl
 

diff --git a/intermine/build.gradle b/intermine/build.gradle
@@ -1,6 +1,6 @@
 subprojects {
     group = 'org.intermine'
-    version '5.0.2'
+    version '5.0.3'
 
     apply plugin: "java"
     apply plugin: "maven"

diff --git a/intermine/gradle.properties b/intermine/gradle.properties
@@ -1,5 +1,5 @@
-systemProp.imVersion=5.0.2
-systemProp.bioVersion=5.0.2
+systemProp.imVersion=5.0.3
+systemProp.bioVersion=5.0.3
 
 systemProp.javax.xml.stream.XMLOutputFactory = com.sun.xml.internal.stream.XMLOutputFactoryImpl
 

diff --git a/intermine/webapp/src/main/java/org/intermine/web/logic/Constants.java b/intermine/webapp/src/main/java/org/intermine/web/logic/Constants.java
@@ -225,7 +225,7 @@ private Constants() {
     /**
      * Current version of the InterMine code
      */
-    public static final String INTERMINE_VERSION = "5.0.2";
+    public static final String INTERMINE_VERSION = "5.0.3";
 
     /**
      * Key for a Map from class name to Boolean.TRUE for all classes in the model that do not have

diff --git a/...p/src/main/java/org/intermine/webservice/server/widget/EnrichmentWidgetResultService.java b/...p/src/main/java/org/intermine/webservice/server/widget/EnrichmentWidgetResultService.java
@@ -137,7 +137,7 @@ protected void execute() throws Exception {
                 }
                 addOutputAttribute("message", String.format(BAD_POPULATION_MSG, imBag.getType()));
                 return;
-            } else if (!verifyPopulationContainsIds(ids, populationBag)) {
+            } else if (ids != null && !verifyPopulationContainsIds(ids, populationBag)) {
                 if (input.shouldSavePopulation()) {
                     deleteReferencePopulationPreference(input);
                 }

diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'maven'
 apply plugin: 'signing'
 
 group 'org.intermine'
-version '5.0.2'
+version '5.0.3'
 
 sourceCompatibility = 1.8
 

diff --git a/plugin/gradle.properties b/plugin/gradle.properties
@@ -1,5 +1,5 @@
-systemProp.imVersion=5.0.2
-systemProp.bioVersion=5.0.2
+systemProp.imVersion=5.0.3
+systemProp.bioVersion=5.0.3
 
 systemProp.javax.xml.stream.XMLOutputFactory = com.sun.xml.internal.stream.XMLOutputFactoryImpl
 

diff --git a/testmine/build.gradle b/testmine/build.gradle
@@ -1,5 +1,5 @@
 ext {
-    imVersion = "5.0.2"
+    imVersion = "5.0.3"
     taskGroup = "InterMine"
     minePropertyFileName = "testmodel.properties"
     minePropertyFile = "${System.env.HOME}/.intermine/$minePropertyFileName"