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 @@ ispyb ispyb-parent - 5.5.4 + 5.5.5 ispyb-bcr-ear ear 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 @@ ispyb ispyb-parent - 5.5.4 + 5.5.5 ispyb-bcr 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 @@ ispyb ispyb-parent - 5.5.4 + 5.5.5 ispyb-ear ear 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 @@ ispyb ispyb-parent - 5.5.4 + 5.5.5 ispyb-ejb3 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; 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 @@ ispyb ispyb-parent - 5.5.4 + 5.5.5 ispyb-ui diff --git a/ispyb-ui/src/main/webapp/help/release_notes.txt b/ispyb-ui/src/main/webapp/help/release_notes.txt index 58fbfd7f0..697f2e591 100644 --- 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 index 300b23b64..3ad76dd11 100644 --- a/ispyb-ws/pom.xml +++ b/ispyb-ws/pom.xml @@ -4,7 +4,7 @@ ispyb ispyb-parent - 5.5.4 + 5.5.5 ispyb-ws war diff --git a/pom.xml b/pom.xml index c105fc0fc..973f2ddac 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ispyb ispyb-parent - 5.5.4 + 5.5.5 pom