From 88383105ad4c9ba9aa0e1e4cf44b1e0186b74a13 Mon Sep 17 00:00:00 2001
From: Olof Svensson <svensson@linsvensson.esrf.fr>
Date: Wed, 2 May 2018 16:44:07 +0200
Subject: [PATCH 1/4] Issue #285 : Added MXPressF to LIST_EXPERIMENT_KIND_ESRF

---
 ispyb-ejb/src/main/java/ispyb/common/util/Constants.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ispyb-ejb/src/main/java/ispyb/common/util/Constants.java b/ispyb-ejb/src/main/java/ispyb/common/util/Constants.java
index 7d9fb14a1..f1a25b92f 100644
--- 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;

From 73b043bb27763559b7628f8badb0252ed792f82f Mon Sep 17 00:00:00 2001
From: Olof Svensson <svensson@linsvensson.esrf.fr>
Date: Wed, 2 May 2018 16:49:03 +0200
Subject: [PATCH 2/4] Issue #285 : Updated release notes.

---
 ispyb-ui/src/main/webapp/help/release_notes.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ispyb-ui/src/main/webapp/help/release_notes.txt b/ispyb-ui/src/main/webapp/help/release_notes.txt
index 58fbfd7f0..07a76f5f4 100644
--- a/ispyb-ui/src/main/webapp/help/release_notes.txt
+++ b/ispyb-ui/src/main/webapp/help/release_notes.txt
@@ -1,3 +1,10 @@
+**************
+* 02.05.2018     *
+**************
+
+- fixes issue #285
+
+
 **************
 * 27.02.2018     *
 **************

From dc4b689e5761e6bd4f6d8809d8dde04482bcfc50 Mon Sep 17 00:00:00 2001
From: Olof Svensson <svensson@linsvensson.esrf.fr>
Date: Wed, 2 May 2018 16:52:24 +0200
Subject: [PATCH 3/4] Issue #285 : added missing tag to release notes.

---
 ispyb-ui/src/main/webapp/help/release_notes.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ispyb-ui/src/main/webapp/help/release_notes.txt b/ispyb-ui/src/main/webapp/help/release_notes.txt
index 07a76f5f4..697f2e591 100644
--- a/ispyb-ui/src/main/webapp/help/release_notes.txt
+++ b/ispyb-ui/src/main/webapp/help/release_notes.txt
@@ -4,6 +4,8 @@
 
 - fixes issue #285
 
+New TAG : 5.5.5
+
 
 **************
 * 27.02.2018     *

From 341636157ce4082b69a8ca8fb05244e2731a5867 Mon Sep 17 00:00:00 2001
From: Olof Svensson <svensson@linsvensson.esrf.fr>
Date: Wed, 2 May 2018 16:59:29 +0200
Subject: [PATCH 4/4] Issue #285 : New version 5.5.5

---
 ispyb-bcr-ear/pom.xml | 2 +-
 ispyb-bcr/pom.xml     | 2 +-
 ispyb-ear/pom.xml     | 2 +-
 ispyb-ejb/pom.xml     | 2 +-
 ispyb-ui/pom.xml      | 2 +-
 ispyb-ws/pom.xml      | 2 +-
 pom.xml               | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ispyb-bcr-ear/pom.xml b/ispyb-bcr-ear/pom.xml
index 1dcaa4a37..da6eb84a8 100644
--- 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
index 0034c58f4..b52635578 100644
--- 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
index 7408a74c4..4e2221606 100644
--- 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
index fcd2557a8..7b8a0655c 100644
--- 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-ui/pom.xml b/ispyb-ui/pom.xml
index 0cadfccfe..eb96a5949 100644
--- 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-ws/pom.xml b/ispyb-ws/pom.xml
index 300b23b64..3ad76dd11 100644
--- 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
index c105fc0fc..973f2ddac 100644
--- 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>