From 79e6b3695975cca1fe0e8afc788d739c1ca79018 Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 22 Sep 2017 14:05:24 +0200 Subject: [PATCH 1/6] [GITFLOW]updating poms for 0.6.0-SNAPSHOT development --- sormas-api/pom.xml | 2 +- sormas-app/pom.xml | 2 +- sormas-backend/pom.xml | 2 +- sormas-base/dependencies/bundles.pom | 2 +- sormas-base/dependencies/gf-modules.pom | 2 +- sormas-base/dependencies/serverlibs.pom | 2 +- sormas-base/pom.xml | 2 +- sormas-ear/pom.xml | 2 +- sormas-rest/pom.xml | 2 +- sormas-ui/pom.xml | 2 +- sormas-widgetset/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml index fed5b6f7003..d28c04e46f8 100644 --- a/sormas-api/pom.xml +++ b/sormas-api/pom.xml @@ -2,7 +2,7 @@ de.symeda.sormas sormas-base - 0.5.0-SNAPSHOT + 0.6.0-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml index 4811b30a737..67c299ff356 100644 --- a/sormas-app/pom.xml +++ b/sormas-app/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.5.0-SNAPSHOT + 0.6.0-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml index 58457cff61b..59dc6e45e28 100644 --- a/sormas-backend/pom.xml +++ b/sormas-backend/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.5.0-SNAPSHOT + 0.6.0-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-base/dependencies/bundles.pom b/sormas-base/dependencies/bundles.pom index 1883dda09d3..70f7425f789 100644 --- a/sormas-base/dependencies/bundles.pom +++ b/sormas-base/dependencies/bundles.pom @@ -9,7 +9,7 @@ sormas-base de.symeda.sormas - 0.5.0-SNAPSHOT + 0.6.0-SNAPSHOT ../ diff --git a/sormas-base/dependencies/gf-modules.pom b/sormas-base/dependencies/gf-modules.pom index 9120de2f131..63cd35fd7c4 100644 --- a/sormas-base/dependencies/gf-modules.pom +++ b/sormas-base/dependencies/gf-modules.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 0.5.0-SNAPSHOT + 0.6.0-SNAPSHOT ../ diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom index 06070231f67..427e2204b21 100644 --- a/sormas-base/dependencies/serverlibs.pom +++ b/sormas-base/dependencies/serverlibs.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 0.5.0-SNAPSHOT + 0.6.0-SNAPSHOT ../ diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml index bc8cf1d5fc8..f40ca617e93 100644 --- a/sormas-base/pom.xml +++ b/sormas-base/pom.xml @@ -5,7 +5,7 @@ de.symeda.sormas sormas-base pom - 0.5.0-SNAPSHOT + 0.6.0-SNAPSHOT 3.0 diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml index ddbae548a5e..ad7dd843a8e 100644 --- a/sormas-ear/pom.xml +++ b/sormas-ear/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 0.5.0-SNAPSHOT + 0.6.0-SNAPSHOT ../sormas-base diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml index 26c3442ec74..1ce3b466fbc 100644 --- a/sormas-rest/pom.xml +++ b/sormas-rest/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 0.5.0-SNAPSHOT + 0.6.0-SNAPSHOT ../sormas-base diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml index 8c5374eb58d..5d171378436 100644 --- a/sormas-ui/pom.xml +++ b/sormas-ui/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.5.0-SNAPSHOT + 0.6.0-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml index d3ece1fa363..6c81a807fc6 100644 --- a/sormas-widgetset/pom.xml +++ b/sormas-widgetset/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.5.0-SNAPSHOT + 0.6.0-SNAPSHOT ../sormas-base 4.0.0 From 2d1fc570e40a0408394c0a26c69c7357e850227e Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 22 Sep 2017 14:09:19 +0200 Subject: [PATCH 2/6] [GITFLOW]updating develop poms to master versions to avoid merge conflicts --- sormas-api/pom.xml | 2 +- sormas-app/pom.xml | 2 +- sormas-backend/pom.xml | 2 +- sormas-base/dependencies/bundles.pom | 2 +- sormas-base/dependencies/gf-modules.pom | 2 +- sormas-base/dependencies/serverlibs.pom | 2 +- sormas-base/pom.xml | 2 +- sormas-ear/pom.xml | 2 +- sormas-rest/pom.xml | 2 +- sormas-ui/pom.xml | 2 +- sormas-widgetset/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml index d28c04e46f8..7495d71617f 100644 --- a/sormas-api/pom.xml +++ b/sormas-api/pom.xml @@ -2,7 +2,7 @@ de.symeda.sormas sormas-base - 0.6.0-SNAPSHOT + 0.5.0 ../sormas-base 4.0.0 diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml index 67c299ff356..b3d69690d88 100644 --- a/sormas-app/pom.xml +++ b/sormas-app/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.6.0-SNAPSHOT + 0.5.0 ../sormas-base 4.0.0 diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml index 59dc6e45e28..d494b1c350c 100644 --- a/sormas-backend/pom.xml +++ b/sormas-backend/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.6.0-SNAPSHOT + 0.5.0 ../sormas-base 4.0.0 diff --git a/sormas-base/dependencies/bundles.pom b/sormas-base/dependencies/bundles.pom index 70f7425f789..5ac2b619590 100644 --- a/sormas-base/dependencies/bundles.pom +++ b/sormas-base/dependencies/bundles.pom @@ -9,7 +9,7 @@ sormas-base de.symeda.sormas - 0.6.0-SNAPSHOT + 0.5.0 ../ diff --git a/sormas-base/dependencies/gf-modules.pom b/sormas-base/dependencies/gf-modules.pom index 63cd35fd7c4..06725195853 100644 --- a/sormas-base/dependencies/gf-modules.pom +++ b/sormas-base/dependencies/gf-modules.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 0.6.0-SNAPSHOT + 0.5.0 ../ diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom index 427e2204b21..f636d37559a 100644 --- a/sormas-base/dependencies/serverlibs.pom +++ b/sormas-base/dependencies/serverlibs.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 0.6.0-SNAPSHOT + 0.5.0 ../ diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml index f40ca617e93..246132c3a1f 100644 --- a/sormas-base/pom.xml +++ b/sormas-base/pom.xml @@ -5,7 +5,7 @@ de.symeda.sormas sormas-base pom - 0.6.0-SNAPSHOT + 0.5.0 3.0 diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml index ad7dd843a8e..53467880977 100644 --- a/sormas-ear/pom.xml +++ b/sormas-ear/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 0.6.0-SNAPSHOT + 0.5.0 ../sormas-base diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml index 1ce3b466fbc..35f895680e1 100644 --- a/sormas-rest/pom.xml +++ b/sormas-rest/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 0.6.0-SNAPSHOT + 0.5.0 ../sormas-base diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml index 5d171378436..1458af79f11 100644 --- a/sormas-ui/pom.xml +++ b/sormas-ui/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.6.0-SNAPSHOT + 0.5.0 ../sormas-base 4.0.0 diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml index 6c81a807fc6..7254f1fb6b7 100644 --- a/sormas-widgetset/pom.xml +++ b/sormas-widgetset/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.6.0-SNAPSHOT + 0.5.0 ../sormas-base 4.0.0 From 40cab2fdbe4587a7afcfca0f2dbaf3c2c37cbd94 Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 22 Sep 2017 14:09:21 +0200 Subject: [PATCH 3/6] [GITFLOW]Updating develop poms back to pre merge state --- sormas-api/pom.xml | 2 +- sormas-app/pom.xml | 2 +- sormas-backend/pom.xml | 2 +- sormas-base/dependencies/bundles.pom | 2 +- sormas-base/dependencies/gf-modules.pom | 2 +- sormas-base/dependencies/serverlibs.pom | 2 +- sormas-base/pom.xml | 2 +- sormas-ear/pom.xml | 2 +- sormas-rest/pom.xml | 2 +- sormas-ui/pom.xml | 2 +- sormas-widgetset/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml index 7495d71617f..d28c04e46f8 100644 --- a/sormas-api/pom.xml +++ b/sormas-api/pom.xml @@ -2,7 +2,7 @@ de.symeda.sormas sormas-base - 0.5.0 + 0.6.0-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml index b3d69690d88..67c299ff356 100644 --- a/sormas-app/pom.xml +++ b/sormas-app/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.5.0 + 0.6.0-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml index d494b1c350c..59dc6e45e28 100644 --- a/sormas-backend/pom.xml +++ b/sormas-backend/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.5.0 + 0.6.0-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-base/dependencies/bundles.pom b/sormas-base/dependencies/bundles.pom index 5ac2b619590..70f7425f789 100644 --- a/sormas-base/dependencies/bundles.pom +++ b/sormas-base/dependencies/bundles.pom @@ -9,7 +9,7 @@ sormas-base de.symeda.sormas - 0.5.0 + 0.6.0-SNAPSHOT ../ diff --git a/sormas-base/dependencies/gf-modules.pom b/sormas-base/dependencies/gf-modules.pom index 06725195853..63cd35fd7c4 100644 --- a/sormas-base/dependencies/gf-modules.pom +++ b/sormas-base/dependencies/gf-modules.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 0.5.0 + 0.6.0-SNAPSHOT ../ diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom index f636d37559a..427e2204b21 100644 --- a/sormas-base/dependencies/serverlibs.pom +++ b/sormas-base/dependencies/serverlibs.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 0.5.0 + 0.6.0-SNAPSHOT ../ diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml index 246132c3a1f..f40ca617e93 100644 --- a/sormas-base/pom.xml +++ b/sormas-base/pom.xml @@ -5,7 +5,7 @@ de.symeda.sormas sormas-base pom - 0.5.0 + 0.6.0-SNAPSHOT 3.0 diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml index 53467880977..ad7dd843a8e 100644 --- a/sormas-ear/pom.xml +++ b/sormas-ear/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 0.5.0 + 0.6.0-SNAPSHOT ../sormas-base diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml index 35f895680e1..1ce3b466fbc 100644 --- a/sormas-rest/pom.xml +++ b/sormas-rest/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 0.5.0 + 0.6.0-SNAPSHOT ../sormas-base diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml index 1458af79f11..5d171378436 100644 --- a/sormas-ui/pom.xml +++ b/sormas-ui/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.5.0 + 0.6.0-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml index 7254f1fb6b7..6c81a807fc6 100644 --- a/sormas-widgetset/pom.xml +++ b/sormas-widgetset/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.5.0 + 0.6.0-SNAPSHOT ../sormas-base 4.0.0 From 8aa93193b8a2729fb00a41a74158f73da9b2631c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=A9=20Strysewske?= Date: Wed, 4 Oct 2017 09:40:59 +0200 Subject: [PATCH 4/6] #353 - Fixed server crashing when trying to log in as an Admin --- .../de/symeda/sormas/backend/caze/CaseService.java | 2 ++ .../sormas/backend/contact/ContactService.java | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseService.java index 3e9b1786def..23f9a6a5f81 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseService.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseService.java @@ -163,6 +163,8 @@ public Predicate createUserFilter(CriteriaBuilder cb, CriteriaQuery cq, From getMapContacts(Date fromDate, Date toDate, Disease disease, if (toDate != null) { dateFilter = cb.and(dateFilter, cb.lessThanOrEqualTo(from.get(Contact.REPORT_DATE_TIME), toDate)); } - filter = cb.and(filter, dateFilter); + if (filter != null) { + filter = cb.and(filter, dateFilter); + } else { + filter = dateFilter; + } } if (disease != null) { Join contactCase = from.join(Contact.CAZE); @@ -129,7 +133,11 @@ public List getMapContacts(Date fromDate, Date toDate, Disease disease, filter = cb.and(filter, diseaseFilter); } // Only retrieve contacts that are currently under follow-up - filter = cb.and(filter, cb.equal(from.get(Contact.FOLLOW_UP_STATUS), FollowUpStatus.FOLLOW_UP)); + if (filter != null) { + filter = cb.and(filter, cb.equal(from.get(Contact.FOLLOW_UP_STATUS), FollowUpStatus.FOLLOW_UP)); + } else { + filter = cb.equal(from.get(Contact.FOLLOW_UP_STATUS), FollowUpStatus.FOLLOW_UP); + } cq.where(filter); return em.createQuery(cq).getResultList(); } From be5578cff7c278a0d6a25c50c360975237fcf679 Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 4 Oct 2017 11:02:51 +0200 Subject: [PATCH 5/6] [GITFLOW]updating poms for 0.5.1 branch with snapshot versions --- sormas-api/pom.xml | 2 +- sormas-app/pom.xml | 2 +- sormas-backend/pom.xml | 2 +- sormas-base/dependencies/bundles.pom | 2 +- sormas-base/dependencies/gf-modules.pom | 2 +- sormas-base/dependencies/serverlibs.pom | 2 +- sormas-base/pom.xml | 2 +- sormas-ear/pom.xml | 2 +- sormas-rest/pom.xml | 2 +- sormas-ui/pom.xml | 2 +- sormas-widgetset/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml index d28c04e46f8..6be19ec8b37 100644 --- a/sormas-api/pom.xml +++ b/sormas-api/pom.xml @@ -2,7 +2,7 @@ de.symeda.sormas sormas-base - 0.6.0-SNAPSHOT + 0.5.1-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml index 67c299ff356..68b6d4b56d5 100644 --- a/sormas-app/pom.xml +++ b/sormas-app/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.6.0-SNAPSHOT + 0.5.1-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml index 59dc6e45e28..60119fec9b5 100644 --- a/sormas-backend/pom.xml +++ b/sormas-backend/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.6.0-SNAPSHOT + 0.5.1-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-base/dependencies/bundles.pom b/sormas-base/dependencies/bundles.pom index 70f7425f789..073d2676f34 100644 --- a/sormas-base/dependencies/bundles.pom +++ b/sormas-base/dependencies/bundles.pom @@ -9,7 +9,7 @@ sormas-base de.symeda.sormas - 0.6.0-SNAPSHOT + 0.5.1-SNAPSHOT ../ diff --git a/sormas-base/dependencies/gf-modules.pom b/sormas-base/dependencies/gf-modules.pom index 63cd35fd7c4..c4d9b43899d 100644 --- a/sormas-base/dependencies/gf-modules.pom +++ b/sormas-base/dependencies/gf-modules.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 0.6.0-SNAPSHOT + 0.5.1-SNAPSHOT ../ diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom index 427e2204b21..45348e889e9 100644 --- a/sormas-base/dependencies/serverlibs.pom +++ b/sormas-base/dependencies/serverlibs.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 0.6.0-SNAPSHOT + 0.5.1-SNAPSHOT ../ diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml index f40ca617e93..d17602e33c0 100644 --- a/sormas-base/pom.xml +++ b/sormas-base/pom.xml @@ -5,7 +5,7 @@ de.symeda.sormas sormas-base pom - 0.6.0-SNAPSHOT + 0.5.1-SNAPSHOT 3.0 diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml index ad7dd843a8e..696fd8ec317 100644 --- a/sormas-ear/pom.xml +++ b/sormas-ear/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 0.6.0-SNAPSHOT + 0.5.1-SNAPSHOT ../sormas-base diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml index 1ce3b466fbc..44c3214aa21 100644 --- a/sormas-rest/pom.xml +++ b/sormas-rest/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 0.6.0-SNAPSHOT + 0.5.1-SNAPSHOT ../sormas-base diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml index 5d171378436..024abc38c41 100644 --- a/sormas-ui/pom.xml +++ b/sormas-ui/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.6.0-SNAPSHOT + 0.5.1-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml index 6c81a807fc6..b3b5e4c0b12 100644 --- a/sormas-widgetset/pom.xml +++ b/sormas-widgetset/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.6.0-SNAPSHOT + 0.5.1-SNAPSHOT ../sormas-base 4.0.0 From c83fe0f9f7da247419d7e19cbfd501d7c232df89 Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 4 Oct 2017 11:02:59 +0200 Subject: [PATCH 6/6] [GITFLOW]updating poms for branch'release-0.5.1' with non-snapshot versions --- sormas-api/pom.xml | 2 +- sormas-app/pom.xml | 2 +- sormas-backend/pom.xml | 2 +- sormas-base/dependencies/bundles.pom | 2 +- sormas-base/dependencies/gf-modules.pom | 2 +- sormas-base/dependencies/serverlibs.pom | 2 +- sormas-base/pom.xml | 2 +- sormas-ear/pom.xml | 2 +- sormas-rest/pom.xml | 2 +- sormas-ui/pom.xml | 2 +- sormas-widgetset/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml index 6be19ec8b37..5f76c92896c 100644 --- a/sormas-api/pom.xml +++ b/sormas-api/pom.xml @@ -2,7 +2,7 @@ de.symeda.sormas sormas-base - 0.5.1-SNAPSHOT + 0.5.1 ../sormas-base 4.0.0 diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml index 68b6d4b56d5..54ccbd96a8e 100644 --- a/sormas-app/pom.xml +++ b/sormas-app/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.5.1-SNAPSHOT + 0.5.1 ../sormas-base 4.0.0 diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml index 60119fec9b5..7234736f964 100644 --- a/sormas-backend/pom.xml +++ b/sormas-backend/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.5.1-SNAPSHOT + 0.5.1 ../sormas-base 4.0.0 diff --git a/sormas-base/dependencies/bundles.pom b/sormas-base/dependencies/bundles.pom index 073d2676f34..683cf798556 100644 --- a/sormas-base/dependencies/bundles.pom +++ b/sormas-base/dependencies/bundles.pom @@ -9,7 +9,7 @@ sormas-base de.symeda.sormas - 0.5.1-SNAPSHOT + 0.5.1 ../ diff --git a/sormas-base/dependencies/gf-modules.pom b/sormas-base/dependencies/gf-modules.pom index c4d9b43899d..a6083b294d0 100644 --- a/sormas-base/dependencies/gf-modules.pom +++ b/sormas-base/dependencies/gf-modules.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 0.5.1-SNAPSHOT + 0.5.1 ../ diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom index 45348e889e9..85c30673093 100644 --- a/sormas-base/dependencies/serverlibs.pom +++ b/sormas-base/dependencies/serverlibs.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 0.5.1-SNAPSHOT + 0.5.1 ../ diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml index d17602e33c0..3230dc12e16 100644 --- a/sormas-base/pom.xml +++ b/sormas-base/pom.xml @@ -5,7 +5,7 @@ de.symeda.sormas sormas-base pom - 0.5.1-SNAPSHOT + 0.5.1 3.0 diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml index 696fd8ec317..bd6a04348df 100644 --- a/sormas-ear/pom.xml +++ b/sormas-ear/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 0.5.1-SNAPSHOT + 0.5.1 ../sormas-base diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml index 44c3214aa21..f4fe48d7780 100644 --- a/sormas-rest/pom.xml +++ b/sormas-rest/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 0.5.1-SNAPSHOT + 0.5.1 ../sormas-base diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml index 024abc38c41..82be8af9f67 100644 --- a/sormas-ui/pom.xml +++ b/sormas-ui/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.5.1-SNAPSHOT + 0.5.1 ../sormas-base 4.0.0 diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml index b3b5e4c0b12..0ccff887f09 100644 --- a/sormas-widgetset/pom.xml +++ b/sormas-widgetset/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 0.5.1-SNAPSHOT + 0.5.1 ../sormas-base 4.0.0