Merge pull request #287 from olofsvensson/issue_285

Issue 285
ispyb · May 2, 2018 · 6854dce · 6854dce
2 parents d9762b0 + 3416361
commit 6854dce
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 8 deletions.
diff --git a/ispyb-bcr-ear/pom.xml b/ispyb-bcr-ear/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ispyb</groupId>
 		<artifactId>ispyb-parent</artifactId>
-		<version>5.5.4</version>
+		<version>5.5.5</version>
 	</parent>
 	<artifactId>ispyb-bcr-ear</artifactId>
 	<packaging>ear</packaging>

diff --git a/ispyb-bcr/pom.xml b/ispyb-bcr/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>ispyb</groupId>
 		<artifactId>ispyb-parent</artifactId>
-		<version>5.5.4</version>
+		<version>5.5.5</version>
 
 	</parent>
 	<artifactId>ispyb-bcr</artifactId>

diff --git a/ispyb-ear/pom.xml b/ispyb-ear/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ispyb</groupId>
 		<artifactId>ispyb-parent</artifactId>
-		<version>5.5.4</version>
+		<version>5.5.5</version>
 	</parent>
 	<artifactId>ispyb-ear</artifactId>
 	<packaging>ear</packaging>

diff --git a/ispyb-ejb/pom.xml b/ispyb-ejb/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ispyb</groupId>
 		<artifactId>ispyb-parent</artifactId>
-		<version>5.5.4</version>
+		<version>5.5.5</version>
 
 	</parent>
 	<artifactId>ispyb-ejb3</artifactId>

diff --git a/ispyb-ejb/src/main/java/ispyb/common/util/Constants.java b/ispyb-ejb/src/main/java/ispyb/common/util/Constants.java
@@ -877,7 +877,7 @@ public static String getSAXSBeamline() {
 //	public static final String[] LIST_EXPERIMENT_KIND_ESRF = { "Default", "MXPressE", "MXPressO", "MXPressE_SAD", "MXScore", "MXPressM","OSC", "SAD",
 //		"MAD", "Fixed", "Ligand binding", "Refinement", "MAD - Inverse Beam", "SAD - Inverse Beam" };
 
-	public static final String[] LIST_EXPERIMENT_KIND_ESRF = { "Default", "MXPressE", "MXPressO", "MXPressI", "MXPressE_SAD", "MXScore", "MXPressM", "MXPressP", "MXPressP_SAD" };
+	public static final String[] LIST_EXPERIMENT_KIND_ESRF = { "Default", "MXPressE", "MXPressO", "MXPressF", "MXPressI", "MXPressE_SAD", "MXScore", "MXPressM", "MXPressP", "MXPressP_SAD" };
 
 
 	public static final String[] LIST_EXPERIMENT_KIND = (SITE_IS_ESRF()) ? LIST_EXPERIMENT_KIND_ESRF : LIST_EXPERIMENT_KIND_MAXIV;

diff --git a/ispyb-ui/pom.xml b/ispyb-ui/pom.xml
@@ -4,7 +4,7 @@
 	 <parent>
 		<groupId>ispyb</groupId>
 		<artifactId>ispyb-parent</artifactId>
-		<version>5.5.4</version>
+		<version>5.5.5</version>
 	</parent>
 
 	<artifactId>ispyb-ui</artifactId>

diff --git a/ispyb-ui/src/main/webapp/help/release_notes.txt b/ispyb-ui/src/main/webapp/help/release_notes.txt
@@ -1,3 +1,12 @@
+**************
+* 02.05.2018     *
+**************
+
+- fixes issue #285
+
+New TAG : 5.5.5
+
+
 **************
 * 27.02.2018     *
 **************

diff --git a/ispyb-ws/pom.xml b/ispyb-ws/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ispyb</groupId>
 		<artifactId>ispyb-parent</artifactId>
-		<version>5.5.4</version>
+		<version>5.5.5</version>
 	</parent>
 	<artifactId>ispyb-ws</artifactId>
 	<packaging>war</packaging>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ispyb</groupId>
 	<artifactId>ispyb-parent</artifactId>
-	<version>5.5.4</version>
+	<version>5.5.5</version>
 
 	<packaging>pom</packaging>
 	<modules>