Preparing release 5.4.0

ispyb · Nov 24, 2017 · 66efc19 · 66efc19
1 parent a683168
commit 66efc19
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 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.3.4</version>
+		<version>5.4.0</version>
 	</parent>
 	<artifactId>ispyb-bcr-ear</artifactId>
 	<packaging>ear</packaging>

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.3.4</version>
+		<version>5.4.0</version>
 	</parent>
 	<artifactId>ispyb-ear</artifactId>
 	<packaging>ear</packaging>
@@ -26,7 +26,7 @@
 			<groupId>ispyb</groupId>
 			<artifactId>ispyb-ws</artifactId>
 			<type>war</type>
-			<version>5.3.4</version>
+			<version>5.4.0</version>
 		</dependency>
 
 

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.3.2</version>
+		<version>5.4.0</version>
 	</parent>
 	<artifactId>ispyb-ejb3</artifactId>
 	<packaging>jar</packaging>

diff --git a/ispyb-ws/pom.xml b/ispyb-ws/pom.xml
@@ -5,7 +5,7 @@
 		<groupId>ispyb</groupId>
 		<artifactId>ispyb-parent</artifactId>
 
-		<version>5.3.4</version>
+		<version>5.4.0</version>
 
 	</parent>
 	<artifactId>ispyb-ws</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,11 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ispyb</groupId>
 	<artifactId>ispyb-parent</artifactId>
-<<<<<<< HEAD
-	<version>5.3.3</version>
-=======
-	<version>5.3.4</version>
->>>>>>> 66ef7cb61104b682856ec2bcac4afeb801009417
+	<version>5.4.0</version>
+
 	<packaging>pom</packaging>
 	<modules>
 		<module>ispyb-ejb</module>