diff --git a/nuxeo-admin-center/nuxeo-admin-center-monitoring/pom.xml b/nuxeo-admin-center/nuxeo-admin-center-monitoring/pom.xml
index f11bc09744..c5be34ff07 100644
--- a/nuxeo-admin-center/nuxeo-admin-center-monitoring/pom.xml
+++ b/nuxeo-admin-center/nuxeo-admin-center-monitoring/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-admin-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/nuxeo-admin-center/nuxeo-admin-center-oauth-opensocial/pom.xml b/nuxeo-admin-center/nuxeo-admin-center-oauth-opensocial/pom.xml
index 9de9044bb8..62d781f233 100644
--- a/nuxeo-admin-center/nuxeo-admin-center-oauth-opensocial/pom.xml
+++ b/nuxeo-admin-center/nuxeo-admin-center-oauth-opensocial/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-admin-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/nuxeo-admin-center/nuxeo-admin-center-oauth-opensocial/src/main/resources/OSGI-INF/directory-layout-contrib.xml b/nuxeo-admin-center/nuxeo-admin-center-oauth-opensocial/src/main/resources/OSGI-INF/directory-layout-contrib.xml
index 2af58a7274..654fd242cd 100644
--- a/nuxeo-admin-center/nuxeo-admin-center-oauth-opensocial/src/main/resources/OSGI-INF/directory-layout-contrib.xml
+++ b/nuxeo-admin-center/nuxeo-admin-center-oauth-opensocial/src/main/resources/OSGI-INF/directory-layout-contrib.xml
@@ -740,4 +740,4 @@
   </extension>
 
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-admin-center/nuxeo-admin-center/pom.xml b/nuxeo-admin-center/nuxeo-admin-center/pom.xml
index 363654bcad..e332db5813 100644
--- a/nuxeo-admin-center/nuxeo-admin-center/pom.xml
+++ b/nuxeo-admin-center/nuxeo-admin-center/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-admin-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/nuxeo-admin-center/nuxeo-admin-center/src/main/resources/themes/theme-galaxy-admin.xml b/nuxeo-admin-center/nuxeo-admin-center/src/main/resources/themes/theme-galaxy-admin.xml
index ddeb35a319..4f5027e739 100644
--- a/nuxeo-admin-center/nuxeo-admin-center/src/main/resources/themes/theme-galaxy-admin.xml
+++ b/nuxeo-admin-center/nuxeo-admin-center/src/main/resources/themes/theme-galaxy-admin.xml
@@ -1278,4 +1278,4 @@
     <!-- main fragment for default page & popup -->
     <style element="page[1]/section[2]/cell[1]/fragment[1]" inherit="common style 1" />
   </formats>
-</theme>
\ No newline at end of file
+</theme>
diff --git a/nuxeo-admin-center/nuxeo-connect-client-wrapper/pom.xml b/nuxeo-admin-center/nuxeo-connect-client-wrapper/pom.xml
index 639ad63460..dbf42a96e2 100644
--- a/nuxeo-admin-center/nuxeo-connect-client-wrapper/pom.xml
+++ b/nuxeo-admin-center/nuxeo-connect-client-wrapper/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-admin-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/nuxeo-admin-center/nuxeo-connect-client-wrapper/src/main/resources/OSGI-INF/connect-client-framework.xml b/nuxeo-admin-center/nuxeo-connect-client-wrapper/src/main/resources/OSGI-INF/connect-client-framework.xml
index 1f67490761..6659265d43 100644
--- a/nuxeo-admin-center/nuxeo-connect-client-wrapper/src/main/resources/OSGI-INF/connect-client-framework.xml
+++ b/nuxeo-admin-center/nuxeo-connect-client-wrapper/src/main/resources/OSGI-INF/connect-client-framework.xml
@@ -13,4 +13,4 @@
             interface="org.nuxeo.connect.packages.PackageManager" />
     </service>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-admin-center/nuxeo-connect-client-wrapper/src/main/resources/OSGI-INF/runtimeserver-contrib.xml b/nuxeo-admin-center/nuxeo-connect-client-wrapper/src/main/resources/OSGI-INF/runtimeserver-contrib.xml
index 2c611a6d10..fe2da4022d 100644
--- a/nuxeo-admin-center/nuxeo-connect-client-wrapper/src/main/resources/OSGI-INF/runtimeserver-contrib.xml
+++ b/nuxeo-admin-center/nuxeo-connect-client-wrapper/src/main/resources/OSGI-INF/runtimeserver-contrib.xml
@@ -5,4 +5,4 @@
       <root>web/root.war</root>
     </webapp>
   </extension>
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-admin-center/nuxeo-connect-offline-update/pom.xml b/nuxeo-admin-center/nuxeo-connect-offline-update/pom.xml
index 155fed6bcd..a583561827 100644
--- a/nuxeo-admin-center/nuxeo-connect-offline-update/pom.xml
+++ b/nuxeo-admin-center/nuxeo-connect-offline-update/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-admin-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/nuxeo-admin-center/nuxeo-connect-update/pom.xml b/nuxeo-admin-center/nuxeo-connect-update/pom.xml
index ee771ffc9b..4ae207116d 100644
--- a/nuxeo-admin-center/nuxeo-connect-update/pom.xml
+++ b/nuxeo-admin-center/nuxeo-connect-update/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-admin-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/nuxeo-admin-center/pom.xml b/nuxeo-admin-center/pom.xml
index 51c333a161..9b784ab602 100644
--- a/nuxeo-admin-center/pom.xml
+++ b/nuxeo-admin-center/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-features-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/nuxeo-automation/nuxeo-automation-client/pom.xml b/nuxeo-automation/nuxeo-automation-client/pom.xml
index a9660765ff..468f8006e1 100644
--- a/nuxeo-automation/nuxeo-automation-client/pom.xml
+++ b/nuxeo-automation/nuxeo-automation-client/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.automation</groupId>
     <artifactId>nuxeo-automation-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <artifactId>nuxeo-automation-client</artifactId>
   <name>Nuxeo Automation Client</name>
diff --git a/nuxeo-automation/nuxeo-automation-core/pom.xml b/nuxeo-automation/nuxeo-automation-core/pom.xml
index 02c3f20d01..b53a452e6c 100644
--- a/nuxeo-automation/nuxeo-automation-core/pom.xml
+++ b/nuxeo-automation/nuxeo-automation-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.automation</groupId>
     <artifactId>nuxeo-automation-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <artifactId>nuxeo-automation-core</artifactId>
   <name>Nuxeo Automation Core</name>
diff --git a/nuxeo-automation/nuxeo-automation-core/src/main/resources/META-INF/MANIFEST.MF b/nuxeo-automation/nuxeo-automation-core/src/main/resources/META-INF/MANIFEST.MF
index 08a9bc5a73..1ec1412314 100644
--- a/nuxeo-automation/nuxeo-automation-core/src/main/resources/META-INF/MANIFEST.MF
+++ b/nuxeo-automation/nuxeo-automation-core/src/main/resources/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Version: 5.4.1.qualifier
+Bundle-Version: 5.4.2.qualifier
 Bundle-Name: Nuxeo Automation Core
 Bundle-SymbolicName: org.nuxeo.ecm.automation.core;singleton:=true
 Bundle-Vendor: Nuxeo
diff --git a/nuxeo-automation/nuxeo-automation-features/pom.xml b/nuxeo-automation/nuxeo-automation-features/pom.xml
index 46cdcbc92f..ac96fc3b87 100644
--- a/nuxeo-automation/nuxeo-automation-features/pom.xml
+++ b/nuxeo-automation/nuxeo-automation-features/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.automation</groupId>
     <artifactId>nuxeo-automation-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <artifactId>nuxeo-automation-features</artifactId>
   <name>Nuxeo Automation Features</name>
diff --git a/nuxeo-automation/nuxeo-automation-jsf/pom.xml b/nuxeo-automation/nuxeo-automation-jsf/pom.xml
index fb2aafe935..d6a7e94ab6 100644
--- a/nuxeo-automation/nuxeo-automation-jsf/pom.xml
+++ b/nuxeo-automation/nuxeo-automation-jsf/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>nuxeo-automation-parent</artifactId>
     <groupId>org.nuxeo.ecm.automation</groupId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.nuxeo.ecm.automation</groupId>
diff --git a/nuxeo-automation/nuxeo-automation-jsf/src/main/resources/OSGI-INF/operations-contrib.xml b/nuxeo-automation/nuxeo-automation-jsf/src/main/resources/OSGI-INF/operations-contrib.xml
index b44273c31d..b78caccb2a 100644
--- a/nuxeo-automation/nuxeo-automation-jsf/src/main/resources/OSGI-INF/operations-contrib.xml
+++ b/nuxeo-automation/nuxeo-automation-jsf/src/main/resources/OSGI-INF/operations-contrib.xml
@@ -34,4 +34,4 @@
     <operation class="org.nuxeo.ecm.automation.jsf.operations.CreateDocumentForm" />
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-automation/nuxeo-automation-server/pom.xml b/nuxeo-automation/nuxeo-automation-server/pom.xml
index 345d719505..f71d36aa34 100644
--- a/nuxeo-automation/nuxeo-automation-server/pom.xml
+++ b/nuxeo-automation/nuxeo-automation-server/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.automation</groupId>
     <artifactId>nuxeo-automation-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <artifactId>nuxeo-automation-server</artifactId>
   <name>Nuxeo Automation Server</name>
diff --git a/nuxeo-automation/nuxeo-automation-server/src/main/resources/META-INF/MANIFEST.MF b/nuxeo-automation/nuxeo-automation-server/src/main/resources/META-INF/MANIFEST.MF
index 31deb1dba6..7333c6a252 100644
--- a/nuxeo-automation/nuxeo-automation-server/src/main/resources/META-INF/MANIFEST.MF
+++ b/nuxeo-automation/nuxeo-automation-server/src/main/resources/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Version: 5.4.1.qualifier
+Bundle-Version: 5.4.2.qualifier
 Bundle-Name: Nuxeo Automation Server
 Bundle-SymbolicName: org.nuxeo.ecm.automation.server;singleton:=true
 Bundle-Vendor: Nuxeo
diff --git a/nuxeo-automation/pom.xml b/nuxeo-automation/pom.xml
index aab32f8812..29a52c0bcc 100644
--- a/nuxeo-automation/pom.xml
+++ b/nuxeo-automation/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-features-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.automation</groupId>
diff --git a/nuxeo-features-test/pom.xml b/nuxeo-features-test/pom.xml
index 96b68e5652..c7b784533e 100644
--- a/nuxeo-features-test/pom.xml
+++ b/nuxeo-features-test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-features-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-features-test</artifactId>
diff --git a/nuxeo-features-test/src/main/resources/runtimeserver-contrib.xml b/nuxeo-features-test/src/main/resources/runtimeserver-contrib.xml
index 2c611a6d10..fe2da4022d 100644
--- a/nuxeo-features-test/src/main/resources/runtimeserver-contrib.xml
+++ b/nuxeo-features-test/src/main/resources/runtimeserver-contrib.xml
@@ -5,4 +5,4 @@
       <root>web/root.war</root>
     </webapp>
   </extension>
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-annotations/nuxeo-platform-annotations-api/pom.xml b/nuxeo-platform-annotations/nuxeo-platform-annotations-api/pom.xml
index 932803ea73..777034ff85 100644
--- a/nuxeo-platform-annotations/nuxeo-platform-annotations-api/pom.xml
+++ b/nuxeo-platform-annotations/nuxeo-platform-annotations-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-annotations-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-annotations/nuxeo-platform-annotations-core-contrib/pom.xml b/nuxeo-platform-annotations/nuxeo-platform-annotations-core-contrib/pom.xml
index be3ebad6b7..7bb48d904a 100644
--- a/nuxeo-platform-annotations/nuxeo-platform-annotations-core-contrib/pom.xml
+++ b/nuxeo-platform-annotations/nuxeo-platform-annotations-core-contrib/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-annotations-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <groupId>org.nuxeo.ecm.platform</groupId>
   <artifactId>nuxeo-platform-annotations-core-contrib</artifactId>
diff --git a/nuxeo-platform-annotations/nuxeo-platform-annotations-core-contrib/src/main/resources/OSGI-INF/annotation-repository-jena-contrib.xml b/nuxeo-platform-annotations/nuxeo-platform-annotations-core-contrib/src/main/resources/OSGI-INF/annotation-repository-jena-contrib.xml
index cc844e0209..a8bd178453 100644
--- a/nuxeo-platform-annotations/nuxeo-platform-annotations-core-contrib/src/main/resources/OSGI-INF/annotation-repository-jena-contrib.xml
+++ b/nuxeo-platform-annotations/nuxeo-platform-annotations-core-contrib/src/main/resources/OSGI-INF/annotation-repository-jena-contrib.xml
@@ -19,4 +19,4 @@
       </namespaces>
     </graph>
   </extension>
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-annotations/nuxeo-platform-annotations-core/pom.xml b/nuxeo-platform-annotations/nuxeo-platform-annotations-core/pom.xml
index 835eb33972..180a09463a 100644
--- a/nuxeo-platform-annotations/nuxeo-platform-annotations-core/pom.xml
+++ b/nuxeo-platform-annotations/nuxeo-platform-annotations-core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-annotations-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <groupId>org.nuxeo.ecm.platform</groupId>
   <artifactId>nuxeo-platform-annotations-core</artifactId>
diff --git a/nuxeo-platform-annotations/nuxeo-platform-annotations-core/src/main/resources/OSGI-INF/annotations-default-contrib.xml b/nuxeo-platform-annotations/nuxeo-platform-annotations-core/src/main/resources/OSGI-INF/annotations-default-contrib.xml
index 7ee257d5ca..84953c3f50 100644
--- a/nuxeo-platform-annotations/nuxeo-platform-annotations-core/src/main/resources/OSGI-INF/annotations-default-contrib.xml
+++ b/nuxeo-platform-annotations/nuxeo-platform-annotations-core/src/main/resources/OSGI-INF/annotations-default-contrib.xml
@@ -49,4 +49,4 @@
 			<deleteAnnotation>deleteAnnotation</deleteAnnotation>
 		</permissionMapper>
 	</extension>
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-annotations/nuxeo-platform-annotations-core/src/main/resources/OSGI-INF/nxannotations.xml b/nuxeo-platform-annotations/nuxeo-platform-annotations-core/src/main/resources/OSGI-INF/nxannotations.xml
index c35fd0b413..43bef99464 100644
--- a/nuxeo-platform-annotations/nuxeo-platform-annotations-core/src/main/resources/OSGI-INF/nxannotations.xml
+++ b/nuxeo-platform-annotations/nuxeo-platform-annotations-core/src/main/resources/OSGI-INF/nxannotations.xml
@@ -79,4 +79,4 @@
 		<object
 			class="org.nuxeo.ecm.platform.annotations.descriptors.PermissionMapperDescriptor" />
 	</extension-point>
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-annotations/nuxeo-platform-annotations-core/src/main/resources/test-ann-contrib.xml b/nuxeo-platform-annotations/nuxeo-platform-annotations-core/src/main/resources/test-ann-contrib.xml
index cc18a264c7..5878e75bc7 100644
--- a/nuxeo-platform-annotations/nuxeo-platform-annotations-core/src/main/resources/test-ann-contrib.xml
+++ b/nuxeo-platform-annotations/nuxeo-platform-annotations-core/src/main/resources/test-ann-contrib.xml
@@ -6,4 +6,4 @@
     point="eventListener">
     <listener class="org.nuxeo.ecm.platform.annotations.FakeEventListener" />
   </extension>
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-annotations/nuxeo-platform-annotations-core/src/test/resources/post-rdf.xml b/nuxeo-platform-annotations/nuxeo-platform-annotations-core/src/test/resources/post-rdf.xml
index 4dd926c583..f0bfb0d750 100644
--- a/nuxeo-platform-annotations/nuxeo-platform-annotations-core/src/test/resources/post-rdf.xml
+++ b/nuxeo-platform-annotations/nuxeo-platform-annotations-core/src/test/resources/post-rdf.xml
@@ -25,4 +25,4 @@
       </h:Message>
     </a:body>
   </r:Description>
-</r:RDF>
\ No newline at end of file
+</r:RDF>
diff --git a/nuxeo-platform-annotations/nuxeo-platform-annotations-facade/pom.xml b/nuxeo-platform-annotations/nuxeo-platform-annotations-facade/pom.xml
index efb917e499..6513ba1c7c 100644
--- a/nuxeo-platform-annotations/nuxeo-platform-annotations-facade/pom.xml
+++ b/nuxeo-platform-annotations/nuxeo-platform-annotations-facade/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-annotations-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-annotations/nuxeo-platform-annotations-http/pom.xml b/nuxeo-platform-annotations/nuxeo-platform-annotations-http/pom.xml
index c8e2ce832a..41dcaeeec5 100644
--- a/nuxeo-platform-annotations/nuxeo-platform-annotations-http/pom.xml
+++ b/nuxeo-platform-annotations/nuxeo-platform-annotations-http/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-annotations-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <groupId>org.nuxeo.ecm.platform</groupId>
   <artifactId>nuxeo-platform-annotations-http</artifactId>
diff --git a/nuxeo-platform-annotations/nuxeo-platform-annotations-repository-plugin/pom.xml b/nuxeo-platform-annotations/nuxeo-platform-annotations-repository-plugin/pom.xml
index 796a536cdf..dbf0eb5342 100644
--- a/nuxeo-platform-annotations/nuxeo-platform-annotations-repository-plugin/pom.xml
+++ b/nuxeo-platform-annotations/nuxeo-platform-annotations-repository-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-annotations-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <groupId>org.nuxeo.ecm.platform</groupId>
   <artifactId>nuxeo-platform-annotations-repository-plugin</artifactId>
diff --git a/nuxeo-platform-annotations/nuxeo-platform-annotations-repository-plugin/src/main/resources/OSGI-INF/AnnotationsRepositoryService.xml b/nuxeo-platform-annotations/nuxeo-platform-annotations-repository-plugin/src/main/resources/OSGI-INF/AnnotationsRepositoryService.xml
index 35bea6ba5c..10360d3723 100644
--- a/nuxeo-platform-annotations/nuxeo-platform-annotations-repository-plugin/src/main/resources/OSGI-INF/AnnotationsRepositoryService.xml
+++ b/nuxeo-platform-annotations/nuxeo-platform-annotations-repository-plugin/src/main/resources/OSGI-INF/AnnotationsRepositoryService.xml
@@ -20,4 +20,4 @@
   <extension-point name="securityManager">
     <object class="org.nuxeo.ecm.platform.annotations.repository.descriptor.SecurityManagerDescriptor"/>
   </extension-point>
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-annotations/nuxeo-platform-annotations-repository-plugin/src/main/resources/OSGI-INF/annotations-repository-core-contrib.xml b/nuxeo-platform-annotations/nuxeo-platform-annotations-repository-plugin/src/main/resources/OSGI-INF/annotations-repository-core-contrib.xml
index 981c008ddb..206ea7d902 100644
--- a/nuxeo-platform-annotations/nuxeo-platform-annotations-repository-plugin/src/main/resources/OSGI-INF/annotations-repository-core-contrib.xml
+++ b/nuxeo-platform-annotations/nuxeo-platform-annotations-repository-plugin/src/main/resources/OSGI-INF/annotations-repository-core-contrib.xml
@@ -44,4 +44,4 @@
 		<listener
 			class="org.nuxeo.ecm.platform.annotations.repository.core.AnnotationEventListener" />
 	</extension>
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-annotations/nuxeo-platform-annotations-web/pom.xml b/nuxeo-platform-annotations/nuxeo-platform-annotations-web/pom.xml
index 765f31e84c..312bbc45d4 100644
--- a/nuxeo-platform-annotations/nuxeo-platform-annotations-web/pom.xml
+++ b/nuxeo-platform-annotations/nuxeo-platform-annotations-web/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-annotations-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <groupId>org.nuxeo.ecm.platform</groupId>
   <artifactId>nuxeo-platform-annotations-web</artifactId>
diff --git a/nuxeo-platform-annotations/nuxeo-platform-annotations-web/src/main/resources/OSGI-INF/default-contrib.xml b/nuxeo-platform-annotations/nuxeo-platform-annotations-web/src/main/resources/OSGI-INF/default-contrib.xml
index 271f791994..06764a9f67 100644
--- a/nuxeo-platform-annotations/nuxeo-platform-annotations-web/src/main/resources/OSGI-INF/default-contrib.xml
+++ b/nuxeo-platform-annotations/nuxeo-platform-annotations-web/src/main/resources/OSGI-INF/default-contrib.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <component name="org.nuxeo.ecm.platform.annotations.client">
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-annotations/nuxeo-platform-annotations-web/src/main/resources/OSGI-INF/preview-adapter-contrib.xml b/nuxeo-platform-annotations/nuxeo-platform-annotations-web/src/main/resources/OSGI-INF/preview-adapter-contrib.xml
index 257bc699d4..4e0a9d2602 100644
--- a/nuxeo-platform-annotations/nuxeo-platform-annotations-web/src/main/resources/OSGI-INF/preview-adapter-contrib.xml
+++ b/nuxeo-platform-annotations/nuxeo-platform-annotations-web/src/main/resources/OSGI-INF/preview-adapter-contrib.xml
@@ -7,4 +7,4 @@
       class="org.nuxeo.ecm.platform.annotations.preview.AnnotationBlobPostProcessor" />
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-annotations/pom.xml b/nuxeo-platform-annotations/pom.xml
index f90731334e..a419d252be 100644
--- a/nuxeo-platform-annotations/pom.xml
+++ b/nuxeo-platform-annotations/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>nuxeo-features-parent</artifactId>
     <groupId>org.nuxeo.ecm.platform</groupId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <groupId>org.nuxeo.ecm.platform</groupId>
   <artifactId>nuxeo-platform-annotations-parent</artifactId>
diff --git a/nuxeo-platform-audit/nuxeo-platform-audit-api/pom.xml b/nuxeo-platform-audit/nuxeo-platform-audit-api/pom.xml
index 4c7da579fe..c2f14acadf 100644
--- a/nuxeo-platform-audit/nuxeo-platform-audit-api/pom.xml
+++ b/nuxeo-platform-audit/nuxeo-platform-audit-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-audit-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-audit-api</artifactId>
diff --git a/nuxeo-platform-audit/nuxeo-platform-audit-api/src/main/resources/META-INF/MANIFEST.MF b/nuxeo-platform-audit/nuxeo-platform-audit-api/src/main/resources/META-INF/MANIFEST.MF
index f68122ea44..a2c2ca5331 100644
--- a/nuxeo-platform-audit/nuxeo-platform-audit-api/src/main/resources/META-INF/MANIFEST.MF
+++ b/nuxeo-platform-audit/nuxeo-platform-audit-api/src/main/resources/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Bundle-Name: Nuxeo Audit API
 Created-By: 1.6.0_20 (Sun Microsystems Inc.)
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Nuxeo
-Bundle-Version: 5.4.1.qualifier
+Bundle-Version: 5.4.2.qualifier
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.nuxeo.ecm.platform.audit.api
 Import-Package: org.nuxeo.ecm.core.api;api=split,
diff --git a/nuxeo-platform-audit/nuxeo-platform-audit-client/pom.xml b/nuxeo-platform-audit/nuxeo-platform-audit-client/pom.xml
index b9e9f34197..a262c1310c 100644
--- a/nuxeo-platform-audit/nuxeo-platform-audit-client/pom.xml
+++ b/nuxeo-platform-audit/nuxeo-platform-audit-client/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-audit-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-audit-client</artifactId>
diff --git a/nuxeo-platform-audit/nuxeo-platform-audit-core/pom.xml b/nuxeo-platform-audit/nuxeo-platform-audit-core/pom.xml
index ab1a83b4ab..ef96ede8b6 100644
--- a/nuxeo-platform-audit/nuxeo-platform-audit-core/pom.xml
+++ b/nuxeo-platform-audit/nuxeo-platform-audit-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-audit-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-audit-core</artifactId>
diff --git a/nuxeo-platform-audit/nuxeo-platform-audit-core/src/main/resources/META-INF/persistence.xml b/nuxeo-platform-audit/nuxeo-platform-audit-core/src/main/resources/META-INF/persistence.xml
index 0298c30bea..dc53d15463 100644
--- a/nuxeo-platform-audit/nuxeo-platform-audit-core/src/main/resources/META-INF/persistence.xml
+++ b/nuxeo-platform-audit/nuxeo-platform-audit-core/src/main/resources/META-INF/persistence.xml
@@ -19,4 +19,4 @@
 			<property name="hibernate.hbm2ddl.auto" value="update" />
 		</properties>
 	</persistence-unit>
-</persistence>
\ No newline at end of file
+</persistence>
diff --git a/nuxeo-platform-audit/nuxeo-platform-audit-core/src/test/resources/test-audit-contrib.xml b/nuxeo-platform-audit/nuxeo-platform-audit-core/src/test/resources/test-audit-contrib.xml
index de5c0e3389..f12d6b69ba 100644
--- a/nuxeo-platform-audit/nuxeo-platform-audit-core/src/test/resources/test-audit-contrib.xml
+++ b/nuxeo-platform-audit/nuxeo-platform-audit-core/src/test/resources/test-audit-contrib.xml
@@ -32,4 +32,4 @@
         <extendedInfo expression="${principal.name}" key="user" />
     </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-audit/nuxeo-platform-audit-facade/pom.xml b/nuxeo-platform-audit/nuxeo-platform-audit-facade/pom.xml
index 2c7daf8cc9..7b6e4eed53 100644
--- a/nuxeo-platform-audit/nuxeo-platform-audit-facade/pom.xml
+++ b/nuxeo-platform-audit/nuxeo-platform-audit-facade/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-audit-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-audit-facade</artifactId>
diff --git a/nuxeo-platform-audit/nuxeo-platform-audit-facade/src/main/resources/META-INF/jboss.xml b/nuxeo-platform-audit/nuxeo-platform-audit-facade/src/main/resources/META-INF/jboss.xml
index ce1c3c6ef4..cea11f6216 100644
--- a/nuxeo-platform-audit/nuxeo-platform-audit-facade/src/main/resources/META-INF/jboss.xml
+++ b/nuxeo-platform-audit/nuxeo-platform-audit-facade/src/main/resources/META-INF/jboss.xml
@@ -13,4 +13,4 @@
       </method-attributes>
     </session>
   </enterprise-beans>
-</jboss>
\ No newline at end of file
+</jboss>
diff --git a/nuxeo-platform-audit/nuxeo-platform-audit-io/pom.xml b/nuxeo-platform-audit/nuxeo-platform-audit-io/pom.xml
index 0eba15e201..5c85abdf96 100644
--- a/nuxeo-platform-audit/nuxeo-platform-audit-io/pom.xml
+++ b/nuxeo-platform-audit/nuxeo-platform-audit-io/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-audit-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-audit-io</artifactId>
diff --git a/nuxeo-platform-audit/nuxeo-platform-audit-io/src/main/resources/OSGI-INF/io-audit-contrib.xml b/nuxeo-platform-audit/nuxeo-platform-audit-io/src/main/resources/OSGI-INF/io-audit-contrib.xml
index c719de751d..37dbed0aa8 100644
--- a/nuxeo-platform-audit/nuxeo-platform-audit-io/src/main/resources/OSGI-INF/io-audit-contrib.xml
+++ b/nuxeo-platform-audit/nuxeo-platform-audit-io/src/main/resources/OSGI-INF/io-audit-contrib.xml
@@ -28,4 +28,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-audit/nuxeo-platform-audit-search/pom.xml b/nuxeo-platform-audit/nuxeo-platform-audit-search/pom.xml
index a5e2fb6203..ead62e8f6e 100644
--- a/nuxeo-platform-audit/nuxeo-platform-audit-search/pom.xml
+++ b/nuxeo-platform-audit/nuxeo-platform-audit-search/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-audit-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-audit-search</artifactId>
diff --git a/nuxeo-platform-audit/nuxeo-platform-audit-search/src/main/resources/OSGI-INF/nxsearch-contrib.xml b/nuxeo-platform-audit/nuxeo-platform-audit-search/src/main/resources/OSGI-INF/nxsearch-contrib.xml
index 008830165a..0590e5679d 100644
--- a/nuxeo-platform-audit/nuxeo-platform-audit-search/src/main/resources/OSGI-INF/nxsearch-contrib.xml
+++ b/nuxeo-platform-audit/nuxeo-platform-audit-search/src/main/resources/OSGI-INF/nxsearch-contrib.xml
@@ -6,4 +6,4 @@
       factoryClass="org.nuxeo.ecm.platform.audit.search.resources.indexing.AuditIndexableResourceFactory"/>
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-audit/nuxeo-platform-audit-search/src/test/resources/nxsearch-test-contrib.xml b/nuxeo-platform-audit/nuxeo-platform-audit-search/src/test/resources/nxsearch-test-contrib.xml
index d9dd847b48..28bd63e335 100644
--- a/nuxeo-platform-audit/nuxeo-platform-audit-search/src/test/resources/nxsearch-test-contrib.xml
+++ b/nuxeo-platform-audit/nuxeo-platform-audit-search/src/test/resources/nxsearch-test-contrib.xml
@@ -25,4 +25,4 @@
 	</resource>
 
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-audit/nuxeo-platform-audit-ws/pom.xml b/nuxeo-platform-audit/nuxeo-platform-audit-ws/pom.xml
index 78a8455352..634c10f48a 100644
--- a/nuxeo-platform-audit/nuxeo-platform-audit-ws/pom.xml
+++ b/nuxeo-platform-audit/nuxeo-platform-audit-ws/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-audit-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-audit-ws</artifactId>
diff --git a/nuxeo-platform-audit/pom.xml b/nuxeo-platform-audit/pom.xml
index 2266d2887c..b6305d3580 100644
--- a/nuxeo-platform-audit/pom.xml
+++ b/nuxeo-platform-audit/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>nuxeo-features-parent</artifactId>
     <groupId>org.nuxeo.ecm.platform</groupId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-comment/nuxeo-platform-comment-api/pom.xml b/nuxeo-platform-comment/nuxeo-platform-comment-api/pom.xml
index e86c1a7b11..0fdda554b1 100644
--- a/nuxeo-platform-comment/nuxeo-platform-comment-api/pom.xml
+++ b/nuxeo-platform-comment/nuxeo-platform-comment-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-comment-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-comment-api</artifactId>
diff --git a/nuxeo-platform-comment/nuxeo-platform-comment-core/pom.xml b/nuxeo-platform-comment/nuxeo-platform-comment-core/pom.xml
index 0f3f56d3f4..601030b2da 100644
--- a/nuxeo-platform-comment/nuxeo-platform-comment-core/pom.xml
+++ b/nuxeo-platform-comment/nuxeo-platform-comment-core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-comment-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-comment-core</artifactId>
diff --git a/nuxeo-platform-comment/nuxeo-platform-comment-core/src/main/resources/OSGI-INF/comment-defaultPermissions-contrib.xml b/nuxeo-platform-comment/nuxeo-platform-comment-core/src/main/resources/OSGI-INF/comment-defaultPermissions-contrib.xml
index e2316780a1..5fcb2a8ddf 100644
--- a/nuxeo-platform-comment/nuxeo-platform-comment-core/src/main/resources/OSGI-INF/comment-defaultPermissions-contrib.xml
+++ b/nuxeo-platform-comment/nuxeo-platform-comment-core/src/main/resources/OSGI-INF/comment-defaultPermissions-contrib.xml
@@ -28,4 +28,4 @@
     </configuration>
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-comment/nuxeo-platform-comment-web/pom.xml b/nuxeo-platform-comment/nuxeo-platform-comment-web/pom.xml
index 1a3fde4948..63ba0d2240 100644
--- a/nuxeo-platform-comment/nuxeo-platform-comment-web/pom.xml
+++ b/nuxeo-platform-comment/nuxeo-platform-comment-web/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-comment-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-comment-web</artifactId>
diff --git a/nuxeo-platform-comment/nuxeo-platform-comment-workflow/pom.xml b/nuxeo-platform-comment/nuxeo-platform-comment-workflow/pom.xml
index 7d57aed167..f42348a9c2 100644
--- a/nuxeo-platform-comment/nuxeo-platform-comment-workflow/pom.xml
+++ b/nuxeo-platform-comment/nuxeo-platform-comment-workflow/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-comment-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-comment-workflow</artifactId>
diff --git a/nuxeo-platform-comment/nuxeo-platform-comment-workflow/src/main/resources/OSGI-INF/comment-jbpm-contrib.xml b/nuxeo-platform-comment/nuxeo-platform-comment-workflow/src/main/resources/OSGI-INF/comment-jbpm-contrib.xml
index f0dfd5ae12..54fc84facd 100644
--- a/nuxeo-platform-comment/nuxeo-platform-comment-workflow/src/main/resources/OSGI-INF/comment-jbpm-contrib.xml
+++ b/nuxeo-platform-comment/nuxeo-platform-comment-workflow/src/main/resources/OSGI-INF/comment-jbpm-contrib.xml
@@ -8,4 +8,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-comment/nuxeo-platform-comment-workflow/src/main/resources/OSGI-INF/comments-moderation-service.xml b/nuxeo-platform-comment/nuxeo-platform-comment-workflow/src/main/resources/OSGI-INF/comments-moderation-service.xml
index 53d88dcb62..ddddc849d3 100644
--- a/nuxeo-platform-comment/nuxeo-platform-comment-workflow/src/main/resources/OSGI-INF/comments-moderation-service.xml
+++ b/nuxeo-platform-comment/nuxeo-platform-comment-workflow/src/main/resources/OSGI-INF/comments-moderation-service.xml
@@ -11,4 +11,4 @@
  <implementation
   class="org.nuxeo.ecm.platform.comment.workflow.services.CommentsModerationServiceImpl" />
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-comment/nuxeo-platform-comment-workflow/src/main/resources/process/comments-moderation.xml b/nuxeo-platform-comment/nuxeo-platform-comment-workflow/src/main/resources/process/comments-moderation.xml
index fbc77c9bbd..0e91e22478 100644
--- a/nuxeo-platform-comment/nuxeo-platform-comment-workflow/src/main/resources/process/comments-moderation.xml
+++ b/nuxeo-platform-comment/nuxeo-platform-comment-workflow/src/main/resources/process/comments-moderation.xml
@@ -26,4 +26,4 @@
 
   <end-state name="end" />
 
-</process-definition>
\ No newline at end of file
+</process-definition>
diff --git a/nuxeo-platform-comment/nuxeo-platform-comment/pom.xml b/nuxeo-platform-comment/nuxeo-platform-comment/pom.xml
index 2ebcaecac4..a64e320a28 100644
--- a/nuxeo-platform-comment/nuxeo-platform-comment/pom.xml
+++ b/nuxeo-platform-comment/nuxeo-platform-comment/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-comment-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-comment</artifactId>
diff --git a/nuxeo-platform-comment/nuxeo-platform-comment/src/main/resources/OSGI-INF/comment-listener-contrib.xml b/nuxeo-platform-comment/nuxeo-platform-comment/src/main/resources/OSGI-INF/comment-listener-contrib.xml
index 7ae105631e..1960f817a9 100644
--- a/nuxeo-platform-comment/nuxeo-platform-comment/src/main/resources/OSGI-INF/comment-listener-contrib.xml
+++ b/nuxeo-platform-comment/nuxeo-platform-comment/src/main/resources/OSGI-INF/comment-listener-contrib.xml
@@ -15,4 +15,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-comment/pom.xml b/nuxeo-platform-comment/pom.xml
index 1a50b7db70..1cfe9d4a9d 100644
--- a/nuxeo-platform-comment/pom.xml
+++ b/nuxeo-platform-comment/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>nuxeo-features-parent</artifactId>
     <groupId>org.nuxeo.ecm.platform</groupId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-domsync-core/pom.xml b/nuxeo-platform-domsync-core/pom.xml
index d597219408..749c3b3e47 100644
--- a/nuxeo-platform-domsync-core/pom.xml
+++ b/nuxeo-platform-domsync-core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-features-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-domsync-core</artifactId>
diff --git a/nuxeo-platform-forms-layout-export/pom.xml b/nuxeo-platform-forms-layout-export/pom.xml
index db0ff8654e..647c9ae6b8 100644
--- a/nuxeo-platform-forms-layout-export/pom.xml
+++ b/nuxeo-platform-forms-layout-export/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-features-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-forms-layout-export</artifactId>
diff --git a/nuxeo-platform-forum/nuxeo-platform-forum-api/pom.xml b/nuxeo-platform-forum/nuxeo-platform-forum-api/pom.xml
index e54f524e76..7f8c507dc6 100644
--- a/nuxeo-platform-forum/nuxeo-platform-forum-api/pom.xml
+++ b/nuxeo-platform-forum/nuxeo-platform-forum-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-forum-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-forum-api</artifactId>
diff --git a/nuxeo-platform-forum/nuxeo-platform-forum-core/pom.xml b/nuxeo-platform-forum/nuxeo-platform-forum-core/pom.xml
index d360b1c63b..7760d27753 100644
--- a/nuxeo-platform-forum/nuxeo-platform-forum-core/pom.xml
+++ b/nuxeo-platform-forum/nuxeo-platform-forum-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-forum-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-forum-core</artifactId>
diff --git a/nuxeo-platform-forum/nuxeo-platform-forum-workflow/pom.xml b/nuxeo-platform-forum/nuxeo-platform-forum-workflow/pom.xml
index f9b604f960..92ac20b925 100644
--- a/nuxeo-platform-forum/nuxeo-platform-forum-workflow/pom.xml
+++ b/nuxeo-platform-forum/nuxeo-platform-forum-workflow/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-forum-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-forum-workflow</artifactId>
diff --git a/nuxeo-platform-forum/nuxeo-platform-forum-workflow/src/main/resources/OSGI-INF/forum-jbpm-contrib.xml b/nuxeo-platform-forum/nuxeo-platform-forum-workflow/src/main/resources/OSGI-INF/forum-jbpm-contrib.xml
index 557af2f0d0..a9e0e016de 100644
--- a/nuxeo-platform-forum/nuxeo-platform-forum-workflow/src/main/resources/OSGI-INF/forum-jbpm-contrib.xml
+++ b/nuxeo-platform-forum/nuxeo-platform-forum-workflow/src/main/resources/OSGI-INF/forum-jbpm-contrib.xml
@@ -8,4 +8,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-forum/nuxeo-platform-forum-workflow/src/main/resources/process/forum-moderation.xml b/nuxeo-platform-forum/nuxeo-platform-forum-workflow/src/main/resources/process/forum-moderation.xml
index ba116f60eb..3f78cd0ccd 100644
--- a/nuxeo-platform-forum/nuxeo-platform-forum-workflow/src/main/resources/process/forum-moderation.xml
+++ b/nuxeo-platform-forum/nuxeo-platform-forum-workflow/src/main/resources/process/forum-moderation.xml
@@ -27,4 +27,4 @@
 
   <end-state name="end" />
 
-</process-definition>
\ No newline at end of file
+</process-definition>
diff --git a/nuxeo-platform-forum/nuxeo-platform-forum/pom.xml b/nuxeo-platform-forum/nuxeo-platform-forum/pom.xml
index a4dcdbdd77..8656c42383 100644
--- a/nuxeo-platform-forum/nuxeo-platform-forum/pom.xml
+++ b/nuxeo-platform-forum/nuxeo-platform-forum/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-forum-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-forum</artifactId>
diff --git a/nuxeo-platform-forum/nuxeo-platform-forum/src/main/resources/OSGI-INF/forum-types-contrib.xml b/nuxeo-platform-forum/nuxeo-platform-forum/src/main/resources/OSGI-INF/forum-types-contrib.xml
index f97daafb18..24f0cb4288 100644
--- a/nuxeo-platform-forum/nuxeo-platform-forum/src/main/resources/OSGI-INF/forum-types-contrib.xml
+++ b/nuxeo-platform-forum/nuxeo-platform-forum/src/main/resources/OSGI-INF/forum-types-contrib.xml
@@ -51,4 +51,4 @@
     </type>
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-forum/pom.xml b/nuxeo-platform-forum/pom.xml
index 8335941a22..8bc7b14776 100644
--- a/nuxeo-platform-forum/pom.xml
+++ b/nuxeo-platform-forum/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>nuxeo-features-parent</artifactId>
     <groupId>org.nuxeo.ecm.platform</groupId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling-preview/build.xml b/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling-preview/build.xml
index 4e8394ad36..ae36d4382a 100644
--- a/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling-preview/build.xml
+++ b/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling-preview/build.xml
@@ -22,4 +22,4 @@
       <arg value="${mvn.opts2}" />
     </exec>
   </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling-preview/pom.xml b/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling-preview/pom.xml
index 6d1d2fbd77..05e9348af1 100644
--- a/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling-preview/pom.xml
+++ b/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling-preview/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-imaging-tiling-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-imaging-tiling-preview</artifactId>
diff --git a/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling-preview/src/main/resources/OSGI-INF/preview-contrib.xml b/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling-preview/src/main/resources/OSGI-INF/preview-contrib.xml
index 8a2d101fde..a2047f1e32 100644
--- a/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling-preview/src/main/resources/OSGI-INF/preview-contrib.xml
+++ b/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling-preview/src/main/resources/OSGI-INF/preview-contrib.xml
@@ -9,4 +9,4 @@
       <pattern>image.*</pattern>
     </previewer>
   </extension>
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling/pom.xml b/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling/pom.xml
index ade29b8228..40eafe4880 100644
--- a/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling/pom.xml
+++ b/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-imaging-tiling-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-imaging-tiling</artifactId>
diff --git a/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling/src/main/resources/OSGI-INF/restAPI-contrib.xml b/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling/src/main/resources/OSGI-INF/restAPI-contrib.xml
index 7836c12f34..40c0adf42e 100644
--- a/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling/src/main/resources/OSGI-INF/restAPI-contrib.xml
+++ b/nuxeo-platform-imaging-tiling/nuxeo-platform-imaging-tiling/src/main/resources/OSGI-INF/restAPI-contrib.xml
@@ -21,4 +21,4 @@
     </restletPlugin>
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-imaging-tiling/pom.xml b/nuxeo-platform-imaging-tiling/pom.xml
index 06047f8b3e..66d428cd59 100644
--- a/nuxeo-platform-imaging-tiling/pom.xml
+++ b/nuxeo-platform-imaging-tiling/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>nuxeo-features-parent</artifactId>
     <groupId>org.nuxeo.ecm.platform</groupId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-imaging/nuxeo-platform-imaging-api/pom.xml b/nuxeo-platform-imaging/nuxeo-platform-imaging-api/pom.xml
index 3e2fbe9523..45e80b94ac 100644
--- a/nuxeo-platform-imaging/nuxeo-platform-imaging-api/pom.xml
+++ b/nuxeo-platform-imaging/nuxeo-platform-imaging-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-imaging-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-imaging/nuxeo-platform-imaging-api/src/main/resources/OSGI-INF/picture-blobholder-contrib.xml b/nuxeo-platform-imaging/nuxeo-platform-imaging-api/src/main/resources/OSGI-INF/picture-blobholder-contrib.xml
index 6e4164a818..cd6bcd6475 100644
--- a/nuxeo-platform-imaging/nuxeo-platform-imaging-api/src/main/resources/OSGI-INF/picture-blobholder-contrib.xml
+++ b/nuxeo-platform-imaging/nuxeo-platform-imaging-api/src/main/resources/OSGI-INF/picture-blobholder-contrib.xml
@@ -10,4 +10,4 @@
                        class="org.nuxeo.ecm.platform.picture.api.adapters.PictureBlobHolderFactory" />
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-imaging/nuxeo-platform-imaging-convert/pom.xml b/nuxeo-platform-imaging/nuxeo-platform-imaging-convert/pom.xml
index a8bf2532e2..2c52ff7605 100644
--- a/nuxeo-platform-imaging/nuxeo-platform-imaging-convert/pom.xml
+++ b/nuxeo-platform-imaging/nuxeo-platform-imaging-convert/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-imaging-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-imaging/nuxeo-platform-imaging-core/pom.xml b/nuxeo-platform-imaging/nuxeo-platform-imaging-core/pom.xml
index d90047eca7..7ca82f8c1f 100644
--- a/nuxeo-platform-imaging/nuxeo-platform-imaging-core/pom.xml
+++ b/nuxeo-platform-imaging/nuxeo-platform-imaging-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-imaging-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-imaging/nuxeo-platform-imaging-core/src/main/resources/OSGI-INF/libraryselector-config-framework.xml b/nuxeo-platform-imaging/nuxeo-platform-imaging-core/src/main/resources/OSGI-INF/libraryselector-config-framework.xml
index 8360573dcf..e1b1013d95 100644
--- a/nuxeo-platform-imaging/nuxeo-platform-imaging-core/src/main/resources/OSGI-INF/libraryselector-config-framework.xml
+++ b/nuxeo-platform-imaging/nuxeo-platform-imaging-core/src/main/resources/OSGI-INF/libraryselector-config-framework.xml
@@ -36,4 +36,4 @@
           name="ImageJ"/>
     </LibrarySelector>
   </extension>
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-imaging/nuxeo-platform-imaging-dm/pom.xml b/nuxeo-platform-imaging/nuxeo-platform-imaging-dm/pom.xml
index b11c2d5ea1..e957c858f8 100644
--- a/nuxeo-platform-imaging/nuxeo-platform-imaging-dm/pom.xml
+++ b/nuxeo-platform-imaging/nuxeo-platform-imaging-dm/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-imaging-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <description>
diff --git a/nuxeo-platform-imaging/nuxeo-platform-imaging-facade/pom.xml b/nuxeo-platform-imaging/nuxeo-platform-imaging-facade/pom.xml
index c540c9fe42..908b5897c8 100644
--- a/nuxeo-platform-imaging/nuxeo-platform-imaging-facade/pom.xml
+++ b/nuxeo-platform-imaging/nuxeo-platform-imaging-facade/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-imaging-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <description>
diff --git a/nuxeo-platform-imaging/nuxeo-platform-imaging-jsf/pom.xml b/nuxeo-platform-imaging/nuxeo-platform-imaging-jsf/pom.xml
index ab5e9969b3..5346b95f4c 100644
--- a/nuxeo-platform-imaging/nuxeo-platform-imaging-jsf/pom.xml
+++ b/nuxeo-platform-imaging/nuxeo-platform-imaging-jsf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-imaging-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-imaging-jsf</artifactId>
diff --git a/nuxeo-platform-imaging/nuxeo-platform-imaging-preview/pom.xml b/nuxeo-platform-imaging/nuxeo-platform-imaging-preview/pom.xml
index 8c7a3526dc..949b4ffed0 100644
--- a/nuxeo-platform-imaging/nuxeo-platform-imaging-preview/pom.xml
+++ b/nuxeo-platform-imaging/nuxeo-platform-imaging-preview/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-imaging-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-imaging/nuxeo-platform-imaging-preview/src/main/resources/OSGI-INF/preview-adapter-contrib.xml b/nuxeo-platform-imaging/nuxeo-platform-imaging-preview/src/main/resources/OSGI-INF/preview-adapter-contrib.xml
index cfcc37be8e..ca2c8ad47a 100644
--- a/nuxeo-platform-imaging/nuxeo-platform-imaging-preview/src/main/resources/OSGI-INF/preview-adapter-contrib.xml
+++ b/nuxeo-platform-imaging/nuxeo-platform-imaging-preview/src/main/resources/OSGI-INF/preview-adapter-contrib.xml
@@ -13,4 +13,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-imaging/nuxeo-platform-imaging-transform/pom.xml b/nuxeo-platform-imaging/nuxeo-platform-imaging-transform/pom.xml
index 2d82845dd5..9ef1df4120 100644
--- a/nuxeo-platform-imaging/nuxeo-platform-imaging-transform/pom.xml
+++ b/nuxeo-platform-imaging/nuxeo-platform-imaging-transform/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-imaging-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-imaging/nuxeo-platform-imaging-transform/src/test/resources/nxlibraryselector-bundle.xml b/nuxeo-platform-imaging/nuxeo-platform-imaging-transform/src/test/resources/nxlibraryselector-bundle.xml
index ac40fd85b2..6176520616 100644
--- a/nuxeo-platform-imaging/nuxeo-platform-imaging-transform/src/test/resources/nxlibraryselector-bundle.xml
+++ b/nuxeo-platform-imaging/nuxeo-platform-imaging-transform/src/test/resources/nxlibraryselector-bundle.xml
@@ -32,4 +32,4 @@
         name="mistral" />
     </LibrarySelector>
   </extension>
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-imaging/pom.xml b/nuxeo-platform-imaging/pom.xml
index ac60bbe7c4..36be3c7fc1 100644
--- a/nuxeo-platform-imaging/pom.xml
+++ b/nuxeo-platform-imaging/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>nuxeo-features-parent</artifactId>
     <groupId>org.nuxeo.ecm.platform</groupId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-io/nuxeo-platform-io-api/pom.xml b/nuxeo-platform-io/nuxeo-platform-io-api/pom.xml
index 6d83569058..1ac925d6ec 100644
--- a/nuxeo-platform-io/nuxeo-platform-io-api/pom.xml
+++ b/nuxeo-platform-io/nuxeo-platform-io-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-io-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-io-api</artifactId>
diff --git a/nuxeo-platform-io/nuxeo-platform-io-client/pom.xml b/nuxeo-platform-io/nuxeo-platform-io-client/pom.xml
index 46fe806e43..bc1ba3940d 100644
--- a/nuxeo-platform-io/nuxeo-platform-io-client/pom.xml
+++ b/nuxeo-platform-io/nuxeo-platform-io-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-io-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-io-client</artifactId>
diff --git a/nuxeo-platform-io/nuxeo-platform-io-client/src/main/java/org/nuxeo/ecm/platform/io/client/ImportExportActionBean.java b/nuxeo-platform-io/nuxeo-platform-io-client/src/main/java/org/nuxeo/ecm/platform/io/client/ImportExportActionBean.java
index 915cc160f7..faa9e7249c 100644
--- a/nuxeo-platform-io/nuxeo-platform-io-client/src/main/java/org/nuxeo/ecm/platform/io/client/ImportExportActionBean.java
+++ b/nuxeo-platform-io/nuxeo-platform-io-client/src/main/java/org/nuxeo/ecm/platform/io/client/ImportExportActionBean.java
@@ -132,7 +132,7 @@ public String doExportFolder() throws IOException {
     /**
      * Returns the REST URL for export of given document.
      *
-     * @since 5.4.1
+     * @since 5.4.2
      * @param doc the document to export
      * @param exportAsZip a boolean stating if export should be given in ZIP
      *            format. When exporting the tree, ZIP format is forced.
@@ -178,7 +178,7 @@ public String getFolderExportURL() {
     /**
      * Returns the Rest URL for a document export in XML format
      *
-     * @since 5.4.1
+     * @since 5.4.2
      */
     public String getDocumentXMLExportURL() {
         return getExportURL(navigationContext.getCurrentDocument(), false,
@@ -188,7 +188,7 @@ public String getDocumentXMLExportURL() {
     /**
      * Returns the Rest URL for a document export in ZIP format
      *
-     * @since 5.4.1
+     * @since 5.4.2
      */
     public String getDocumentZIPExportURL() {
         return getExportURL(navigationContext.getCurrentDocument(), true, false);
@@ -197,7 +197,7 @@ public String getDocumentZIPExportURL() {
     /**
      * Returns the Rest URL for a document tree export in ZIP format
      *
-     * @since 5.4.1
+     * @since 5.4.2
      * @return
      */
     public String getDocumentZIPTreeExportURL() {
diff --git a/nuxeo-platform-io/nuxeo-platform-io-core/pom.xml b/nuxeo-platform-io/nuxeo-platform-io-core/pom.xml
index ef8458be51..7a8da660f4 100644
--- a/nuxeo-platform-io/nuxeo-platform-io-core/pom.xml
+++ b/nuxeo-platform-io/nuxeo-platform-io-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-io-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-io-core</artifactId>
diff --git a/nuxeo-platform-io/nuxeo-platform-io-core/src/test/resources/nuxeo.properties b/nuxeo-platform-io/nuxeo-platform-io-core/src/test/resources/nuxeo.properties
index 2462bd6ba1..2eaa7a942b 100644
--- a/nuxeo-platform-io/nuxeo-platform-io-core/src/test/resources/nuxeo.properties
+++ b/nuxeo-platform-io/nuxeo-platform-io-core/src/test/resources/nuxeo.properties
@@ -5,7 +5,7 @@ org.nuxeo.ecm.instance.host=localhost
 
 # product config
 org.nuxeo.ecm.product.name=Nuxeo EP
-org.nuxeo.ecm.product.version=5.4.1-SNAPSHOT
+org.nuxeo.ecm.product.version=5.4.2-SNAPSHOT
 
 # runtime remoting config
 org.nuxeo.runtime.server.enabled=true
diff --git a/nuxeo-platform-io/nuxeo-platform-io-facade/pom.xml b/nuxeo-platform-io/nuxeo-platform-io-facade/pom.xml
index dff3d81e14..baf13e7422 100644
--- a/nuxeo-platform-io/nuxeo-platform-io-facade/pom.xml
+++ b/nuxeo-platform-io/nuxeo-platform-io-facade/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-io-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-io-facade</artifactId>
diff --git a/nuxeo-platform-io/pom.xml b/nuxeo-platform-io/pom.xml
index 9628c8b0eb..a658b59893 100644
--- a/nuxeo-platform-io/pom.xml
+++ b/nuxeo-platform-io/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>nuxeo-features-parent</artifactId>
     <groupId>org.nuxeo.ecm.platform</groupId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-api/pom.xml b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-api/pom.xml
index ee5fdb9f09..899f093e02 100644
--- a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-api/pom.xml
+++ b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-jbpm</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-jbpm-api</artifactId>
diff --git a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-automation/pom.xml b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-automation/pom.xml
index ae911bcb31..42f8d878fc 100644
--- a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-automation/pom.xml
+++ b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-automation/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-jbpm</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-jbpm-automation</artifactId>
diff --git a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/pom.xml b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/pom.xml
index 4db1c5471e..f541b73ed4 100644
--- a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/pom.xml
+++ b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-jbpm</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-jbpm-core</artifactId>
diff --git a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/JbpmActiveConfiguration-contrib.xml b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/JbpmActiveConfiguration-contrib.xml
index dfd6a4fdb1..a1c311e5d6 100644
--- a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/JbpmActiveConfiguration-contrib.xml
+++ b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/JbpmActiveConfiguration-contrib.xml
@@ -4,4 +4,4 @@
     point="activeConfiguration">
     <configuration name="runtime" />
   </extension>
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/JbpmService.xml b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/JbpmService.xml
index 212fb927f5..bf11569e2a 100644
--- a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/JbpmService.xml
+++ b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/JbpmService.xml
@@ -57,4 +57,4 @@
       class="org.nuxeo.ecm.platform.jbpm.core.service.TypeFilterDescriptor" />
   </extension-point>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/JbpmTaskListService.xml b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/JbpmTaskListService.xml
index 6399bab952..13b5436886 100644
--- a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/JbpmTaskListService.xml
+++ b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/JbpmTaskListService.xml
@@ -16,4 +16,4 @@
     <provide interface="org.nuxeo.ecm.platform.jbpm.JbpmTaskListService" />
   </service>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/adapter-contrib.xml b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/adapter-contrib.xml
index a329ba0bbb..d4bb5e60cf 100644
--- a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/adapter-contrib.xml
+++ b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/adapter-contrib.xml
@@ -9,4 +9,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/core-types-contrib.xml b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/core-types-contrib.xml
index 5e0ff867da..b7ef3b1ca7 100644
--- a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -33,4 +33,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/jbpmService-contrib.xml b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/jbpmService-contrib.xml
index bb2dfa548b..b39b3f1903 100644
--- a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/jbpmService-contrib.xml
+++ b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/main/resources/OSGI-INF/jbpmService-contrib.xml
@@ -23,4 +23,4 @@
     <configuration name="tomcat" path="config/tomcat-jbpm.cfg.xml" />
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/test/resources/OSGI-INF/jbpmService-contrib.xml b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/test/resources/OSGI-INF/jbpmService-contrib.xml
index 8300a6cd1a..103158bd03 100644
--- a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/test/resources/OSGI-INF/jbpmService-contrib.xml
+++ b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/test/resources/OSGI-INF/jbpmService-contrib.xml
@@ -35,4 +35,4 @@
     </type>
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/test/resources/process/test-foreachfork.xml b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/test/resources/process/test-foreachfork.xml
index 1e13b535b4..25b3ee5807 100644
--- a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/test/resources/process/test-foreachfork.xml
+++ b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/test/resources/process/test-foreachfork.xml
@@ -20,4 +20,4 @@
     <transition to="end" />
   </join>
   <end-state name="end" />
-</process-definition>
\ No newline at end of file
+</process-definition>
diff --git a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/test/resources/xml/smallCommentedFile.xml b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/test/resources/xml/smallCommentedFile.xml
index f0edb1ac08..ffa7834e88 100644
--- a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/test/resources/xml/smallCommentedFile.xml
+++ b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/test/resources/xml/smallCommentedFile.xml
@@ -2,4 +2,4 @@
   <!-- a comment -->
   <bar />
   <!-- another comment -->
-</foo>
\ No newline at end of file
+</foo>
diff --git a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/test/resources/xml/smallXmlFile.xml b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/test/resources/xml/smallXmlFile.xml
index 64003662b2..3a31dc2ebe 100644
--- a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/test/resources/xml/smallXmlFile.xml
+++ b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-core/src/test/resources/xml/smallXmlFile.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <foo>
   <bar />
-</foo>
\ No newline at end of file
+</foo>
diff --git a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-facade/pom.xml b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-facade/pom.xml
index 1c5a654b78..e765e79c70 100644
--- a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-facade/pom.xml
+++ b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-facade/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-jbpm</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-jbpm-facade</artifactId>
diff --git a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-test/pom.xml b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-test/pom.xml
index ecf1fef71b..f9b0f3230a 100644
--- a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-test/pom.xml
+++ b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-test/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-jbpm</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-jbpm-test</artifactId>
diff --git a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-test/src/main/resources/OSGI-INF/test-contrib.xml b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-test/src/main/resources/OSGI-INF/test-contrib.xml
index 2f632950a9..a0cb8aaeac 100644
--- a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-test/src/main/resources/OSGI-INF/test-contrib.xml
+++ b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-test/src/main/resources/OSGI-INF/test-contrib.xml
@@ -17,4 +17,4 @@
     <configuration name="test" />
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-web/pom.xml b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-web/pom.xml
index 245cfa1b2e..507d44399d 100644
--- a/nuxeo-platform-jbpm/nuxeo-platform-jbpm-web/pom.xml
+++ b/nuxeo-platform-jbpm/nuxeo-platform-jbpm-web/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-jbpm</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-jbpm-web</artifactId>
diff --git a/nuxeo-platform-jbpm/pom.xml b/nuxeo-platform-jbpm/pom.xml
index 99470da4ea..7c58ae601f 100644
--- a/nuxeo-platform-jbpm/pom.xml
+++ b/nuxeo-platform-jbpm/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-features-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-jbpm</artifactId>
diff --git a/nuxeo-platform-lang/pom.xml b/nuxeo-platform-lang/pom.xml
index c0efc6d683..44f01d3a9f 100644
--- a/nuxeo-platform-lang/pom.xml
+++ b/nuxeo-platform-lang/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-features-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-lang</artifactId>
diff --git a/nuxeo-platform-localconfiguration-web/pom.xml b/nuxeo-platform-localconfiguration-web/pom.xml
index 138d07699d..757b8cf1b3 100644
--- a/nuxeo-platform-localconfiguration-web/pom.xml
+++ b/nuxeo-platform-localconfiguration-web/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-features-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-localconfiguration-web</artifactId>
diff --git a/nuxeo-platform-mail/nuxeo-platform-mail-core/pom.xml b/nuxeo-platform-mail/nuxeo-platform-mail-core/pom.xml
index c60a37aa3d..4857ee688b 100644
--- a/nuxeo-platform-mail/nuxeo-platform-mail-core/pom.xml
+++ b/nuxeo-platform-mail/nuxeo-platform-mail-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-mail-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/nuxeo-platform-mail/nuxeo-platform-mail-core/src/main/resources/OSGI-INF/nxmail-contrib.xml b/nuxeo-platform-mail/nuxeo-platform-mail-core/src/main/resources/OSGI-INF/nxmail-contrib.xml
index b0ba867a7e..bd1e732562 100644
--- a/nuxeo-platform-mail/nuxeo-platform-mail-core/src/main/resources/OSGI-INF/nxmail-contrib.xml
+++ b/nuxeo-platform-mail/nuxeo-platform-mail-core/src/main/resources/OSGI-INF/nxmail-contrib.xml
@@ -29,4 +29,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-mail/nuxeo-platform-mail-core/src/main/resources/OSGI-INF/nxmail-framework.xml b/nuxeo-platform-mail/nuxeo-platform-mail-core/src/main/resources/OSGI-INF/nxmail-framework.xml
index 5682e0bacb..bcd0f73e64 100644
--- a/nuxeo-platform-mail/nuxeo-platform-mail-core/src/main/resources/OSGI-INF/nxmail-framework.xml
+++ b/nuxeo-platform-mail/nuxeo-platform-mail-core/src/main/resources/OSGI-INF/nxmail-framework.xml
@@ -80,4 +80,4 @@
       class="org.nuxeo.ecm.platform.mail.action.MessageActionPipeDescriptor" />
   </extension-point>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-mail/nuxeo-platform-mail-core/src/main/resources/OSGI-INF/nxmail-listener-contrib.xml b/nuxeo-platform-mail/nuxeo-platform-mail-core/src/main/resources/OSGI-INF/nxmail-listener-contrib.xml
index 041d012d75..d5d4344066 100644
--- a/nuxeo-platform-mail/nuxeo-platform-mail-core/src/main/resources/OSGI-INF/nxmail-listener-contrib.xml
+++ b/nuxeo-platform-mail/nuxeo-platform-mail-core/src/main/resources/OSGI-INF/nxmail-listener-contrib.xml
@@ -9,4 +9,4 @@
     </listener>
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-mail/nuxeo-platform-mail-core/src/test/resources/OSGI-INF/mailService-override-test-contrib.xml b/nuxeo-platform-mail/nuxeo-platform-mail-core/src/test/resources/OSGI-INF/mailService-override-test-contrib.xml
index 772973fe8f..c7fc506a89 100644
--- a/nuxeo-platform-mail/nuxeo-platform-mail-core/src/test/resources/OSGI-INF/mailService-override-test-contrib.xml
+++ b/nuxeo-platform-mail/nuxeo-platform-mail-core/src/test/resources/OSGI-INF/mailService-override-test-contrib.xml
@@ -13,4 +13,4 @@
       </action>
     </pipe>
   </extension>
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-mail/nuxeo-platform-mail-core/src/test/resources/OSGI-INF/mailService-test-contrib.xml b/nuxeo-platform-mail/nuxeo-platform-mail-core/src/test/resources/OSGI-INF/mailService-test-contrib.xml
index 39cf78df7c..ffa8a4cf07 100644
--- a/nuxeo-platform-mail/nuxeo-platform-mail-core/src/test/resources/OSGI-INF/mailService-test-contrib.xml
+++ b/nuxeo-platform-mail/nuxeo-platform-mail-core/src/test/resources/OSGI-INF/mailService-test-contrib.xml
@@ -29,4 +29,4 @@
     </pipe>
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-mail/nuxeo-platform-mail-test/pom.xml b/nuxeo-platform-mail/nuxeo-platform-mail-test/pom.xml
index 0869afd464..01c79074b3 100644
--- a/nuxeo-platform-mail/nuxeo-platform-mail-test/pom.xml
+++ b/nuxeo-platform-mail/nuxeo-platform-mail-test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-mail-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/nuxeo-platform-mail/nuxeo-platform-mail-types/pom.xml b/nuxeo-platform-mail/nuxeo-platform-mail-types/pom.xml
index c0e5b46cd1..e667151f63 100644
--- a/nuxeo-platform-mail/nuxeo-platform-mail-types/pom.xml
+++ b/nuxeo-platform-mail/nuxeo-platform-mail-types/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-mail-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/nuxeo-platform-mail/nuxeo-platform-mail-types/src/main/resources/OSGI-INF/nxmail-core-types-contrib.xml b/nuxeo-platform-mail/nuxeo-platform-mail-types/src/main/resources/OSGI-INF/nxmail-core-types-contrib.xml
index 58734f9f0b..9363b848ae 100644
--- a/nuxeo-platform-mail/nuxeo-platform-mail-types/src/main/resources/OSGI-INF/nxmail-core-types-contrib.xml
+++ b/nuxeo-platform-mail/nuxeo-platform-mail-types/src/main/resources/OSGI-INF/nxmail-core-types-contrib.xml
@@ -28,4 +28,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-mail/nuxeo-platform-mail-web/pom.xml b/nuxeo-platform-mail/nuxeo-platform-mail-web/pom.xml
index 2a3cdb57f1..4b50d78115 100644
--- a/nuxeo-platform-mail/nuxeo-platform-mail-web/pom.xml
+++ b/nuxeo-platform-mail/nuxeo-platform-mail-web/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-mail-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-mail-web</artifactId>
diff --git a/nuxeo-platform-mail/nuxeo-platform-mail-web/src/main/resources/OSGI-INF/nxmail-ecm-types-contrib.xml b/nuxeo-platform-mail/nuxeo-platform-mail-web/src/main/resources/OSGI-INF/nxmail-ecm-types-contrib.xml
index 1012ef89f0..cbe9560d04 100644
--- a/nuxeo-platform-mail/nuxeo-platform-mail-web/src/main/resources/OSGI-INF/nxmail-ecm-types-contrib.xml
+++ b/nuxeo-platform-mail/nuxeo-platform-mail-web/src/main/resources/OSGI-INF/nxmail-ecm-types-contrib.xml
@@ -51,4 +51,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-mail/nuxeo-platform-mail-web/src/main/resources/OSGI-INF/nxmail-layouts-contrib.xml b/nuxeo-platform-mail/nuxeo-platform-mail-web/src/main/resources/OSGI-INF/nxmail-layouts-contrib.xml
index e143d8b1b5..6744730687 100644
--- a/nuxeo-platform-mail/nuxeo-platform-mail-web/src/main/resources/OSGI-INF/nxmail-layouts-contrib.xml
+++ b/nuxeo-platform-mail/nuxeo-platform-mail-web/src/main/resources/OSGI-INF/nxmail-layouts-contrib.xml
@@ -553,4 +553,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-mail/pom.xml b/nuxeo-platform-mail/pom.xml
index 4151b83f3d..bba651162b 100644
--- a/nuxeo-platform-mail/pom.xml
+++ b/nuxeo-platform-mail/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>nuxeo-features-parent</artifactId>
     <groupId>org.nuxeo.ecm.platform</groupId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-notification/nuxeo-platform-notification-api/pom.xml b/nuxeo-platform-notification/nuxeo-platform-notification-api/pom.xml
index 40a59853ea..7d6b9247aa 100644
--- a/nuxeo-platform-notification/nuxeo-platform-notification-api/pom.xml
+++ b/nuxeo-platform-notification/nuxeo-platform-notification-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-notification-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-notification-api</artifactId>
diff --git a/nuxeo-platform-notification/nuxeo-platform-notification-api/src/main/java/org/nuxeo/ecm/platform/notification/api/NotificationManager.java b/nuxeo-platform-notification/nuxeo-platform-notification-api/src/main/java/org/nuxeo/ecm/platform/notification/api/NotificationManager.java
index 9174cc9698..6a756000c5 100644
--- a/nuxeo-platform-notification/nuxeo-platform-notification-api/src/main/java/org/nuxeo/ecm/platform/notification/api/NotificationManager.java
+++ b/nuxeo-platform-notification/nuxeo-platform-notification-api/src/main/java/org/nuxeo/ecm/platform/notification/api/NotificationManager.java
@@ -111,7 +111,7 @@ void sendDocumentByMail(DocumentModel doc,
     /**
      * Gets the list of event names used by notifications.
      *
-     * @since 5.4.1
+     * @since 5.4.2
      */
     Set<String> getNotificationEventNames();
 
diff --git a/nuxeo-platform-notification/nuxeo-platform-notification-api/src/main/java/org/nuxeo/ecm/platform/notification/api/NotificationRegistry.java b/nuxeo-platform-notification/nuxeo-platform-notification-api/src/main/java/org/nuxeo/ecm/platform/notification/api/NotificationRegistry.java
index 632d3a2c09..2b11b12ccf 100644
--- a/nuxeo-platform-notification/nuxeo-platform-notification-api/src/main/java/org/nuxeo/ecm/platform/notification/api/NotificationRegistry.java
+++ b/nuxeo-platform-notification/nuxeo-platform-notification-api/src/main/java/org/nuxeo/ecm/platform/notification/api/NotificationRegistry.java
@@ -39,7 +39,7 @@ public interface NotificationRegistry extends Serializable {
     /**
      * Gets the list of event names used by notifications.
      *
-     * @since 5.4.1
+     * @since 5.4.2
      */
     Set<String> getNotificationEventNames();
 
diff --git a/nuxeo-platform-notification/nuxeo-platform-notification-core/pom.xml b/nuxeo-platform-notification/nuxeo-platform-notification-core/pom.xml
index 2a2e8cd333..4e9e4b97f7 100644
--- a/nuxeo-platform-notification/nuxeo-platform-notification-core/pom.xml
+++ b/nuxeo-platform-notification/nuxeo-platform-notification-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-notification-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-notification-core</artifactId>
diff --git a/nuxeo-platform-notification/nuxeo-platform-notification-core/src/main/resources/OSGI-INF/notification-contrib.xml b/nuxeo-platform-notification/nuxeo-platform-notification-core/src/main/resources/OSGI-INF/notification-contrib.xml
index ac88a7437f..788a7f059d 100644
--- a/nuxeo-platform-notification/nuxeo-platform-notification-core/src/main/resources/OSGI-INF/notification-contrib.xml
+++ b/nuxeo-platform-notification/nuxeo-platform-notification-core/src/main/resources/OSGI-INF/notification-contrib.xml
@@ -83,4 +83,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-notification/nuxeo-platform-notification-core/src/main/resources/OSGI-INF/notification-listener-contrib.xml b/nuxeo-platform-notification/nuxeo-platform-notification-core/src/main/resources/OSGI-INF/notification-listener-contrib.xml
index a1b0d8526f..100708ae63 100644
--- a/nuxeo-platform-notification/nuxeo-platform-notification-core/src/main/resources/OSGI-INF/notification-listener-contrib.xml
+++ b/nuxeo-platform-notification/nuxeo-platform-notification-core/src/main/resources/OSGI-INF/notification-listener-contrib.xml
@@ -22,4 +22,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-notification/nuxeo-platform-notification-core/src/main/resources/OSGI-INF/nxplacefulservice-configs-contrib.xml b/nuxeo-platform-notification/nuxeo-platform-notification-core/src/main/resources/OSGI-INF/nxplacefulservice-configs-contrib.xml
index 1b52e23078..12d43851cb 100644
--- a/nuxeo-platform-notification/nuxeo-platform-notification-core/src/main/resources/OSGI-INF/nxplacefulservice-configs-contrib.xml
+++ b/nuxeo-platform-notification/nuxeo-platform-notification-core/src/main/resources/OSGI-INF/nxplacefulservice-configs-contrib.xml
@@ -9,4 +9,4 @@
 
   </extension>
 
- </component>
\ No newline at end of file
+ </component>
diff --git a/nuxeo-platform-notification/nuxeo-platform-notification-core/src/test/resources/notification-contrib.xml b/nuxeo-platform-notification/nuxeo-platform-notification-core/src/test/resources/notification-contrib.xml
index 2c61bd374e..d02ff3e61f 100644
--- a/nuxeo-platform-notification/nuxeo-platform-notification-core/src/test/resources/notification-contrib.xml
+++ b/nuxeo-platform-notification/nuxeo-platform-notification-core/src/test/resources/notification-contrib.xml
@@ -92,4 +92,4 @@
     </settings>
 
   </extension>
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-notification/nuxeo-platform-notification-core/src/test/resources/persistence.xml b/nuxeo-platform-notification/nuxeo-platform-notification-core/src/test/resources/persistence.xml
index 3277fe3de1..626d418058 100644
--- a/nuxeo-platform-notification/nuxeo-platform-notification-core/src/test/resources/persistence.xml
+++ b/nuxeo-platform-notification/nuxeo-platform-notification-core/src/test/resources/persistence.xml
@@ -7,4 +7,4 @@
       <property name="jboss.entity.manager.jndi.name" value="java:/nxplacefulservice"/>
     </properties>
   </persistence-unit>
-</persistence>
\ No newline at end of file
+</persistence>
diff --git a/nuxeo-platform-notification/nuxeo-platform-notification-facade/pom.xml b/nuxeo-platform-notification/nuxeo-platform-notification-facade/pom.xml
index ccad1c6974..478cfb10da 100644
--- a/nuxeo-platform-notification/nuxeo-platform-notification-facade/pom.xml
+++ b/nuxeo-platform-notification/nuxeo-platform-notification-facade/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-notification-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-notification-facade</artifactId>
diff --git a/nuxeo-platform-notification/nuxeo-platform-notification-facade/src/test/resources/nxplacefulservice-configs-contrib.xml b/nuxeo-platform-notification/nuxeo-platform-notification-facade/src/test/resources/nxplacefulservice-configs-contrib.xml
index 1b52e23078..12d43851cb 100644
--- a/nuxeo-platform-notification/nuxeo-platform-notification-facade/src/test/resources/nxplacefulservice-configs-contrib.xml
+++ b/nuxeo-platform-notification/nuxeo-platform-notification-facade/src/test/resources/nxplacefulservice-configs-contrib.xml
@@ -9,4 +9,4 @@
 
   </extension>
 
- </component>
\ No newline at end of file
+ </component>
diff --git a/nuxeo-platform-notification/nuxeo-platform-notification-facade/src/test/resources/nxplacefulservice-framework.xml b/nuxeo-platform-notification/nuxeo-platform-notification-facade/src/test/resources/nxplacefulservice-framework.xml
index ffe4f4c97b..e7bc5f1bbc 100644
--- a/nuxeo-platform-notification/nuxeo-platform-notification-facade/src/test/resources/nxplacefulservice-framework.xml
+++ b/nuxeo-platform-notification/nuxeo-platform-notification-facade/src/test/resources/nxplacefulservice-framework.xml
@@ -9,4 +9,4 @@
     <object class="org.nuxeo.ecm.platform.ec.placeful.AnnotationDescriptor" />
   </extension-point>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-notification/nuxeo-platform-notification-web/pom.xml b/nuxeo-platform-notification/nuxeo-platform-notification-web/pom.xml
index f98afe2233..6110569945 100644
--- a/nuxeo-platform-notification/nuxeo-platform-notification-web/pom.xml
+++ b/nuxeo-platform-notification/nuxeo-platform-notification-web/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-notification-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-notification-web</artifactId>
diff --git a/nuxeo-platform-notification/pom.xml b/nuxeo-platform-notification/pom.xml
index 9c1ca2b209..e91751470d 100644
--- a/nuxeo-platform-notification/pom.xml
+++ b/nuxeo-platform-notification/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>nuxeo-features-parent</artifactId>
     <groupId>org.nuxeo.ecm.platform</groupId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-preview/pom.xml b/nuxeo-platform-preview/pom.xml
index 214a16fbf3..ec79216a91 100644
--- a/nuxeo-platform-preview/pom.xml
+++ b/nuxeo-platform-preview/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-features-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-preview/src/main/resources/OSGI-INF/preview-adapter-contrib.xml b/nuxeo-platform-preview/src/main/resources/OSGI-INF/preview-adapter-contrib.xml
index 4b938a2d7d..bf7db34d69 100644
--- a/nuxeo-platform-preview/src/main/resources/OSGI-INF/preview-adapter-contrib.xml
+++ b/nuxeo-platform-preview/src/main/resources/OSGI-INF/preview-adapter-contrib.xml
@@ -26,4 +26,4 @@
         <pattern>text/plain</pattern>
       </previewer>
     </extension>
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-preview/src/main/resources/OSGI-INF/restAPI-contrib.xml b/nuxeo-platform-preview/src/main/resources/OSGI-INF/restAPI-contrib.xml
index 4ac8026492..91465812bf 100644
--- a/nuxeo-platform-preview/src/main/resources/OSGI-INF/restAPI-contrib.xml
+++ b/nuxeo-platform-preview/src/main/resources/OSGI-INF/restAPI-contrib.xml
@@ -20,4 +20,4 @@
     </restletPlugin>
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-publisher/nuxeo-platform-publisher-api/pom.xml b/nuxeo-platform-publisher/nuxeo-platform-publisher-api/pom.xml
index d1808b14f7..c0946ba5cc 100644
--- a/nuxeo-platform-publisher/nuxeo-platform-publisher-api/pom.xml
+++ b/nuxeo-platform-publisher/nuxeo-platform-publisher-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-publisher-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-publisher/nuxeo-platform-publisher-core-contrib/pom.xml b/nuxeo-platform-publisher/nuxeo-platform-publisher-core-contrib/pom.xml
index d8cc73f48c..81ca3979b4 100644
--- a/nuxeo-platform-publisher/nuxeo-platform-publisher-core-contrib/pom.xml
+++ b/nuxeo-platform-publisher/nuxeo-platform-publisher-core-contrib/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-publisher-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <groupId>org.nuxeo.ecm.platform</groupId>
   <artifactId>nuxeo-platform-publisher-core-contrib</artifactId>
diff --git a/nuxeo-platform-publisher/nuxeo-platform-publisher-core-contrib/src/main/resources/OSGI-INF/publisher-audit-contrib.xml b/nuxeo-platform-publisher/nuxeo-platform-publisher-core-contrib/src/main/resources/OSGI-INF/publisher-audit-contrib.xml
index fbeb12fce1..3b22bfb9f8 100644
--- a/nuxeo-platform-publisher/nuxeo-platform-publisher-core-contrib/src/main/resources/OSGI-INF/publisher-audit-contrib.xml
+++ b/nuxeo-platform-publisher/nuxeo-platform-publisher-core-contrib/src/main/resources/OSGI-INF/publisher-audit-contrib.xml
@@ -13,4 +13,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-publisher/nuxeo-platform-publisher-core-contrib/src/main/resources/OSGI-INF/publisher-relations-contrib.xml b/nuxeo-platform-publisher/nuxeo-platform-publisher-core-contrib/src/main/resources/OSGI-INF/publisher-relations-contrib.xml
index 49f1886910..1a03f8a09e 100644
--- a/nuxeo-platform-publisher/nuxeo-platform-publisher-core-contrib/src/main/resources/OSGI-INF/publisher-relations-contrib.xml
+++ b/nuxeo-platform-publisher/nuxeo-platform-publisher-core-contrib/src/main/resources/OSGI-INF/publisher-relations-contrib.xml
@@ -20,4 +20,4 @@
     </graph>
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-publisher/nuxeo-platform-publisher-core/pom.xml b/nuxeo-platform-publisher/nuxeo-platform-publisher-core/pom.xml
index 15b5eb4efc..6608a57966 100644
--- a/nuxeo-platform-publisher/nuxeo-platform-publisher-core/pom.xml
+++ b/nuxeo-platform-publisher/nuxeo-platform-publisher-core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-publisher-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-publisher/nuxeo-platform-publisher-core/src/main/resources/OSGI-INF/publisher-contrib.xml b/nuxeo-platform-publisher/nuxeo-platform-publisher-core/src/main/resources/OSGI-INF/publisher-contrib.xml
index c1caf02d35..165ae3d6b4 100644
--- a/nuxeo-platform-publisher/nuxeo-platform-publisher-core/src/main/resources/OSGI-INF/publisher-contrib.xml
+++ b/nuxeo-platform-publisher/nuxeo-platform-publisher-core/src/main/resources/OSGI-INF/publisher-contrib.xml
@@ -107,4 +107,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-publisher/nuxeo-platform-publisher-core/src/main/resources/OSGI-INF/publisher-listeners-contrib.xml b/nuxeo-platform-publisher/nuxeo-platform-publisher-core/src/main/resources/OSGI-INF/publisher-listeners-contrib.xml
index 0391cc4dbf..05981294b9 100644
--- a/nuxeo-platform-publisher/nuxeo-platform-publisher-core/src/main/resources/OSGI-INF/publisher-listeners-contrib.xml
+++ b/nuxeo-platform-publisher/nuxeo-platform-publisher-core/src/main/resources/OSGI-INF/publisher-listeners-contrib.xml
@@ -15,4 +15,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-publisher/nuxeo-platform-publisher-core/src/test/resources/OSGI-INF/publisher-remote-contrib-test.xml b/nuxeo-platform-publisher/nuxeo-platform-publisher-core/src/test/resources/OSGI-INF/publisher-remote-contrib-test.xml
index 8d8833162f..13532f1fb6 100644
--- a/nuxeo-platform-publisher/nuxeo-platform-publisher-core/src/test/resources/OSGI-INF/publisher-remote-contrib-test.xml
+++ b/nuxeo-platform-publisher/nuxeo-platform-publisher-core/src/test/resources/OSGI-INF/publisher-remote-contrib-test.xml
@@ -42,4 +42,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-publisher/nuxeo-platform-publisher-jbpm/pom.xml b/nuxeo-platform-publisher/nuxeo-platform-publisher-jbpm/pom.xml
index 1c2cbb1330..3052e75de9 100644
--- a/nuxeo-platform-publisher/nuxeo-platform-publisher-jbpm/pom.xml
+++ b/nuxeo-platform-publisher/nuxeo-platform-publisher-jbpm/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-publisher-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-publisher/nuxeo-platform-publisher-jbpm/src/main/resources/OSGI-INF/publisher-jbpm-contrib.xml b/nuxeo-platform-publisher/nuxeo-platform-publisher-jbpm/src/main/resources/OSGI-INF/publisher-jbpm-contrib.xml
index e859161ab1..af44d5bf9f 100644
--- a/nuxeo-platform-publisher/nuxeo-platform-publisher-jbpm/src/main/resources/OSGI-INF/publisher-jbpm-contrib.xml
+++ b/nuxeo-platform-publisher/nuxeo-platform-publisher-jbpm/src/main/resources/OSGI-INF/publisher-jbpm-contrib.xml
@@ -32,4 +32,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-publisher/nuxeo-platform-publisher-jbpm/src/test/resources/OSGI-INF/publisher-jbpm-test-contrib.xml b/nuxeo-platform-publisher/nuxeo-platform-publisher-jbpm/src/test/resources/OSGI-INF/publisher-jbpm-test-contrib.xml
index f52dbb515c..a49e346063 100644
--- a/nuxeo-platform-publisher/nuxeo-platform-publisher-jbpm/src/test/resources/OSGI-INF/publisher-jbpm-test-contrib.xml
+++ b/nuxeo-platform-publisher/nuxeo-platform-publisher-jbpm/src/test/resources/OSGI-INF/publisher-jbpm-test-contrib.xml
@@ -30,4 +30,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-publisher/nuxeo-platform-publisher-web/pom.xml b/nuxeo-platform-publisher/nuxeo-platform-publisher-web/pom.xml
index 2427d29a6b..05901a0e48 100644
--- a/nuxeo-platform-publisher/nuxeo-platform-publisher-web/pom.xml
+++ b/nuxeo-platform-publisher/nuxeo-platform-publisher-web/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-publisher-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-publisher/nuxeo-platform-publisher-web/src/main/resources/OSGI-INF/actions-contrib.xml b/nuxeo-platform-publisher/nuxeo-platform-publisher-web/src/main/resources/OSGI-INF/actions-contrib.xml
index 2115757658..1d7762ad82 100644
--- a/nuxeo-platform-publisher/nuxeo-platform-publisher-web/src/main/resources/OSGI-INF/actions-contrib.xml
+++ b/nuxeo-platform-publisher/nuxeo-platform-publisher-web/src/main/resources/OSGI-INF/actions-contrib.xml
@@ -67,4 +67,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-publisher/pom.xml b/nuxeo-platform-publisher/pom.xml
index cd3ddf8cfc..17f1ddc85b 100644
--- a/nuxeo-platform-publisher/pom.xml
+++ b/nuxeo-platform-publisher/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-features-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-relations/nuxeo-platform-relations-api/pom.xml b/nuxeo-platform-relations/nuxeo-platform-relations-api/pom.xml
index c3071d5f61..e8a4969086 100644
--- a/nuxeo-platform-relations/nuxeo-platform-relations-api/pom.xml
+++ b/nuxeo-platform-relations/nuxeo-platform-relations-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-relations-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-relations-api</artifactId>
diff --git a/nuxeo-platform-relations/nuxeo-platform-relations-core-listener/pom.xml b/nuxeo-platform-relations/nuxeo-platform-relations-core-listener/pom.xml
index 188d277f72..200ec4343c 100644
--- a/nuxeo-platform-relations/nuxeo-platform-relations-core-listener/pom.xml
+++ b/nuxeo-platform-relations/nuxeo-platform-relations-core-listener/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-relations-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-relations-core-listener</artifactId>
diff --git a/nuxeo-platform-relations/nuxeo-platform-relations-core/pom.xml b/nuxeo-platform-relations/nuxeo-platform-relations-core/pom.xml
index db416c7619..1211c0418e 100644
--- a/nuxeo-platform-relations/nuxeo-platform-relations-core/pom.xml
+++ b/nuxeo-platform-relations/nuxeo-platform-relations-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-relations-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-relations-core</artifactId>
diff --git a/nuxeo-platform-relations/nuxeo-platform-relations-default-config/pom.xml b/nuxeo-platform-relations/nuxeo-platform-relations-default-config/pom.xml
index 1adc9961d9..ab207731d3 100644
--- a/nuxeo-platform-relations/nuxeo-platform-relations-default-config/pom.xml
+++ b/nuxeo-platform-relations/nuxeo-platform-relations-default-config/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-relations-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-relations-default-config</artifactId>
diff --git a/nuxeo-platform-relations/nuxeo-platform-relations-facade/pom.xml b/nuxeo-platform-relations/nuxeo-platform-relations-facade/pom.xml
index 7f94d625d7..189b1db7cb 100644
--- a/nuxeo-platform-relations/nuxeo-platform-relations-facade/pom.xml
+++ b/nuxeo-platform-relations/nuxeo-platform-relations-facade/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-relations-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-relations-facade</artifactId>
diff --git a/nuxeo-platform-relations/nuxeo-platform-relations-io/pom.xml b/nuxeo-platform-relations/nuxeo-platform-relations-io/pom.xml
index 31cb5e8038..153363572b 100644
--- a/nuxeo-platform-relations/nuxeo-platform-relations-io/pom.xml
+++ b/nuxeo-platform-relations/nuxeo-platform-relations-io/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-relations-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-relations-io</artifactId>
diff --git a/nuxeo-platform-relations/nuxeo-platform-relations-io/src/main/resources/OSGI-INF/io-relations-contrib.xml b/nuxeo-platform-relations/nuxeo-platform-relations-io/src/main/resources/OSGI-INF/io-relations-contrib.xml
index eba9ed19b0..258d2464be 100644
--- a/nuxeo-platform-relations/nuxeo-platform-relations-io/src/main/resources/OSGI-INF/io-relations-contrib.xml
+++ b/nuxeo-platform-relations/nuxeo-platform-relations-io/src/main/resources/OSGI-INF/io-relations-contrib.xml
@@ -33,4 +33,4 @@
   </extension>
 
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-relations/nuxeo-platform-relations-io/src/test/resources/io-relations-test-contrib.xml b/nuxeo-platform-relations/nuxeo-platform-relations-io/src/test/resources/io-relations-test-contrib.xml
index bb3e27cd34..2b1ac63ac4 100644
--- a/nuxeo-platform-relations/nuxeo-platform-relations-io/src/test/resources/io-relations-test-contrib.xml
+++ b/nuxeo-platform-relations/nuxeo-platform-relations-io/src/test/resources/io-relations-test-contrib.xml
@@ -78,4 +78,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-relations/nuxeo-platform-relations-jena-plugin/pom.xml b/nuxeo-platform-relations/nuxeo-platform-relations-jena-plugin/pom.xml
index ddab25a8bb..da8467cf77 100644
--- a/nuxeo-platform-relations/nuxeo-platform-relations-jena-plugin/pom.xml
+++ b/nuxeo-platform-relations/nuxeo-platform-relations-jena-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-relations-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-relations-jena-plugin</artifactId>
diff --git a/nuxeo-platform-relations/nuxeo-platform-relations-web/pom.xml b/nuxeo-platform-relations/nuxeo-platform-relations-web/pom.xml
index dbb6e5416d..050c4d2165 100644
--- a/nuxeo-platform-relations/nuxeo-platform-relations-web/pom.xml
+++ b/nuxeo-platform-relations/nuxeo-platform-relations-web/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-relations-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-relations-web</artifactId>
diff --git a/nuxeo-platform-relations/pom.xml b/nuxeo-platform-relations/pom.xml
index 0f1fc01621..647abbad0b 100644
--- a/nuxeo-platform-relations/pom.xml
+++ b/nuxeo-platform-relations/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>nuxeo-features-parent</artifactId>
     <groupId>org.nuxeo.ecm.platform</groupId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-syndication/DEPRECATED.txt b/nuxeo-platform-syndication/DEPRECATED.txt
index cb8f14081b..0b514d5371 100644
--- a/nuxeo-platform-syndication/DEPRECATED.txt
+++ b/nuxeo-platform-syndication/DEPRECATED.txt
@@ -1,4 +1,4 @@
-This module is deprecated as of Nuxeo 5.4.1, as content view offer ATOM and
+This module is deprecated as of Nuxeo 5.4.2, as content view offer ATOM and
 RSS exports on their own.
 Kept here for compatibility while custom code still uses query models and
 result provider farms.
diff --git a/nuxeo-platform-syndication/pom.xml b/nuxeo-platform-syndication/pom.xml
index 8cd88f630f..71890f5958 100644
--- a/nuxeo-platform-syndication/pom.xml
+++ b/nuxeo-platform-syndication/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>nuxeo-features-parent</artifactId>
     <groupId>org.nuxeo.ecm.platform</groupId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-syndication</artifactId>
@@ -16,7 +16,7 @@
     Nuxeo Enterprise Platform: Syndication Service. This service build
     syndication feeds (RSS &amp; ATOM) on content objects. It defines Interfaces
     so that any content object implementing those interfaces can produce
-    syndication feeds or be included in it. As of Nuxeo 5.4.1, it is deprecated
+    syndication feeds or be included in it. As of Nuxeo 5.4.2, it is deprecated
     since content views already offer RSS and ATOM exports.
   </description>
 
diff --git a/nuxeo-platform-syndication/src/main/resources/OSGI-INF/restpack-contrib.xml b/nuxeo-platform-syndication/src/main/resources/OSGI-INF/restpack-contrib.xml
index 0078810375..f78b045f84 100644
--- a/nuxeo-platform-syndication/src/main/resources/OSGI-INF/restpack-contrib.xml
+++ b/nuxeo-platform-syndication/src/main/resources/OSGI-INF/restpack-contrib.xml
@@ -61,4 +61,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-tag-service/nuxeo-platform-tag-api/pom.xml b/nuxeo-platform-tag-service/nuxeo-platform-tag-api/pom.xml
index 9aee2cc13e..506722be2c 100644
--- a/nuxeo-platform-tag-service/nuxeo-platform-tag-api/pom.xml
+++ b/nuxeo-platform-tag-service/nuxeo-platform-tag-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>nuxeo-platform-tag-parent</artifactId>
     <groupId>org.nuxeo.ecm.platform</groupId>    
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-tag-api</artifactId>
diff --git a/nuxeo-platform-tag-service/nuxeo-platform-tag-core/pom.xml b/nuxeo-platform-tag-service/nuxeo-platform-tag-core/pom.xml
index 86e6114ee4..4ecead661c 100644
--- a/nuxeo-platform-tag-service/nuxeo-platform-tag-core/pom.xml
+++ b/nuxeo-platform-tag-service/nuxeo-platform-tag-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>nuxeo-platform-tag-parent</artifactId>
     <groupId>org.nuxeo.ecm.platform</groupId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-tag-core</artifactId>
diff --git a/nuxeo-platform-tag-service/nuxeo-platform-tag-core/src/main/resources/OSGI-INF/tag-listener-contrib.xml b/nuxeo-platform-tag-service/nuxeo-platform-tag-core/src/main/resources/OSGI-INF/tag-listener-contrib.xml
index ae8091c36b..735852a740 100644
--- a/nuxeo-platform-tag-service/nuxeo-platform-tag-core/src/main/resources/OSGI-INF/tag-listener-contrib.xml
+++ b/nuxeo-platform-tag-service/nuxeo-platform-tag-core/src/main/resources/OSGI-INF/tag-listener-contrib.xml
@@ -11,4 +11,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-tag-service/nuxeo-platform-tag-facade/pom.xml b/nuxeo-platform-tag-service/nuxeo-platform-tag-facade/pom.xml
index 76425dc126..7cac1d9866 100644
--- a/nuxeo-platform-tag-service/nuxeo-platform-tag-facade/pom.xml
+++ b/nuxeo-platform-tag-service/nuxeo-platform-tag-facade/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>nuxeo-platform-tag-parent</artifactId>
     <groupId>org.nuxeo.ecm.platform</groupId>    
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-tag-facade</artifactId>
diff --git a/nuxeo-platform-tag-service/nuxeo-platform-tag-web/pom.xml b/nuxeo-platform-tag-service/nuxeo-platform-tag-web/pom.xml
index bb23f126c1..6d939f65ab 100644
--- a/nuxeo-platform-tag-service/nuxeo-platform-tag-web/pom.xml
+++ b/nuxeo-platform-tag-service/nuxeo-platform-tag-web/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>nuxeo-platform-tag-parent</artifactId>
     <groupId>org.nuxeo.ecm.platform</groupId>    
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-tag-web</artifactId>
diff --git a/nuxeo-platform-tag-service/pom.xml b/nuxeo-platform-tag-service/pom.xml
index 9b62407c13..7a2460d804 100644
--- a/nuxeo-platform-tag-service/pom.xml
+++ b/nuxeo-platform-tag-service/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>nuxeo-features-parent</artifactId>
     <groupId>org.nuxeo.ecm.platform</groupId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-tag-parent</artifactId>
diff --git a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-api/pom.xml b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-api/pom.xml
index 75e6ef1111..7f202f7afd 100644
--- a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-api/pom.xml
+++ b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-userworkspace-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-userworkspace-api</artifactId>
diff --git a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/pom.xml b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/pom.xml
index e18f4ea3af..b22edfca56 100644
--- a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/pom.xml
+++ b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-userworkspace-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-userworkspace-core</artifactId>
diff --git a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/src/main/resources/OSGI-INF/compatUserWorkspaceImpl.xml b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/src/main/resources/OSGI-INF/compatUserWorkspaceImpl.xml
index e64d9d3ce1..4d7215225b 100644
--- a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/src/main/resources/OSGI-INF/compatUserWorkspaceImpl.xml
+++ b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/src/main/resources/OSGI-INF/compatUserWorkspaceImpl.xml
@@ -9,4 +9,4 @@
       class="org.nuxeo.ecm.platform.userworkspace.core.service.CompatUserWorkspaceServiceImpl" />
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/src/main/resources/OSGI-INF/userWorkspaceImpl.xml b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/src/main/resources/OSGI-INF/userWorkspaceImpl.xml
index 7a2fc080d4..3450eab508 100644
--- a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/src/main/resources/OSGI-INF/userWorkspaceImpl.xml
+++ b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-core/src/main/resources/OSGI-INF/userWorkspaceImpl.xml
@@ -9,4 +9,4 @@
       class="org.nuxeo.ecm.platform.userworkspace.core.service.DefaultUserWorkspaceServiceImpl" />
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-facade/pom.xml b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-facade/pom.xml
index 2dcdc30cf8..797b1be2d5 100644
--- a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-facade/pom.xml
+++ b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-facade/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-userworkspace-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-userworkspace-facade</artifactId>
diff --git a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-types/pom.xml b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-types/pom.xml
index 9800f8607d..876f017655 100644
--- a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-types/pom.xml
+++ b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-types/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-userworkspace-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-userworkspace-types</artifactId>
diff --git a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-types/src/main/resources/OSGI-INF/userworkspace-life-cycle-contrib.xml b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-types/src/main/resources/OSGI-INF/userworkspace-life-cycle-contrib.xml
index 3c8a3afb17..069b2320f0 100644
--- a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-types/src/main/resources/OSGI-INF/userworkspace-life-cycle-contrib.xml
+++ b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-types/src/main/resources/OSGI-INF/userworkspace-life-cycle-contrib.xml
@@ -9,4 +9,4 @@
     </types>
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-web/pom.xml b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-web/pom.xml
index dfd1fc91cd..06e4078b36 100644
--- a/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-web/pom.xml
+++ b/nuxeo-platform-userworkspace/nuxeo-platform-userworkspace-web/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-userworkspace-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-userworkspace-web</artifactId>
diff --git a/nuxeo-platform-userworkspace/pom.xml b/nuxeo-platform-userworkspace/pom.xml
index d5352e316a..f152177c6e 100644
--- a/nuxeo-platform-userworkspace/pom.xml
+++ b/nuxeo-platform-userworkspace/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-features-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-userworkspace-parent</artifactId>
diff --git a/nuxeo-platform-virtualnavigation/nuxeo-platform-virtualnavigation-core-contrib/pom.xml b/nuxeo-platform-virtualnavigation/nuxeo-platform-virtualnavigation-core-contrib/pom.xml
index 1c369b0b09..f482c7f1a3 100755
--- a/nuxeo-platform-virtualnavigation/nuxeo-platform-virtualnavigation-core-contrib/pom.xml
+++ b/nuxeo-platform-virtualnavigation/nuxeo-platform-virtualnavigation-core-contrib/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-virtualnavigation</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-virtualnavigation/nuxeo-platform-virtualnavigation-core-contrib/src/main/resources/OSGI-INF/core-type-contrib.xml b/nuxeo-platform-virtualnavigation/nuxeo-platform-virtualnavigation-core-contrib/src/main/resources/OSGI-INF/core-type-contrib.xml
index d0cf59ddc2..b4fb21f2c3 100644
--- a/nuxeo-platform-virtualnavigation/nuxeo-platform-virtualnavigation-core-contrib/src/main/resources/OSGI-INF/core-type-contrib.xml
+++ b/nuxeo-platform-virtualnavigation/nuxeo-platform-virtualnavigation-core-contrib/src/main/resources/OSGI-INF/core-type-contrib.xml
@@ -14,4 +14,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-platform-virtualnavigation/nuxeo-platform-virtualnavigation-web/pom.xml b/nuxeo-platform-virtualnavigation/nuxeo-platform-virtualnavigation-web/pom.xml
index 4b34d60664..895625b5bc 100755
--- a/nuxeo-platform-virtualnavigation/nuxeo-platform-virtualnavigation-web/pom.xml
+++ b/nuxeo-platform-virtualnavigation/nuxeo-platform-virtualnavigation-web/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-virtualnavigation</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-virtualnavigation/pom.xml b/nuxeo-platform-virtualnavigation/pom.xml
index 0146d8acb0..2eb31f148f 100755
--- a/nuxeo-platform-virtualnavigation/pom.xml
+++ b/nuxeo-platform-virtualnavigation/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-features-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
diff --git a/nuxeo-platform-webwidgets/nuxeo-theme-webwidgets-samples/pom.xml b/nuxeo-platform-webwidgets/nuxeo-theme-webwidgets-samples/pom.xml
index a0590faa81..ffdd2f32a7 100644
--- a/nuxeo-platform-webwidgets/nuxeo-theme-webwidgets-samples/pom.xml
+++ b/nuxeo-platform-webwidgets/nuxeo-theme-webwidgets-samples/pom.xml
@@ -8,7 +8,7 @@
  <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-webwidgets-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
 
diff --git a/nuxeo-platform-webwidgets/nuxeo-theme-webwidgets-ui/pom.xml b/nuxeo-platform-webwidgets/nuxeo-theme-webwidgets-ui/pom.xml
index 6624c58cbd..1d14fb92cf 100644
--- a/nuxeo-platform-webwidgets/nuxeo-theme-webwidgets-ui/pom.xml
+++ b/nuxeo-platform-webwidgets/nuxeo-theme-webwidgets-ui/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-webwidgets-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-theme-webwidgets-ui</artifactId>
diff --git a/nuxeo-platform-webwidgets/nuxeo-theme-webwidgets/pom.xml b/nuxeo-platform-webwidgets/nuxeo-theme-webwidgets/pom.xml
index dc27e7c1e2..3d92407534 100644
--- a/nuxeo-platform-webwidgets/nuxeo-theme-webwidgets/pom.xml
+++ b/nuxeo-platform-webwidgets/nuxeo-theme-webwidgets/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-webwidgets-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-theme-webwidgets</artifactId>
diff --git a/nuxeo-platform-webwidgets/nuxeo-theme-webwidgets/src/test/resources/test-hibernate.cfg.xml b/nuxeo-platform-webwidgets/nuxeo-theme-webwidgets/src/test/resources/test-hibernate.cfg.xml
index 08905fd767..6d49072a32 100644
--- a/nuxeo-platform-webwidgets/nuxeo-theme-webwidgets/src/test/resources/test-hibernate.cfg.xml
+++ b/nuxeo-platform-webwidgets/nuxeo-theme-webwidgets/src/test/resources/test-hibernate.cfg.xml
@@ -11,4 +11,4 @@
         <property name="hibernate.format_sql">true</property>;
       </properties>
     </hibernateConfiguration>
-</document>
\ No newline at end of file
+</document>
diff --git a/nuxeo-platform-webwidgets/pom.xml b/nuxeo-platform-webwidgets/pom.xml
index 5d40f069cd..833fb23768 100644
--- a/nuxeo-platform-webwidgets/pom.xml
+++ b/nuxeo-platform-webwidgets/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-features-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-webwidgets-parent</artifactId>
diff --git a/nuxeo-platform-wiki/nuxeo-platform-wiki-jsf/pom.xml b/nuxeo-platform-wiki/nuxeo-platform-wiki-jsf/pom.xml
index 2aea09b64c..9634af4e45 100644
--- a/nuxeo-platform-wiki/nuxeo-platform-wiki-jsf/pom.xml
+++ b/nuxeo-platform-wiki/nuxeo-platform-wiki-jsf/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-wiki</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-wiki-jsf</artifactId>
diff --git a/nuxeo-platform-wiki/nuxeo-platform-wiki-webengine/pom.xml b/nuxeo-platform-wiki/nuxeo-platform-wiki-webengine/pom.xml
index 59953cd2dc..e806e19a1a 100644
--- a/nuxeo-platform-wiki/nuxeo-platform-wiki-webengine/pom.xml
+++ b/nuxeo-platform-wiki/nuxeo-platform-wiki-webengine/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-platform-wiki</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-wiki-webengine</artifactId>
diff --git a/nuxeo-platform-wiki/pom.xml b/nuxeo-platform-wiki/pom.xml
index 4177d7b739..d2ec54d5e7 100644
--- a/nuxeo-platform-wiki/pom.xml
+++ b/nuxeo-platform-wiki/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-features-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-platform-wiki</artifactId>
diff --git a/nuxeo-theme-bank/pom.xml b/nuxeo-theme-bank/pom.xml
index 45d71f32b6..4430a61fca 100644
--- a/nuxeo-theme-bank/pom.xml
+++ b/nuxeo-theme-bank/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-features-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-theme-bank</artifactId>
diff --git a/nuxeo-theme-bank/src/main/resources/OSGI-INF/authentication-contrib.xml b/nuxeo-theme-bank/src/main/resources/OSGI-INF/authentication-contrib.xml
index 22efa7cdf1..6bc4b83ae2 100644
--- a/nuxeo-theme-bank/src/main/resources/OSGI-INF/authentication-contrib.xml
+++ b/nuxeo-theme-bank/src/main/resources/OSGI-INF/authentication-contrib.xml
@@ -15,4 +15,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-theme-bank/src/test/resources/theme-bank-config.xml b/nuxeo-theme-bank/src/test/resources/theme-bank-config.xml
index 253bb052b1..f5a52fbd5d 100644
--- a/nuxeo-theme-bank/src/test/resources/theme-bank-config.xml
+++ b/nuxeo-theme-bank/src/test/resources/theme-bank-config.xml
@@ -11,4 +11,4 @@
     <bank name="test" url="http://localhost:8080/nuxeo/site/theme-banks/test" />
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-theme-editor/pom.xml b/nuxeo-theme-editor/pom.xml
index f4673da553..ffeff6d76a 100644
--- a/nuxeo-theme-editor/pom.xml
+++ b/nuxeo-theme-editor/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-features-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-theme-editor</artifactId>
diff --git a/nuxeo-theme-editor/src/main/resources/nxthemes/editor/widgets/fm/theme-view-page-editor.xml b/nuxeo-theme-editor/src/main/resources/nxthemes/editor/widgets/fm/theme-view-page-editor.xml
index 4eeeb02e07..3c746391d0 100644
--- a/nuxeo-theme-editor/src/main/resources/nxthemes/editor/widgets/fm/theme-view-page-editor.xml
+++ b/nuxeo-theme-editor/src/main/resources/nxthemes/editor/widgets/fm/theme-view-page-editor.xml
@@ -9,4 +9,4 @@
   <body style="padding: 0; margin: 0">
     [nxthemes markup]
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/nuxeo-theme-editor/src/main/resources/nxthemes/editor/widgets/fm/theme-view.xml b/nuxeo-theme-editor/src/main/resources/nxthemes/editor/widgets/fm/theme-view.xml
index 15779ae244..6df3e4b782 100644
--- a/nuxeo-theme-editor/src/main/resources/nxthemes/editor/widgets/fm/theme-view.xml
+++ b/nuxeo-theme-editor/src/main/resources/nxthemes/editor/widgets/fm/theme-view.xml
@@ -170,4 +170,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/nuxeo-theme-editor/src/main/resources/nxthemes/editor/widgets/jsf/theme-view-page-editor.xml b/nuxeo-theme-editor/src/main/resources/nxthemes/editor/widgets/jsf/theme-view-page-editor.xml
index 742b3a22cb..e2d4647ca1 100644
--- a/nuxeo-theme-editor/src/main/resources/nxthemes/editor/widgets/jsf/theme-view-page-editor.xml
+++ b/nuxeo-theme-editor/src/main/resources/nxthemes/editor/widgets/jsf/theme-view-page-editor.xml
@@ -12,4 +12,4 @@
   <body style="padding: 0; margin: 0">
     [nxthemes markup]
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/nuxeo-theme-editor/src/main/resources/nxthemes/editor/widgets/jsf/theme-view.xml b/nuxeo-theme-editor/src/main/resources/nxthemes/editor/widgets/jsf/theme-view.xml
index dcb46dd51b..1e506eaa8e 100644
--- a/nuxeo-theme-editor/src/main/resources/nxthemes/editor/widgets/jsf/theme-view.xml
+++ b/nuxeo-theme-editor/src/main/resources/nxthemes/editor/widgets/jsf/theme-view.xml
@@ -178,4 +178,4 @@
 </f:view>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/nuxeo-webengine-features/nuxeo-webengine-admin/pom.xml b/nuxeo-webengine-features/nuxeo-webengine-admin/pom.xml
index b70978a84c..b3b9e4bb91 100644
--- a/nuxeo-webengine-features/nuxeo-webengine-admin/pom.xml
+++ b/nuxeo-webengine-features/nuxeo-webengine-admin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-webengine-features</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.webengine</groupId>
diff --git a/nuxeo-webengine-features/nuxeo-webengine-base/pom.xml b/nuxeo-webengine-features/nuxeo-webengine-base/pom.xml
index c1b331e7cc..7c00b30e95 100644
--- a/nuxeo-webengine-features/nuxeo-webengine-base/pom.xml
+++ b/nuxeo-webengine-features/nuxeo-webengine-base/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-webengine-features</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.webengine</groupId>
diff --git a/nuxeo-webengine-features/nuxeo-webengine-blogs-api/pom.xml b/nuxeo-webengine-features/nuxeo-webengine-blogs-api/pom.xml
index 7c126e2443..4d6ba6cb7d 100644
--- a/nuxeo-webengine-features/nuxeo-webengine-blogs-api/pom.xml
+++ b/nuxeo-webengine-features/nuxeo-webengine-blogs-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-webengine-features</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.webengine</groupId>
@@ -15,7 +15,7 @@
   <description>Sites Module to handle blogs API.</description>
 
   <properties>
-    <nuxeo.distribution.version>5.4.1-SNAPSHOT</nuxeo.distribution.version>
+    <nuxeo.distribution.version>5.4.2-SNAPSHOT</nuxeo.distribution.version>
   </properties>
 
   <dependencies>
diff --git a/nuxeo-webengine-features/nuxeo-webengine-blogs-core/pom.xml b/nuxeo-webengine-features/nuxeo-webengine-blogs-core/pom.xml
index 4864976fdd..b279c201f2 100644
--- a/nuxeo-webengine-features/nuxeo-webengine-blogs-core/pom.xml
+++ b/nuxeo-webengine-features/nuxeo-webengine-blogs-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-webengine-features</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.webengine</groupId>
@@ -15,7 +15,7 @@
   <description>Core Module to handle blogs.</description>
 
   <properties>
-    <nuxeo.distribution.version>5.4.1-SNAPSHOT</nuxeo.distribution.version>
+    <nuxeo.distribution.version>5.4.2-SNAPSHOT</nuxeo.distribution.version>
   </properties>
 
   <dependencies>
diff --git a/nuxeo-webengine-features/nuxeo-webengine-blogs/pom.xml b/nuxeo-webengine-features/nuxeo-webengine-blogs/pom.xml
index 34da1ac27d..cf24987fa9 100644
--- a/nuxeo-webengine-features/nuxeo-webengine-blogs/pom.xml
+++ b/nuxeo-webengine-features/nuxeo-webengine-blogs/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-webengine-features</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.webengine</groupId>
@@ -15,7 +15,7 @@
   <description>Sites Module to handle blogs.</description>
 
   <properties>
-    <nuxeo.distribution.version>5.4.1-SNAPSHOT</nuxeo.distribution.version>
+    <nuxeo.distribution.version>5.4.2-SNAPSHOT</nuxeo.distribution.version>
   </properties>
 
   <dependencies>
diff --git a/nuxeo-webengine-features/nuxeo-webengine-blogs/src/main/resources/OSGI-INF/webengine-blogs-layouts-contrib.xml b/nuxeo-webengine-features/nuxeo-webengine-blogs/src/main/resources/OSGI-INF/webengine-blogs-layouts-contrib.xml
index c28547cc70..88ed136eed 100644
--- a/nuxeo-webengine-features/nuxeo-webengine-blogs/src/main/resources/OSGI-INF/webengine-blogs-layouts-contrib.xml
+++ b/nuxeo-webengine-features/nuxeo-webengine-blogs/src/main/resources/OSGI-INF/webengine-blogs-layouts-contrib.xml
@@ -232,4 +232,4 @@
         
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-webengine-features/nuxeo-webengine-management/pom.xml b/nuxeo-webengine-features/nuxeo-webengine-management/pom.xml
index 2e8307a175..ff4d6dfc55 100644
--- a/nuxeo-webengine-features/nuxeo-webengine-management/pom.xml
+++ b/nuxeo-webengine-features/nuxeo-webengine-management/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-webengine-features</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.webengine</groupId>
diff --git a/nuxeo-webengine-features/nuxeo-webengine-sites-api/pom.xml b/nuxeo-webengine-features/nuxeo-webengine-sites-api/pom.xml
index 1e8ea7e8e0..964983b841 100644
--- a/nuxeo-webengine-features/nuxeo-webengine-sites-api/pom.xml
+++ b/nuxeo-webengine-features/nuxeo-webengine-sites-api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-webengine-features</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.webengine</groupId>
diff --git a/nuxeo-webengine-features/nuxeo-webengine-sites-core-contrib/pom.xml b/nuxeo-webengine-features/nuxeo-webengine-sites-core-contrib/pom.xml
index 9b9761fea3..1c16293bb0 100644
--- a/nuxeo-webengine-features/nuxeo-webengine-sites-core-contrib/pom.xml
+++ b/nuxeo-webengine-features/nuxeo-webengine-sites-core-contrib/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-webengine-features</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.webengine</groupId>
diff --git a/nuxeo-webengine-features/nuxeo-webengine-sites-core-contrib/src/main/resources/OSGI-INF/core-types-contrib.xml b/nuxeo-webengine-features/nuxeo-webengine-sites-core-contrib/src/main/resources/OSGI-INF/core-types-contrib.xml
index 931a4db774..4e16d7608d 100644
--- a/nuxeo-webengine-features/nuxeo-webengine-sites-core-contrib/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/nuxeo-webengine-features/nuxeo-webengine-sites-core-contrib/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -38,4 +38,4 @@
   </extension>
   
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-webengine-features/nuxeo-webengine-sites-core-contrib/src/main/resources/OSGI-INF/webengine-nxsearch-contrib.xml b/nuxeo-webengine-features/nuxeo-webengine-sites-core-contrib/src/main/resources/OSGI-INF/webengine-nxsearch-contrib.xml
index c48c4523ce..e5a7275ddf 100644
--- a/nuxeo-webengine-features/nuxeo-webengine-sites-core-contrib/src/main/resources/OSGI-INF/webengine-nxsearch-contrib.xml
+++ b/nuxeo-webengine-features/nuxeo-webengine-sites-core-contrib/src/main/resources/OSGI-INF/webengine-nxsearch-contrib.xml
@@ -55,4 +55,4 @@
       <mimetype name=".*/.*">any2text</mimetype>
     </fullText>
   </extension>
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-webengine-features/nuxeo-webengine-sites/pom.xml b/nuxeo-webengine-features/nuxeo-webengine-sites/pom.xml
index e690ef9a41..f6e3130b3d 100644
--- a/nuxeo-webengine-features/nuxeo-webengine-sites/pom.xml
+++ b/nuxeo-webengine-features/nuxeo-webengine-sites/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-webengine-features</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.webengine</groupId>
diff --git a/nuxeo-webengine-features/nuxeo-webengine-sites/src/main/resources/OSGI-INF/webengine-layouts-contrib.xml b/nuxeo-webengine-features/nuxeo-webengine-sites/src/main/resources/OSGI-INF/webengine-layouts-contrib.xml
index e49ce9a868..9eb3bea688 100644
--- a/nuxeo-webengine-features/nuxeo-webengine-sites/src/main/resources/OSGI-INF/webengine-layouts-contrib.xml
+++ b/nuxeo-webengine-features/nuxeo-webengine-sites/src/main/resources/OSGI-INF/webengine-layouts-contrib.xml
@@ -230,4 +230,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-webengine-features/nuxeo-webengine-sites/src/main/resources/widgets/sites/search_results.xml b/nuxeo-webengine-features/nuxeo-webengine-sites/src/main/resources/widgets/sites/search_results.xml
index 2d4a8d7ae0..83636632b6 100644
--- a/nuxeo-webengine-features/nuxeo-webengine-sites/src/main/resources/widgets/sites/search_results.xml
+++ b/nuxeo-webengine-features/nuxeo-webengine-sites/src/main/resources/widgets/sites/search_results.xml
@@ -18,4 +18,4 @@
 
     </div>
   </#list>
-</div>
\ No newline at end of file
+</div>
diff --git a/nuxeo-webengine-features/nuxeo-webengine-sites/src/main/resources/widgets/sites/tags_cloud.xml b/nuxeo-webengine-features/nuxeo-webengine-sites/src/main/resources/widgets/sites/tags_cloud.xml
index 9d4fa0c297..c4661a6747 100644
--- a/nuxeo-webengine-features/nuxeo-webengine-sites/src/main/resources/widgets/sites/tags_cloud.xml
+++ b/nuxeo-webengine-features/nuxeo-webengine-sites/src/main/resources/widgets/sites/tags_cloud.xml
@@ -28,4 +28,4 @@
 $('#tagsCloud').ready(function() {
   createCloud();
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/nuxeo-webengine-features/nuxeo-webengine-sites/src/test/resources/OSGI-INF/webengine-layouts-contrib.xml b/nuxeo-webengine-features/nuxeo-webengine-sites/src/test/resources/OSGI-INF/webengine-layouts-contrib.xml
index 35fb004187..4e966355de 100644
--- a/nuxeo-webengine-features/nuxeo-webengine-sites/src/test/resources/OSGI-INF/webengine-layouts-contrib.xml
+++ b/nuxeo-webengine-features/nuxeo-webengine-sites/src/test/resources/OSGI-INF/webengine-layouts-contrib.xml
@@ -83,4 +83,4 @@
 
   </extension>
 
-</component>
\ No newline at end of file
+</component>
diff --git a/nuxeo-webengine-features/pom.xml b/nuxeo-webengine-features/pom.xml
index 19a50c1934..ae1c472def 100644
--- a/nuxeo-webengine-features/pom.xml
+++ b/nuxeo-webengine-features/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-features-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>nuxeo-webengine-features</artifactId>
diff --git a/pmd.xml b/pmd.xml
index 991239521c..31616fc649 100644
--- a/pmd.xml
+++ b/pmd.xml
@@ -259,4 +259,4 @@
   <rule ref="rulesets/strings.xml/AvoidDuplicateLiterals">
     <priority>3</priority>
   </rule>
-</ruleset>
\ No newline at end of file
+</ruleset>
diff --git a/pom.xml b/pom.xml
index f26059a763..ddf535d495 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.nuxeo.ecm.platform</groupId>
     <artifactId>nuxeo-services-parent</artifactId>
-    <version>5.4.1-SNAPSHOT</version>
+    <version>5.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuxeo.ecm.platform</groupId>
@@ -16,10 +16,10 @@
   <description>Nuxeo Features: Parent.</description>
 
   <properties>
-    <nuxeo.theme.version>5.4.1-SNAPSHOT</nuxeo.theme.version>
-    <nuxeo.features.version>5.4.1-SNAPSHOT</nuxeo.features.version>
-    <nuxeo.webengine.version>5.4.1-SNAPSHOT</nuxeo.webengine.version>
-    <nuxeo.jsf.version>5.4.1-SNAPSHOT</nuxeo.jsf.version>
+    <nuxeo.theme.version>5.4.2-SNAPSHOT</nuxeo.theme.version>
+    <nuxeo.features.version>5.4.2-SNAPSHOT</nuxeo.features.version>
+    <nuxeo.webengine.version>5.4.2-SNAPSHOT</nuxeo.webengine.version>
+    <nuxeo.jsf.version>5.4.2-SNAPSHOT</nuxeo.jsf.version>
     <nuxeo.connect.client.version>1.1</nuxeo.connect.client.version>
   </properties>