diff --git a/Makefile b/Makefile
index 0b2a4d17..a931e3ef 100644
--- a/Makefile
+++ b/Makefile
@@ -12,3 +12,6 @@ docker:
echo tagging georchestra/gateway:$${TAG} as georchestra/gateway:latest && \
docker tag georchestra/gateway:$${TAG} georchestra/gateway:latest && \
docker images|grep "georchestra/gateway"|grep latest
+
+deb: install
+ ./mvnw package deb:package -f gateway/ -PdebianPackage
diff --git a/gateway/pom.xml b/gateway/pom.xml
index d20c9fe8..53777875 100644
--- a/gateway/pom.xml
+++ b/gateway/pom.xml
@@ -360,5 +360,97 @@
+
+ debianPackage
+
+ ${project.artifactId}
+
+
+ pl.project13.maven
+ git-commit-id-plugin
+ 4.9.10
+
+
+
+ revision
+
+
+
+
+ build
+ false
+ false
+ false
+
+ true
+
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+ 3.3.1
+
+
+ copy-deb-resources
+ process-resources
+
+ copy-resources
+
+
+ true
+ ${project.build.directory}/deb
+
+
+ src/deb/resources
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+ 3.1.0
+
+
+ set-project-packageversion
+ package
+
+ run
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+ net.sf.debian-maven
+ debian-maven-plugin
+ 1.0.6
+
+ georchestra-gateway
+ geOrchestra Gateway
+ ${project.packageVersion}
+ geOrchestra
+ PSC
+ psc@georchestra.org
+ true
+
+
+
+
+
+ yyyyMMddHHmm
+
+
diff --git a/gateway/src/main/java/org/georchestra/gateway/accounts/admin/AccountManager.java b/gateway/src/main/java/org/georchestra/gateway/accounts/admin/AccountManager.java
index 6074c642..dee2e77a 100644
--- a/gateway/src/main/java/org/georchestra/gateway/accounts/admin/AccountManager.java
+++ b/gateway/src/main/java/org/georchestra/gateway/accounts/admin/AccountManager.java
@@ -38,7 +38,8 @@ public interface AccountManager {
* @param mappedUser the user {@link ResolveGeorchestraUserGlobalFilter}
* resolved by calling
* {@link GeorchestraUserMapper#resolve(Authentication)}
- * @return the stored version of the user if it exists, otherwise an empty Optional
+ * @return the stored version of the user if it exists, otherwise an empty
+ * Optional
*/
Optional find(GeorchestraUser mappedUser);
diff --git a/gateway/src/test/java/org/georchestra/gateway/accounts/admin/CreateAccountUserCustomizerIT.java b/gateway/src/test/java/org/georchestra/gateway/accounts/admin/CreateAccountUserCustomizerIT.java
index 74cd65b0..cf4583f1 100644
--- a/gateway/src/test/java/org/georchestra/gateway/accounts/admin/CreateAccountUserCustomizerIT.java
+++ b/gateway/src/test/java/org/georchestra/gateway/accounts/admin/CreateAccountUserCustomizerIT.java
@@ -147,9 +147,10 @@ private WebTestClient.RequestHeadersUriSpec> prepareWebTestClientHeaders(
.is2xxSuccessful()//
.expectBody()//
.jsonPath("$.GeorchestraUser").isNotEmpty()//
- .jsonPath("$.GeorchestraUser.roles").value(Matchers.contains("ROLE_ADMINISTRATOR", //
+ .jsonPath("$.GeorchestraUser.roles").value(Matchers.hasItems("ROLE_ADMINISTRATOR", //
"ROLE_SUPERUSER", //
"ROLE_GN_ADMIN", //
+ "ROLE_IMPORT", //
"ROLE_USER", //
"ROLE_MAPSTORE_ADMIN", //
"ROLE_EMAILPROXY"));