Merge branch 'master' of https://github.com/ispyb/ISPyB

ispyb · Oct 15, 2018 · e32196a · e32196a
2 parents 8e7d82c + 53d9366
commit e32196a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/...ies/ispyb-WSclient-userportal-gen-1.4.jar → dependencies/ispyb-userportal-gen-1.5.jar b/...ies/ispyb-WSclient-userportal-gen-1.4.jar → dependencies/ispyb-userportal-gen-1.5.jar
diff --git a/ispyb-ejb/lib/ispyb-userportal-gen-1.5.jar b/ispyb-ejb/lib/ispyb-userportal-gen-1.5.jar
diff --git a/ispyb-ejb/pom.xml b/ispyb-ejb/pom.xml
@@ -179,8 +179,8 @@
 
 		<dependency>
 			<groupId>ispyb</groupId>
-			<artifactId>ispyb-WSclient-userportal-gen</artifactId>
-			<version>1.4</version>
+			<artifactId>ispyb-userportal-gen</artifactId>
+			<version>1.5</version>
 		</dependency>
 
 		<dependency>