diff --git a/.travis.yml b/.travis.yml
index 91763ac29..006d153fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,5 +2,6 @@ language: java
 dist: trusty
 jdk:
   - oraclejdk8
-script: mvn install
+script: 
+ - mvn install
 sudo: false
diff --git a/LICENSE.txt b/LICENSE.txt
index d64569567..fce5e4c57 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2015-2018 Capgemini SE.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/bom/pom.xml b/boms/bom/pom.xml
similarity index 65%
rename from bom/pom.xml
rename to boms/bom/pom.xml
index 9fd1b610b..bf223fb2e 100644
--- a/bom/pom.xml
+++ b/boms/bom/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>io.oasp.java.dev</groupId>
-    <artifactId>oasp4j</artifactId>
+    <artifactId>oasp4j-boms</artifactId>
     <version>dev-SNAPSHOT</version>
   </parent>
   <groupId>io.oasp.java</groupId>
@@ -26,15 +26,35 @@
 
   <dependencyManagement>
     <dependencies>
+      <!-- *** INTERNAL DEPENDENCIES *** -->
+      <dependency>
+        <groupId>io.oasp.java.boms</groupId>
+        <artifactId>oasp4j-minimal-bom</artifactId>
+        <version>${oasp4j.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <!-- *** EXTERNAL DEPENDENCIES *** -->
-      <!-- BOM for localization -->
       <!-- Library with general utilities as well as I18N and exception support -->
       <dependency>
         <groupId>net.sf.m-m-m</groupId>
-        <artifactId>mmm-util-bom</artifactId>
+        <artifactId>mmm-util-core</artifactId>
+        <version>${mmm.util.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>net.sf.m-m-m</groupId>
+        <artifactId>mmm-util-validation</artifactId>
+        <version>${mmm.util.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>net.sf.m-m-m</groupId>
+        <artifactId>mmm-util-search</artifactId>
+        <version>${mmm.util.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>net.sf.m-m-m</groupId>
+        <artifactId>mmm-util-entity</artifactId>
         <version>${mmm.util.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
       </dependency>
       <!-- JSR 250 for component/bean lifecycle management -->
       <dependency>
@@ -235,132 +255,6 @@
         <version>1.1.3</version>
       </dependency>
 
-      <!-- *** INTERNAL DEPENDENCIES *** -->
-      <dependency>
-        <groupId>io.oasp.java.modules</groupId>
-        <artifactId>oasp4j-test</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.modules</groupId>
-        <artifactId>oasp4j-logging</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.modules</groupId>
-        <artifactId>oasp4j-basic</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.modules</groupId>
-        <artifactId>oasp4j-batch</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.modules</groupId>
-        <artifactId>oasp4j-beanmapping</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.modules</groupId>
-        <artifactId>oasp4j-configuration</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.modules</groupId>
-        <artifactId>oasp4j-security</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.modules</groupId>
-        <artifactId>oasp4j-service</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.modules</groupId>
-        <artifactId>oasp4j-json</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.modules</groupId>
-        <artifactId>oasp4j-rest</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.modules</groupId>
-        <artifactId>oasp4j-cxf-client</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.modules</groupId>
-        <artifactId>oasp4j-cxf-client-rest</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.modules</groupId>
-        <artifactId>oasp4j-cxf-client-ws</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.modules</groupId>
-        <artifactId>oasp4j-cxf-server</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.modules</groupId>
-        <artifactId>oasp4j-cxf-server-rest</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.modules</groupId>
-        <artifactId>oasp4j-cxf-server-ws</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.starters</groupId>
-        <artifactId>oasp4j-starter-cxf-client</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.starters</groupId>
-        <artifactId>oasp4j-starter-cxf-client-rest</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.starters</groupId>
-        <artifactId>oasp4j-starter-cxf-client-ws</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.starters</groupId>
-        <artifactId>oasp4j-starter-cxf-server</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.starters</groupId>
-        <artifactId>oasp4j-starter-cxf-server-rest</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.starters</groupId>
-        <artifactId>oasp4j-starter-cxf-server-ws</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.modules</groupId>
-        <artifactId>oasp4j-jpa</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.modules</groupId>
-        <artifactId>oasp4j-jpa-envers</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.oasp.java.modules</groupId>
-        <artifactId>oasp4j-web</artifactId>
-        <version>${project.version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/boms/minimal/pom.xml b/boms/minimal/pom.xml
new file mode 100644
index 000000000..b8fcd4ae8
--- /dev/null
+++ b/boms/minimal/pom.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.oasp.java.dev</groupId>
+    <artifactId>oasp4j-boms</artifactId>
+    <version>dev-SNAPSHOT</version>
+  </parent>
+  <groupId>io.oasp.java.boms</groupId>
+  <artifactId>oasp4j-minimal-bom</artifactId>
+  <version>${oasp4j.version}</version>
+  <packaging>pom</packaging>
+  <name>${project.artifactId}</name>
+  <description>Dependencies (BOM) of the Open Application Standard Platform for Java (OASP4J) without any thirdparty.</description>
+  <url>http://oasp.io/oasp4j/</url>
+  <inceptionYear>2014</inceptionYear>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <oasp.flatten.mode>bom</oasp.flatten.mode>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <!-- Modules -->
+      <dependency>
+        <groupId>io.oasp.java.modules</groupId>
+        <artifactId>oasp4j-test</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.modules</groupId>
+        <artifactId>oasp4j-logging</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.modules</groupId>
+        <artifactId>oasp4j-basic</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.modules</groupId>
+        <artifactId>oasp4j-batch</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.modules</groupId>
+        <artifactId>oasp4j-beanmapping</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.modules</groupId>
+        <artifactId>oasp4j-configuration</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.modules</groupId>
+        <artifactId>oasp4j-security</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.modules</groupId>
+        <artifactId>oasp4j-service</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.modules</groupId>
+        <artifactId>oasp4j-json</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.modules</groupId>
+        <artifactId>oasp4j-rest</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.modules</groupId>
+        <artifactId>oasp4j-cxf-client</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.modules</groupId>
+        <artifactId>oasp4j-cxf-client-rest</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.modules</groupId>
+        <artifactId>oasp4j-cxf-client-ws</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.modules</groupId>
+        <artifactId>oasp4j-cxf-server</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.modules</groupId>
+        <artifactId>oasp4j-cxf-server-rest</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.modules</groupId>
+        <artifactId>oasp4j-cxf-server-ws</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.modules</groupId>
+        <artifactId>oasp4j-jpa</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.modules</groupId>
+        <artifactId>oasp4j-jpa-envers</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.modules</groupId>
+        <artifactId>oasp4j-web</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <!-- Starters -->
+      <dependency>
+        <groupId>io.oasp.java.starters</groupId>
+        <artifactId>oasp4j-starter-cxf-client</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.starters</groupId>
+        <artifactId>oasp4j-starter-cxf-client-rest</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.starters</groupId>
+        <artifactId>oasp4j-starter-cxf-client-ws</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.starters</groupId>
+        <artifactId>oasp4j-starter-cxf-server</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.starters</groupId>
+        <artifactId>oasp4j-starter-cxf-server-rest</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.oasp.java.starters</groupId>
+        <artifactId>oasp4j-starter-cxf-server-ws</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+</project>
diff --git a/boms/pom.xml b/boms/pom.xml
new file mode 100644
index 000000000..0e731108a
--- /dev/null
+++ b/boms/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.oasp.java.dev</groupId>
+    <artifactId>oasp4j</artifactId>
+    <version>dev-SNAPSHOT</version>
+  </parent>
+  <artifactId>oasp4j-boms</artifactId>
+  <packaging>pom</packaging>
+  <name>${project.artifactId}</name>
+  <description>Bill of Materials (BOM) for the Open Application Standard Platform for Java (OASP4J).</description>
+
+  <modules> <!-- Order is important here as maven does not track BOM imports as dependencies for reactor build order -->
+    <module>minimal</module>
+    <module>bom</module>
+  </modules>
+
+</project>
diff --git a/pom.xml b/pom.xml
index 43bae8716..053f2c0ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
   <inceptionYear>2014</inceptionYear>
 
   <modules>
-    <module>bom</module>
+    <module>boms</module>
     <module>modules</module>
     <module>starters</module>
     <module>templates</module>
diff --git a/templates/server/pom.xml b/templates/server/pom.xml
index c02c97a83..215e88173 100644
--- a/templates/server/pom.xml
+++ b/templates/server/pom.xml
@@ -36,7 +36,7 @@
         <artifactId>maven-resources-plugin</artifactId>
         <configuration>
           <delimiters>
-            <delimiter>^*^</delimiter>
+            <delimiter>$[*]</delimiter>
           </delimiters>
           <useDefaultDelimiters>false</useDefaultDelimiters>
         </configuration>
diff --git a/templates/server/src/main/resources/archetype-resources/pom.xml b/templates/server/src/main/resources/archetype-resources/pom.xml
index 4ead40ae5..e1ccda613 100644
--- a/templates/server/src/main/resources/archetype-resources/pom.xml
+++ b/templates/server/src/main/resources/archetype-resources/pom.xml
@@ -11,7 +11,7 @@
 
   <properties>
     <spring.boot.version>1.5.3.RELEASE</spring.boot.version>
-    <oasp4j.version>2.6.0</oasp4j.version>
+    <oasp4j.version>$[oasp4j.version]</oasp4j.version>
     <flyway.version>4.2.0</flyway.version>
     <java.version>1.7</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>