Now we use NEON as Eclipse platform
diff --git a/.gitignore b/.gitignore
index 03756d2..724bb40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,36 @@
 target/
 **git.properties
+
+**/target/
+**/.metadata/
+
+**/emf-gen/**/.gitignore
+**/src-gen/**/.gitignore
+**/git.properties
+**/*.java._trace
+**/*.log
+**/*.log.properties
+
+**/bin/
+**/build/
+*.class
+*.ctrl
+**/Debug/
+.DS_Store
+*.ear
+*.war
+
+**/*.actionbin
+**/*.blipbin
+**/*.chartbin
+**/*.cubebin
+**/*.datatypebin
+**/*.dtobin
+**/*.entitybin
+**/*.servicebin
+**/*.tablebin
+**/*.uibin
+**/*.uisemanticbin
+**/*.xtendbin
+**/*.xtextbin
+
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..76f90fd
--- /dev/null
+++ b/README.md
@@ -0,0 +1,69 @@
+# lunifera-releng-maven
+==================
+
+## Setting up the development environment
+
+###1. Set the local deployment directory:
+
+If you are using Eclipse, go to Preferences/Maven/User Settings. Then click in Open File to open the user's settings.xml file.    
+I you want this file could be found at ~user/.m2 directory.    
+In the opened file created a new profile and include the property 'lunifera.developer.home' and set a value for it that points to a created directory where the result of each repository's build will be copied.     
+See this example:
+
+    <profiles>
+      <profile>
+        <id>lunifera-dev</id>
+        <activation>
+          <activeByDefault>true</activeByDefault>
+        </activation>
+        <properties>
+          <lunifera.developer.home>/User/myuser/LuniferaDev/</lunifera.developer.home>
+        </properties>
+      </profile>
+    </profiles>
+
+###2. Clone the source repositories:
+* To easy this job, you can clone only the lunifera-releng-maven repository:    
+```git clone git@github.com:lunifera/lunifera-releng-maven.git```
+* then use this scripts to clone other related projects:    
+``` ./scripts/git-clone-others.sh```
+
+To be able to contribute you must fork the desired lunifera's [github repository](https://github.com/lunifera?tab=repositories) and clone from it.
+
+
+###3. Build and install the parent POMs:
+* before build any other repository you must build and install the releng parent projects:
+```cd lunifera-releng-maven```
+```mvn clean install```
+
+
+## Development Tasks
+
+### Getting source changes:
+* You can use the git-all script to pull updated from all cloned repositories:    
+```./scripts/git-all.sh pull```
+
+
+### Build a latest kepler p2 repo using the remote federated (composite) p2. 
+* open a terminal in the repository root folder and type this:
+```mvn -P lunifera.build.p2 -Dlunifera.build.uses.remote.federated.p2```
+
+* The remote federated p2 is the default, so the property 'lunifera.build.uses.remote.federated.p2' can be omitted.
+```mvn -P lunifera.build.p2```
+
+
+### Build a latest kepler p2 repo using the remote federated p2 and deploying the results to local deployment folder. 
+* open a terminal in the repository root folder and type this:
+```mvn -P lunifera.build.p2 -Dlunifera.build.uses.remote.federated.p2 -Dlunifera.deploy.to.local.federated.p2```
+
+
+### Build a latest kepler p2 repo using the local federated p2 and deploying the results to local deployment folder. 
+* open a terminal in the repository root folder and type this:
+```mvn -P lunifera.build.p2 -Dlunifera.build.uses.local.federated.p2 -Dlunifera.deploy.to.local.federated.p2```
+
+
+### Build a latest kepler p2 repo using both local and remote federated p2 and deploying the results to local deployment folder: 
+* open a terminal in the repository root folder and type this:
+```mvn -P lunifera.build.p2 -Dlunifera.build.uses.local.federated.p2 -Dlunifera.build.uses.remote.federated.p2 -Dlunifera.deploy.to.local.federated.p2```
+
+
diff --git a/org.eclipse.osbp.license.feature/.project b/org.eclipse.osbp.license.feature/.project
new file mode 100644
index 0000000..9b1561d
--- /dev/null
+++ b/org.eclipse.osbp.license.feature/.project
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.osbp.license.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.osbp.license.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.license.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.license.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.license.feature/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.license.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.license.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.license.feature/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.license.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.license.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.releng.maven.fpom.node/LICENSE.txt b/org.eclipse.osbp.license.feature/LICENSE.txt
similarity index 100%
rename from org.eclipse.osbp.releng.maven.fpom.node/LICENSE.txt
rename to org.eclipse.osbp.license.feature/LICENSE.txt
diff --git a/org.eclipse.osbp.license.feature/build.properties b/org.eclipse.osbp.license.feature/build.properties
new file mode 100644
index 0000000..7342b9a
--- /dev/null
+++ b/org.eclipse.osbp.license.feature/build.properties
@@ -0,0 +1,11 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               notice.html,\
+               license.html,\
+               LICENSE.txt,\
+               epl-v10.html,\
+               build.properties
+src.includes = license.html,\
+               LICENSE.txt,\
+               notice.html,\
+               epl-v10.html			   
diff --git a/org.eclipse.osbp.license.feature/epl-v10.html b/org.eclipse.osbp.license.feature/epl-v10.html
new file mode 100644
index 0000000..b398acc
--- /dev/null
+++ b/org.eclipse.osbp.license.feature/epl-v10.html
@@ -0,0 +1,259 @@
+<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>"Contribution" means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>"Contributor" means any person or entity that distributes
+the Program.</p>
+
+<p>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>"Program" means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+
+
+</body></html>
\ No newline at end of file
diff --git a/org.eclipse.osbp.license.feature/feature.properties b/org.eclipse.osbp.license.feature/feature.properties
new file mode 100644
index 0000000..d3bda38
--- /dev/null
+++ b/org.eclipse.osbp.license.feature/feature.properties
@@ -0,0 +1,192 @@
+#=======================================================================
+# Copyright (c) 2018 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany).
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+# Loetz GmbH&Co.KG - initial API and implementation 
+#=======================================================================
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+licenseFeatureName=OSBP Software Factory License 
+#featureName =OSBP Software Factory License 
+
+# "providerName" property - name of the company that provides the feature
+licenseProviderName=Eclipse OSBP
+#providerName=Eclipse OSBP
+
+# "description" property - description of the feature
+licenseDescription=OSBP Software Factory License
+
+# "updateSiteName" property - label for the update site
+updateSiteName=
+
+# "copyright" property - text of the "Feature Update Copyright"
+licenseCopyright=\
+Copyright (c) 2011, 2018 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany). \n\
+This program and the accompanying materials are made available under the \n\
+terms of the Eclipse Public License 2.0 which is available at\n\
+http://www.eclipse.org/legal/epl-2.0.\n\
+\n\
+SPDX-License-Identifier: EPL-2.0 \n\
+\n\
+Contributors:\n\
+    Loetz GmbH&amp;Co.KG - initial API and basis\n
+
+################ end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+\n\
+November 22, 2017\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\
+MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public License\n\
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\
+"Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code, documentation\n\
+and other files maintained in the Eclipse Foundation source code repository\n\
+("Repository") in software modules ("Modules") and made available as\n\
+downloadable archives ("Downloads").\n\
+\n\
+-   Content may be structured and packaged into modules to facilitate\n\
+    delivering, extending, and upgrading the Content. Typical modules may\n\
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\
+    features ("Features").\n\
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+    (Javaâ\u201E¢ ARchive) in a directory named "plugins".\n\
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\
+    associated material. Each Feature may be packaged as a sub-directory in a\n\
+    directory named "features". Within a Feature, files named "feature.xml" may\n\
+    contain a list of the names and version numbers of the Plug-ins and/or\n\
+    Fragments associated with that Feature.\n\
+-   Features may also include other Features ("Included Features"). Within a\n\
+    Feature, files named "feature.xml" may contain a list of the names and\n\
+    version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be contained in\n\
+files named "about.html" ("Abouts"). The terms and conditions governing Features\n\
+and Included Features should be contained in files named "license.html"\n\
+("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\
+directory of a Download or Module including, but not limited to the following\n\
+locations:\n\
+\n\
+-   The top-level (root) directory\n\
+-   Plug-in and Fragment directories\n\
+-   Inside Plug-ins and Fragments packaged as JARs\n\
+-   Sub-directories of the directory named "src" of certain Plug-ins\n\
+-   Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using\n\
+the Provisioning Technology (as defined below), you must agree to a license\n\
+("Feature Update License") during the installation process. If the Feature\n\
+contains Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform you\n\
+where you can locate them. Feature Update Licenses may be found in the "license"\n\
+property of files named "feature.properties" found within a Feature. Such\n\
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your use of\n\
+the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+-   Eclipse Public License Version 1.0 (available at\n\
+    http://www.eclipse.org/legal/epl-v10.html)\n\
+-   Eclipse Distribution License Version 1.0 (available at\n\
+    http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+-   Common Public License Version 1.0 (available at\n\
+    http://www.eclipse.org/legal/cpl-v10.html)\n\
+-   Apache Software License 1.1 (available at\n\
+    http://www.apache.org/licenses/LICENSE)\n\
+-   Apache Software License 2.0 (available at\n\
+    http://www.apache.org/licenses/LICENSE-2.0)\n\
+-   Mozilla Public License Version 1.1 (available at\n\
+    http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO\n\
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\
+provided, please contact the Eclipse Foundation to determine what terms and\n\
+conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which\n\
+include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install\n\
+software, documentation, information and/or other materials (collectively\n\
+"Installable Software"). This capability is provided with the intent of allowing\n\
+such users to install, extend and update Eclipse-based products. Information\n\
+about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install\n\
+Installable Software. You shall be responsible for enabling the applicable\n\
+license agreements relating to the Installable Software to be presented to, and\n\
+accepted by, the users of the Provisioning Technology in accordance with the\n\
+Specification. By using Provisioning Technology in such a manner and making it\n\
+available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the\n\
+following:\n\
+\n\
+1.  A series of actions may occur ("Provisioning Process") in which a user may\n\
+    execute the Provisioning Technology on a machine ("Target Machine") with the\n\
+    intent of installing, extending or updating the functionality of an\n\
+    Eclipse-based product.\n\
+2.  During the Provisioning Process, the Provisioning Technology may cause third\n\
+    party Installable Software or a portion thereof to be accessed and copied to\n\
+    the Target Machine.\n\
+3.  Pursuant to the Specification, you will provide to the user the terms and\n\
+    conditions that govern the use of the Installable Software ("Installable\n\
+    Software Agreement") and such Installable Software Agreement shall be\n\
+    accessed from the Target Machine in accordance with the Specification. Such\n\
+    Installable Software Agreement must inform the user of the terms and\n\
+    conditions that govern the Installable Software and must solicit acceptance\n\
+    by the end user in the manner prescribed in such Installable\n\
+    Software Agreement. Upon such indication of agreement by the user, the\n\
+    provisioning Technology will complete installation of the\n\
+    Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are currently\n\
+may have restrictions on the import, possession, and use, and/or re-export to\n\
+another country, of encryption software. BEFORE using any encryption software,\n\
+please check the country's laws, regulations and policies concerning the import,\n\
+possession, or use, and re-export of encryption software, to see if this is\n\
+permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\
+United States, other countries, or both.\n
+########### end of license property ##########################################
diff --git a/org.eclipse.osbp.license.feature/feature.xml b/org.eclipse.osbp.license.feature/feature.xml
new file mode 100644
index 0000000..441bf54
--- /dev/null
+++ b/org.eclipse.osbp.license.feature/feature.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.osbp.license.feature"
+      label="%licenseFeatureName"
+      version="0.9.0.qualifier"
+      provider-name="%licenseProviderName">
+
+   <description>
+      %licenseDescription
+   </description>
+
+   <copyright>
+      %licenseCopyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+</feature>
diff --git a/org.eclipse.osbp.license.feature/license.html b/org.eclipse.osbp.license.feature/license.html
new file mode 100644
index 0000000..6e579a5
--- /dev/null
+++ b/org.eclipse.osbp.license.feature/license.html
@@ -0,0 +1,164 @@
+<!--?xml version="1.0" encoding="ISO-8859-1" ?-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse
+ Foundation is provided to you under the terms and conditions of the 
+Eclipse Public License Version 1.0
+   ("EPL").  A copy of the EPL is provided with this Content and is also
+ available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, 
+documentation and other files maintained in the Eclipse Foundation 
+source code
+   repository ("Repository") in software modules ("Modules") and made 
+available as downloadable archives ("Downloads").</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to 
+facilitate delivering, extending, and upgrading the Content.  Typical 
+modules may include plug-ins ("Plug-ins"), plug-in fragments 
+("Fragments"), and features ("Features").</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&#8482; ARchive) in a directory named "plugins".</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or 
+Fragments and associated material.  Each Feature may be packaged as a 
+sub-directory in a directory named "features".  Within a Feature, files 
+named "feature.xml" may contain a list of the names and version numbers 
+of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features ("Included 
+Features"). Within a Feature, files named "feature.xml" may contain a 
+list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be 
+contained in files named "about.html" ("Abouts"). The terms and 
+conditions governing Features and
+Included Features should be contained in files named "license.html" 
+("Feature Licenses").  Abouts and Feature Licenses may be located in any
+ directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is 
+installed using the Provisioning Technology (as defined below), you must
+ agree to a license ("Feature Update License") during the
+installation process.  If the Feature contains Included Features, the 
+Feature Update License should either provide you with the terms and 
+conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be 
+found in the "license" property of files named "feature.properties" 
+found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the 
+terms and conditions (or references to such terms and conditions) that 
+govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER 
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
+  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND 
+CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, 
+or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions 
+govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, 
+examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager ("Provisioning Technology") for the purpose of 
+allowing users to install software, documentation, information and/or
+   other materials (collectively "Installable Software"). This 
+capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about 
+packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   ("Specification").</p>
+
+<p>You may use Provisioning Technology to allow other parties to install
+ Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to
+ be presented to, and accepted by, the users of the Provisioning 
+Technology
+   in accordance with the Specification. By using Provisioning 
+Technology in such a manner and making it available in accordance with 
+the
+   Specification, you further acknowledge your agreement to, and the 
+acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur ("Provisioning Process") in 
+which a user may execute the Provisioning Technology
+       on a machine ("Target Machine") with the intent of installing, 
+extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology 
+may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user 
+the terms and conditions that govern the use of the Installable
+       Software ("Installable Software Agreement") and such Installable 
+Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable 
+Software Agreement must inform the user of the terms and conditions that
+ govern
+       the Installable Software and must solicit acceptance by the end 
+user in the manner prescribed in such Installable Software Agreement. 
+Upon such
+       indication of agreement by the user, the provisioning Technology 
+will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are
+ currently may have restrictions on the import, possession, and use, 
+and/or re-export to
+   another country, of encryption software. BEFORE using any encryption 
+software, please check the country's laws, regulations and policies 
+concerning the import,
+   possession, or use, and re-export of encryption software, to see if 
+this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+
+
+</body></html>
\ No newline at end of file
diff --git a/org.eclipse.osbp.license.feature/notice.html b/org.eclipse.osbp.license.feature/notice.html
new file mode 100644
index 0000000..c3d34c3
--- /dev/null
+++ b/org.eclipse.osbp.license.feature/notice.html
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.osbp.license.feature/pom.xml b/org.eclipse.osbp.license.feature/pom.xml
new file mode 100644
index 0000000..21d9915
--- /dev/null
+++ b/org.eclipse.osbp.license.feature/pom.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+#=======================================================================
+# Copyright (c) 2017 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany).
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+# Loetz GmbH&Co.KG - initial API and implementation 
+#=======================================================================
+-->
+<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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.eclipse.osbp.releng.maven</groupId>
+        <artifactId>org.eclipse.osbp.releng.maven.parent.tycho</artifactId>
+        <version>0.9.0-SNAPSHOT</version>
+        <relativePath>../org.eclipse.osbp.releng.maven.parent.tycho</relativePath>
+    </parent>
+
+    <artifactId>org.eclipse.osbp.license.feature</artifactId>
+    <packaging>eclipse-feature</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.eclipse.tycho.extras</groupId>
+                <artifactId>tycho-source-feature-plugin</artifactId>
+                <version>${tychoExtrasVersion}</version>
+                <executions>
+                    <execution>
+                        <id>source-feature</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>source-feature</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <labelSuffix> (source)</labelSuffix>
+                </configuration>
+            </plugin>
+            <plugin>
+                <!-- workaround while bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=398250 
+					is not fixed -->
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-p2-plugin</artifactId>
+                <version>${tycho-version}</version>
+                <executions>
+                    <execution>
+                        <id>attached-p2-metadata</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-metadata</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>javadoc-jar</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/org.eclipse.osbp.license.feature/src/main/javadoc/README.txt b/org.eclipse.osbp.license.feature/src/main/javadoc/README.txt
new file mode 100644
index 0000000..831da7e
--- /dev/null
+++ b/org.eclipse.osbp.license.feature/src/main/javadoc/README.txt
@@ -0,0 +1 @@
+Resource folder for javadoc resources.
\ No newline at end of file
diff --git a/org.eclipse.osbp.license.feature/src/overview.html b/org.eclipse.osbp.license.feature/src/overview.html
new file mode 100644
index 0000000..1ef9a78
--- /dev/null
+++ b/org.eclipse.osbp.license.feature/src/overview.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+	<title>OSBP xtext.datamart.lib</title>
+</head>
+<body>
+<p>The <strong>OSBP&nbsp;xtext.datamart.lib</strong> provides bundles for the OSBP xtext.datamart.lib functionality.</p>
+</body>
+</html>
diff --git a/org.eclipse.osbp.releng.maven.fpom.equinox.luna/.project b/org.eclipse.osbp.releng.maven.fpom.equinox.luna/.project
deleted file mode 100644
index 1c2be24..0000000
--- a/org.eclipse.osbp.releng.maven.fpom.equinox.luna/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.osbp.releng.maven.fpom.equinox.luna</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.osbp.releng.maven.fpom.equinox.luna/LICENSE.txt b/org.eclipse.osbp.releng.maven.fpom.equinox.luna/LICENSE.txt
deleted file mode 100644
index ff42ad4..0000000
--- a/org.eclipse.osbp.releng.maven.fpom.equinox.luna/LICENSE.txt
+++ /dev/null
@@ -1,161 +0,0 @@
-Eclipse Public License -v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION
-OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor.
-A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate
-modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not
-derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of
-its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute
-and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code
-form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the
-Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the
-combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such
-addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not
-apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no
-assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity
-based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property
-rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the
-Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to
-grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including
-warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and
-fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any
-other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it
-in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and
-the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes
-the Program in a commercial product offering should do so in a manner which does not create potential liability for
-other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions
-brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual
-property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may
- participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is
-then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone.
-Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to
-those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result,
-the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for
-determining the appropriateness of using and distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance
-with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such
-provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such
-Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such
-noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses
- granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement
-is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish
-new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the
-right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the
-Agreement will be given a distinguishing version number. The Program (including Contributions) may always be
-distributed subject to the version of the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the
-new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States
-of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause
-of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
diff --git a/org.eclipse.osbp.releng.maven.fpom.equinox.luna/pom.xml b/org.eclipse.osbp.releng.maven.fpom.equinox.luna/pom.xml
deleted file mode 100644
index 5d6ab95..0000000
--- a/org.eclipse.osbp.releng.maven.fpom.equinox.luna/pom.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--#======================================================================= -->
-<!--# Copyright (c) 2012, 2014 - C4biz Softwares ME, Loetz GmbH&Co.KG (69115 Heidelberg, Germany) -->
-<!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License v1.0 -->
-<!--# which accompanies this distribution, and is available at -->
-<!--# http://www.eclipse.org/legal/epl-v10.html -->
-<!--# -->
-<!--# Contributors: -->
-<!--# Cristiano Gavião (C4biz)- initial API and implementation -->
-<!--#======================================================================= -->
-<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>org.eclipse.osbp.releng.maven</groupId>
-        <artifactId>org.eclipse.osbp.releng.maven</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>org.eclipse.osbp.releng.maven.fpom.equinox.luna</artifactId>
-
-    <packaging>pom</packaging>
-
-    <scm>
-        <connection>${osbp.scm.connection}</connection>
-        <developerConnection>${osbp.scm.connection.dev}</developerConnection>
-        <tag>HEAD</tag>
-    </scm>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <version>${report.license.version}</version>
-                <executions>
-                    <execution>
-                        <id>update-license-files</id>
-                        <inherited>false</inherited>
-                        <configuration>
-                            <deployMissingFile>true</deployMissingFile>
-                            <useMissingFile>true</useMissingFile>
-                            <useRepositoryMissingFiles>false</useRepositoryMissingFiles>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.osbp.osgi</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
-            <version>3.10.0.v20140606-1445</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.osbp.osgi</groupId>
-            <artifactId>org.eclipse.osgi.services</artifactId>
-            <version>3.4.0.v20140312-2051</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.osbp.osgi</groupId>
-            <artifactId>org.eclipse.equinox.event</artifactId>
-            <version>1.3.100.v20140115-1647</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.osbp.osgi</groupId>
-            <artifactId>org.eclipse.equinox.cm</artifactId>
-            <version>1.1.0.v20131021-1936</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.osbp.osgi</groupId>
-            <artifactId>org.eclipse.osgi.util</artifactId>
-            <version>3.3.0.v20131023-1243</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.osbp.osgi</groupId>
-            <artifactId>org.eclipse.equinox.coordinator</artifactId>
-            <version>1.3.0.v20140327-1650</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.osbp.osgi</groupId>
-            <artifactId>org.eclipse.equinox.ds</artifactId>
-            <version>1.4.200.v20131126-2331</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.osbp.osgi</groupId>
-            <artifactId>org.eclipse.equinox.common</artifactId>
-            <version>3.6.200.v20130402-1505</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.osbp.osgi</groupId>
-            <artifactId>org.eclipse.equinox.util</artifactId>
-            <version>1.0.500.v20130404-1337</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.osbp.osgi</groupId>
-            <artifactId>org.eclipse.equinox.preferences</artifactId>
-            <version>3.5.200.v20140224-1527</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.osbp.osgi</groupId>
-            <artifactId>org.eclipse.equinox.console</artifactId>
-            <version>1.1.0.v20140131-1639</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/org.eclipse.osbp.releng.maven.fpom.felix/.project b/org.eclipse.osbp.releng.maven.fpom.felix/.project
deleted file mode 100644
index 6c64c17..0000000
--- a/org.eclipse.osbp.releng.maven.fpom.felix/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.osbp.releng.maven.fpom.felix</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.osbp.releng.maven.fpom.felix/LICENSE.txt b/org.eclipse.osbp.releng.maven.fpom.felix/LICENSE.txt
deleted file mode 100644
index ff42ad4..0000000
--- a/org.eclipse.osbp.releng.maven.fpom.felix/LICENSE.txt
+++ /dev/null
@@ -1,161 +0,0 @@
-Eclipse Public License -v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION
-OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor.
-A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate
-modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not
-derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of
-its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute
-and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code
-form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the
-Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the
-combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such
-addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not
-apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no
-assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity
-based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property
-rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the
-Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to
-grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including
-warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and
-fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any
-other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it
-in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and
-the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes
-the Program in a commercial product offering should do so in a manner which does not create potential liability for
-other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions
-brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual
-property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may
- participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is
-then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone.
-Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to
-those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result,
-the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for
-determining the appropriateness of using and distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance
-with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such
-provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such
-Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such
-noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses
- granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement
-is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish
-new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the
-right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the
-Agreement will be given a distinguishing version number. The Program (including Contributions) may always be
-distributed subject to the version of the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the
-new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States
-of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause
-of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
diff --git a/org.eclipse.osbp.releng.maven.fpom.felix/pom.xml b/org.eclipse.osbp.releng.maven.fpom.felix/pom.xml
deleted file mode 100644
index bf63dde..0000000
--- a/org.eclipse.osbp.releng.maven.fpom.felix/pom.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--#======================================================================= -->
-<!--# Copyright (c) 2012, 2014 - C4biz Softwares ME, Loetz GmbH&Co.KG (69115 Heidelberg, Germany) -->
-<!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License v1.0 -->
-<!--# which accompanies this distribution, and is available at -->
-<!--# http://www.eclipse.org/legal/epl-v10.html -->
-<!--# -->
-<!--# Contributors: -->
-<!--# Cristiano Gavião (C4biz)- initial API and implementation -->
-<!--#======================================================================= -->
-<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>org.eclipse.osbp.releng.maven</groupId>
-        <artifactId>org.eclipse.osbp.releng.maven</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>org.eclipse.osbp.releng.maven.fpom.felix</artifactId>
-
-    <packaging>pom</packaging>
-
-    <scm>
-        <connection>${osbp.scm.connection}</connection>
-        <developerConnection>${osbp.scm.connection.dev}</developerConnection>
-        <tag>HEAD</tag>
-    </scm>
-
-    <properties>
-        <paxexam.felix.version>4.4.1</paxexam.felix.version>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <version>${report.license.version}</version>
-                <executions>
-                    <execution>
-                        <id>update-license-files</id>
-                        <inherited>false</inherited>
-                        <configuration>
-                            <deployMissingFile>true</deployMissingFile>
-                            <useMissingFile>true</useMissingFile>
-                            <useRepositoryMissingFiles>false</useRepositoryMissingFiles>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.framework</artifactId>
-            <version>${paxexam.felix.version}</version>
-        </dependency>
-        <!-- <dependency> -->
-        <!-- <groupId>org.apache.felix</groupId> -->
-        <!-- <artifactId>org.apache.felix.main</artifactId> -->
-        <!-- <version>${paxexam.felix.version}</version> -->
-        <!-- </dependency> -->
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.eventadmin</artifactId>
-            <version>1.3.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.configadmin</artifactId>
-            <version>1.8.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.gogo.runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.gogo.command</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>org.osgi.core</artifactId>
-                    <groupId>org.osgi</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>org.osgi.compendium</artifactId>
-                    <groupId>org.osgi</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>
-                        org.apache.felix.bundlerepository
-                    </artifactId>
-                    <groupId>org.apache.felix</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.gogo.shell</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.fileinstall</artifactId>
-            <version>3.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr</artifactId>
-            <version>1.8.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.coordinator</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.prefs</artifactId>
-            <version>1.0.6</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>org.osgi.compendium</artifactId>
-                    <groupId>org.apache.felix</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.log</artifactId>
-            <version>1.0.1</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>org.osgi.core</artifactId>
-                    <groupId>org.osgi</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>org.osgi.compendium</artifactId>
-                    <groupId>org.osgi</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.metatype</artifactId>
-            <version>1.0.10</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.resolver</artifactId>
-            <version>1.0.0</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>org.osgi.core</artifactId>
-                    <groupId>org.osgi</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/org.eclipse.osbp.releng.maven.fpom.itests/.project b/org.eclipse.osbp.releng.maven.fpom.itests/.project
deleted file mode 100644
index e615d2f..0000000
--- a/org.eclipse.osbp.releng.maven.fpom.itests/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.osbp.releng.maven.fpom.itests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.osbp.releng.maven.fpom.itests/LICENSE.txt b/org.eclipse.osbp.releng.maven.fpom.itests/LICENSE.txt
deleted file mode 100644
index ff42ad4..0000000
--- a/org.eclipse.osbp.releng.maven.fpom.itests/LICENSE.txt
+++ /dev/null
@@ -1,161 +0,0 @@
-Eclipse Public License -v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION
-OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor.
-A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate
-modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not
-derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of
-its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute
-and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code
-form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the
-Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the
-combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such
-addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not
-apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no
-assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity
-based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property
-rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the
-Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to
-grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including
-warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and
-fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any
-other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it
-in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and
-the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes
-the Program in a commercial product offering should do so in a manner which does not create potential liability for
-other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions
-brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such
-Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual
-property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may
- participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is
-then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone.
-Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to
-those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result,
-the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for
-determining the appropriateness of using and distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance
-with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such
-provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such
-Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such
-noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses
- granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement
-is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish
-new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the
-right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the
-Agreement will be given a distinguishing version number. The Program (including Contributions) may always be
-distributed subject to the version of the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the
-new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States
-of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause
-of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
diff --git a/org.eclipse.osbp.releng.maven.fpom.itests/pom.xml b/org.eclipse.osbp.releng.maven.fpom.itests/pom.xml
deleted file mode 100644
index ade1919..0000000
--- a/org.eclipse.osbp.releng.maven.fpom.itests/pom.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--#======================================================================= -->
-<!--# Copyright (c) 2012, 2014 - C4biz Softwares ME, Loetz GmbH&Co.KG (69115 Heidelberg, Germany) -->
-<!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License v1.0 -->
-<!--# which accompanies this distribution, and is available at -->
-<!--# http://www.eclipse.org/legal/epl-v10.html -->
-<!--# -->
-<!--# Contributors: -->
-<!--# Cristiano Gavião (C4biz)- initial API and implementation -->
-<!--#======================================================================= -->
-<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>org.eclipse.osbp.releng.maven</groupId>
-        <artifactId>org.eclipse.osbp.releng.maven</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>org.eclipse.osbp.releng.maven.fpom.itests</artifactId>
-
-    <packaging>pom</packaging>
-
-    <scm>
-        <connection>${osbp.scm.connection}</connection>
-        <developerConnection>${osbp.scm.connection.dev}</developerConnection>
-        <tag>HEAD</tag>
-    </scm>
-
-    <build>
-        <plugins>
-            <!-- 			<plugin> -->
-            <!-- 				<groupId>org.codehaus.mojo</groupId> -->
-            <!-- 				<artifactId>license-maven-plugin</artifactId> -->
-            <!-- 				<version>${report.license.version}</version> -->
-            <!-- 				<executions> -->
-            <!-- 					<execution> -->
-            <!-- 						<id>update-license-files</id> -->
-            <!-- 						<inherited>false</inherited> -->
-            <!-- 						<configuration> -->
-            <!-- 							<deployMissingFile>true</deployMissingFile> -->
-            <!-- 							<useMissingFile>true</useMissingFile> -->
-            <!-- 							<useRepositoryMissingFiles>false</useRepositoryMissingFiles> -->
-            <!-- 						</configuration> -->
-            <!-- 					</execution> -->
-            <!-- 				</executions> -->
-            <!-- 			</plugin> -->
-        </plugins>
-    </build>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.eclipse.osbp.osgi</groupId>
-                <artifactId>org.junit</artifactId>
-                <version>4.11.0.v201303080030</version>
-            </dependency>
-            <!-- 			<dependency> -->
-            <!-- 				<groupId>org.eclipse.osbp.osgi</groupId> -->
-            <!-- 				<artifactId>org.hamcrest.core</artifactId> -->
-            <!-- 				<version>1.3.0.v201303031735</version> -->
-            <!-- 			</dependency> -->
-            <!-- 			<dependency> -->
-            <!-- 				<groupId>org.eclipse.osbp.osgi</groupId> -->
-            <!-- 				<artifactId>org.hamcrest.integration</artifactId> -->
-            <!-- 				<version>1.3.0.v201305210900</version> -->
-            <!-- 			</dependency> -->
-            <!-- 			<dependency> -->
-            <!-- 				<groupId>org.eclipse.osbp.osgi</groupId> -->
-            <!-- 				<artifactId>org.hamcrest.library</artifactId> -->
-            <!-- 				<version>1.3.0.v201305281000</version> -->
-            <!-- 			</dependency> -->
-            <!-- pax exam -->
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam</artifactId>
-                <version>${paxexam.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-extender-service</artifactId>
-                <version>${paxexam.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-invoker-junit</artifactId>
-                <version>${paxexam.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-container-native</artifactId>
-                <version>${paxexam.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-junit4</artifactId>
-                <version>${paxexam.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>org.osgi.core</artifactId>
-                        <groupId>org.osgi</groupId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-link-mvn</artifactId>
-                <version>${paxexam.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.url</groupId>
-                <artifactId>pax-url-aether</artifactId>
-                <version>${paxurl.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-inject</artifactId>
-                <version>${paxexam.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.url</groupId>
-                <artifactId>pax-url-wrap</artifactId>
-                <version>${paxurl.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>org.osgi.core</artifactId>
-                        <groupId>org.osgi</groupId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.exam</groupId>
-                <artifactId>pax-exam-cm</artifactId>
-                <version>${paxexam.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>osgi-over-slf4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.osbp.osgi</groupId>
-            <artifactId>org.junit</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <!-- 		<dependency> -->
-        <!-- 			<groupId>org.eclipse.osbp.osgi</groupId> -->
-        <!-- 			<artifactId>org.hamcrest.core</artifactId> -->
-        <!-- 			<scope>provided</scope> -->
-        <!-- 		</dependency> -->
-        <!-- 		<dependency> -->
-        <!-- 			<groupId>org.eclipse.osbp.osgi</groupId> -->
-        <!-- 			<artifactId>org.hamcrest.integration</artifactId> -->
-        <!-- 			<scope>provided</scope> -->
-        <!-- 		</dependency> -->
-        <!-- 		<dependency> -->
-        <!-- 			<groupId>org.eclipse.osbp.osgi</groupId> -->
-        <!-- 			<artifactId>org.hamcrest.library</artifactId> -->
-        <!-- 			<scope>provided</scope> -->
-        <!-- 		</dependency> -->
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.knowhowlab.osgi</groupId>
-            <artifactId>org.knowhowlab.osgi.testing.assertions</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.knowhowlab.osgi</groupId>
-            <artifactId>org.knowhowlab.osgi.testing.utils</artifactId>
-        </dependency>
-        <!-- pax exam -->
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-extender-service</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-invoker-junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-container-native</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit4</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-link-mvn</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.url</groupId>
-            <artifactId>pax-url-aether</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-inject</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.url</groupId>
-            <artifactId>pax-url-wrap</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/org.eclipse.osbp.releng.maven.fpom.node/.project b/org.eclipse.osbp.releng.maven.fpom.node/.project
deleted file mode 100644
index 052517b..0000000
--- a/org.eclipse.osbp.releng.maven.fpom.node/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.osbp.releng.maven.fpom.node</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.osbp.releng.maven.fpom.node/pom.xml b/org.eclipse.osbp.releng.maven.fpom.node/pom.xml
deleted file mode 100644
index f9263db..0000000
--- a/org.eclipse.osbp.releng.maven.fpom.node/pom.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--#======================================================================= -->
-<!--# Copyright (c) 2012, 2014 - C4biz Softwares ME, Loetz GmbH&Co.KG (69115 Heidelberg, Germany) -->
-<!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License v1.0 -->
-<!--# which accompanies this distribution, and is available at -->
-<!--# http://www.eclipse.org/legal/epl-v10.html -->
-<!--# -->
-<!--# Contributors: -->
-<!--# Cristiano Gavião (C4biz)- initial API and implementation -->
-<!--#======================================================================= -->
-<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>org.eclipse.osbp.releng.maven</groupId>
-        <artifactId>org.eclipse.osbp.releng.maven</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>org.eclipse.osbp.releng.maven.fpom.node</artifactId>
-
-    <packaging>pom</packaging>
-
-    <scm>
-        <connection>${osbp.scm.connection}</connection>
-        <developerConnection>${osbp.scm.connection.dev}</developerConnection>
-        <tag>HEAD</tag>
-    </scm>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <version>${report.license.version}</version>
-                <executions>
-                    <execution>
-                        <id>update-license-files</id>
-                        <inherited>false</inherited>
-                        <configuration>
-                            <deployMissingFile>true</deployMissingFile>
-                            <useMissingFile>true</useMissingFile>
-                            <useRepositoryMissingFiles>false</useRepositoryMissingFiles>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundlerepository</artifactId>
-                <version>${bundlerepository.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>easymock</artifactId>
-                        <groupId>org.easymock</groupId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.url</groupId>
-                <artifactId>pax-url-aether</artifactId>
-                <version>${paxurl.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.subsystem</groupId>
-                <artifactId>org.apache.aries.subsystem.core</artifactId>
-                <version>1.0.1-SNAPSHOT</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>org.apache.aries.application.api</artifactId>
-                        <groupId>org.apache.aries.application</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <artifactId>org.apache.aries.application.utils</artifactId>
-                        <groupId>org.apache.aries.application</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <artifactId>org.eclipse.equinox.region</artifactId>
-                        <groupId>org.eclipse.equinox</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.eclipse.equinox</groupId>
-                        <artifactId>org.eclipse.equinox.coordinator</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.subsystem</groupId>
-                <artifactId>org.apache.aries.subsystem.api</artifactId>
-                <version>1.0.1-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.osbp.osgi</groupId>
-                <artifactId>javax.persistence</artifactId>
-                <version>2.1.0.v201304241213</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.fileinstall</artifactId>
-                <version>3.4.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries</groupId>
-                <artifactId>org.apache.aries.util</artifactId>
-                <version>1.1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.osbp.osgi</groupId>
-                <artifactId>org.eclipse.equinox.region</artifactId>
-                <version>1.2.0.v20140128-1636</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.osbp.osgi</groupId>
-            <artifactId>javax.persistence</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.bundlerepository</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.easymock</groupId>
-                    <artifactId>easymock</artifactId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>org.osgi.core</artifactId>
-                    <groupId>org.osgi</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.osbp.osgi</groupId>
-            <artifactId>org.eclipse.equinox.region</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.subsystem</groupId>
-            <artifactId>org.apache.aries.subsystem.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.subsystem</groupId>
-            <artifactId>org.apache.aries.subsystem.api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries</groupId>
-            <artifactId>org.apache.aries.util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.fileinstall</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.gogo.command</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>org.osgi.compendium</artifactId>
-                    <groupId>org.osgi</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>org.osgi.core</artifactId>
-                    <groupId>org.osgi</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.gogo.runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.gogo.shell</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.url</groupId>
-            <artifactId>pax-url-aether</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/org.eclipse.osbp.releng.maven.parent.mbp/pom.xml b/org.eclipse.osbp.releng.maven.parent.mbp/pom.xml
index 9142f32..7d20357 100644
--- a/org.eclipse.osbp.releng.maven.parent.mbp/pom.xml
+++ b/org.eclipse.osbp.releng.maven.parent.mbp/pom.xml
@@ -936,11 +936,10 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-jarsigner-plugin</artifactId>
-<!--                         <version>1.3.2</version> -->
                         <configuration>
                             <verify>true</verify>
                             <storetype>jks</storetype>
-                            <tsa>https://timestamp.geotrust.com/tsa</tsa>
+                            <tsa>${maven-jarsigner-plugin.tsa}</tsa>
                             <keystore>${maven-jarsigner-plugin.keystore}</keystore>
                             <alias>${maven-jarsigner-plugin.alias}</alias>
                             <storepass>${maven-jarsigner-plugin.storepass}</storepass>
diff --git a/org.eclipse.osbp.releng.maven.parent.mbp2/pom.xml b/org.eclipse.osbp.releng.maven.parent.mbp2/pom.xml
index d1797f3..fa72955 100644
--- a/org.eclipse.osbp.releng.maven.parent.mbp2/pom.xml
+++ b/org.eclipse.osbp.releng.maven.parent.mbp2/pom.xml
@@ -24,7 +24,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <mbp.version>2.5.0</mbp.version>
+        <mbp.version>3.2.0</mbp.version>
         <license.copyrightOwners>Loetz GmbH&amp;Co.KG and others</license.copyrightOwners>
     </properties>
 
@@ -99,10 +99,10 @@
                                     <inherited>true</inherited>
                                     <configuration>
                                         <instructions>
-                                            <Bundle-Vendor>ECLIPSE OSBP</Bundle-Vendor>
+                                            <Bundle-Vendor>Eclipse OSBP</Bundle-Vendor>
                                             <Bundle-Name>${project.name}</Bundle-Name>
                                             <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
-                                            <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
+                                            <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
                                             <_dsannotations>*</_dsannotations>
                                             <!-- <Include-Resource>{maven-resources},META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource> -->
                                             <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
diff --git a/org.eclipse.osbp.releng.maven.parent.tycho/pom.xml b/org.eclipse.osbp.releng.maven.parent.tycho/pom.xml
index 7dfd188..3a1478b 100644
--- a/org.eclipse.osbp.releng.maven.parent.tycho/pom.xml
+++ b/org.eclipse.osbp.releng.maven.parent.tycho/pom.xml
@@ -25,8 +25,6 @@
 
     <properties>
     
-        <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/</orbit-site>
-    
         <!-- these will be set by profiles (defaults to OSBPa) -->
         <!-- 		<osbp.build.eclipse.platform.name></osbp.build.eclipse.platform.name> -->
         <!-- 		<osbp.build.eclipse.platform.p2.url></osbp.build.eclipse.platform.p2.url> -->
@@ -35,7 +33,7 @@
 			stage repository -->
         <osbp.build.local.federated.p2.dir>${osbp.developer.home.repositories}${osbp.federated.repository.label}${file.separator}${osbp.build.eclipse.platform.name}${file.separator}${osbp.build.branch}${file.separator}</osbp.build.local.federated.p2.dir>
         <osbp.build.local.federated.p2.url>file://${osbp.build.local.federated.p2.dir}</osbp.build.local.federated.p2.url>
-        <osbp.build.remote.federated.p2.url>http://10.1.13.15/downloads/p2/${osbp.federated.repository.label}/${osbp.build.eclipse.platform.name}/${osbp.build.branch}</osbp.build.remote.federated.p2.url>
+        <osbp.build.remote.federated.p2.url>${osbp.p2}</osbp.build.remote.federated.p2.url>
     
         <!-- this property is calculated based on the aggregator pom's version -->
         <!-- osbp.stage.artifact.version>none</osbp.stage.artifact.version> -->
@@ -59,22 +57,86 @@
                 </property>
             </activation>
             <properties>
-                <osbp.build.eclipse.platform.name>luna</osbp.build.eclipse.platform.name>
-                <osbp.build.eclipse.platform.p2.url>http://download.eclipse.org/releases/luna</osbp.build.eclipse.platform.p2.url>
+	            <osbee.build.eclipse.platform.p2.url>http://download.eclipse.org/releases/neon</osbee.build.eclipse.platform.p2.url>
+                <osbp.build.eclipse.platform.name>neon</osbp.build.eclipse.platform.name>
+	            <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/</orbit-site>
             </properties>
+            <repositories>
+	            <repository>
+		            <id>Neon eclipse.p2</id>
+        		    <url>http://download.eclipse.org/releases/neon</url>
+            		<layout>p2</layout>
+        		</repository>
+	            <repository>
+	                <id>EclipseNeonSR2</id>
+	                <url>http://download.eclipse.org/releases/neon/201612211000/
+	                </url>
+	                <layout>p2</layout>
+	            </repository>
+	            <repository>
+	                <id>EclipseNeonSR3</id>
+	                <url>http://download.eclipse.org/releases/neon/201703231000/
+	                </url>
+	                <layout>p2</layout>
+	            </repository>
+	            <repository>
+	                <id>Neon3 Orbit</id>
+	                <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/
+	                </url>
+	                <layout>p2</layout>
+	            </repository>
+	            <repository>
+	                <id>EclipseNeonComposite</id>
+	                <url>http://download.eclipse.org/eclipse/updates/4.6/
+	                </url>
+	                <layout>p2</layout>
+	            </repository>
+            </repositories>
         </profile>
         <profile>
-            <id>platform.kepler</id>
+            <id>platform.neon</id>
             <activation>
                 <property>
                     <name>osbp.build.eclipse.platform.name</name>
-                    <value>kepler</value>
+                    <value>neon</value>
                 </property>
             </activation>
             <properties>
-                <osbp.build.eclipse.platform.name>kepler</osbp.build.eclipse.platform.name>
-                <osbp.build.eclipse.platform.p2.url>http://download.eclipse.org/releases/kepler</osbp.build.eclipse.platform.p2.url>
+	            <osbee.build.eclipse.platform.p2.url>http://download.eclipse.org/releases/neon</osbee.build.eclipse.platform.p2.url>
+	            <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/</orbit-site>
+                <osbp.build.eclipse.platform.name>neon</osbp.build.eclipse.platform.name>
             </properties>
+            <repositories>
+	            <repository>
+		            <id>Neon eclipse.p2</id>
+        		    <url>http://download.eclipse.org/releases/neon</url>
+            		<layout>p2</layout>
+        		</repository>
+	            <repository>
+	                <id>EclipseNeonSR2</id>
+	                <url>http://download.eclipse.org/releases/neon/201612211000/
+	                </url>
+	                <layout>p2</layout>
+	            </repository>
+	            <repository>
+	                <id>EclipseNeonSR3</id>
+	                <url>http://download.eclipse.org/releases/neon/201703231000/
+	                </url>
+	                <layout>p2</layout>
+	            </repository>
+	            <repository>
+	                <id>Neon3 Orbit</id>
+	                <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/
+	                </url>
+	                <layout>p2</layout>
+	            </repository>
+	            <repository>
+	                <id>EclipseNeonComposite</id>
+	                <url>http://download.eclipse.org/eclipse/updates/4.6/
+	                </url>
+	                <layout>p2</layout>
+	            </repository>
+            </repositories>
         </profile>
         <profile>
             <id>platform.luna</id>
@@ -86,8 +148,21 @@
             </activation>
             <properties>
                 <osbp.build.eclipse.platform.name>luna</osbp.build.eclipse.platform.name>
-                <osbp.build.eclipse.platform.p2.url>http://download.eclipse.org/releases/luna</osbp.build.eclipse.platform.p2.url>
+	            <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/</orbit-site>
             </properties>
+            <repositories>
+	            <repository>
+		            <id>Luna eclipse.p2</id>
+        		    <url>http://download.eclipse.org/releases/luna</url>
+            		<layout>p2</layout>
+        		</repository>
+        		<repository>
+            		<id>orbit</id>
+            		<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/</url>
+            		<layout>p2</layout>
+        		</repository>
+            </repositories>
+            
         </profile>
         <profile>
             <id>osbp.build.uses.local.federated.p2</id>
@@ -147,6 +222,11 @@
                                 <environment>
                                     <os>win32</os>
                                     <ws>win32</ws>
+                                    <arch>x86</arch>
+                                </environment>
+                                <environment>
+                                    <os>win32</os>
+                                    <ws>win32</ws>
                                     <arch>x86_64</arch>
                                 </environment>
                                 <environment>
@@ -199,6 +279,11 @@
                                 <environment>
                                     <os>win32</os>
                                     <ws>win32</ws>
+                                    <arch>x86</arch>
+                                </environment>
+                                <environment>
+                                    <os>win32</os>
+                                    <ws>win32</ws>
                                     <arch>x86_64</arch>
                                 </environment>
                                 <environment>
@@ -233,7 +318,7 @@
             <properties>
 				<osbp.build.local.federated.p2.dir>${osbp.developer.home.repositories}${osbp.dependencies.repository.label}${file.separator}${osbp.build.eclipse.platform.name}${file.separator}${osbp.build.branch}${file.separator}</osbp.build.local.federated.p2.dir>
 				<osbp.build.local.federated.p2.url>file://${osbp.build.local.federated.p2.dir}</osbp.build.local.federated.p2.url>
-				<osbp.build.remote.federated.p2.url>http://10.1.13.15/downloads/p2/${osbp.dependencies.repository.label}/${osbp.build.eclipse.platform.name}/${osbp.build.branch}</osbp.build.remote.federated.p2.url>
+				<osbp.build.remote.federated.p2.url>${osbp.p2}</osbp.build.remote.federated.p2.url>
 				
                 <osbp.stage.p2.log.file.path>${project.basedir}${file.separator}build.${osbp.stage.p2.label}.${osbp.build.eclipse.platform.name}.${osbp.build.branch}.log.properties</osbp.stage.p2.log.file.path>
                 <osbp.stage.p2.origin.dir>${project.build.directory}${file.separator}repository</osbp.stage.p2.origin.dir>
@@ -1156,7 +1241,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-jarsigner-plugin</artifactId>
-                        <version>1.3.2</version>
                         <configuration>
                             <skip>true</skip>
                         </configuration>
@@ -1176,11 +1260,10 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-jarsigner-plugin</artifactId>
-                        <version>1.3.2</version>
                         <configuration>
                             <verify>true</verify>
                             <storetype>jks</storetype>
-                            <tsa>${jarsigner.tsa}</tsa>
+                            <tsa>${maven-jarsigner-plugin.tsa}</tsa>
                             <keystore>${maven-jarsigner-plugin.keystore}</keystore>
                             <alias>${maven-jarsigner-plugin.alias}</alias>
                             <storepass>${maven-jarsigner-plugin.storepass}</storepass>
@@ -1207,19 +1290,6 @@
         </profile>
     </profiles>
 
-    <repositories>
-        <repository>
-            <id>eclipse.p2</id>
-            <url>${osbp.build.eclipse.platform.p2.url}</url>
-            <layout>p2</layout>
-        </repository>
-        <repository>
-            <id>orbit</id>
-            <url>${orbit-site}</url>
-            <layout>p2</layout>
-        </repository>
-    </repositories>
-
     <build>
         <sourceDirectory>src</sourceDirectory>
     
diff --git a/org.eclipse.osbp.releng.maven.runtime.target/.project b/org.eclipse.osbp.releng.maven.runtime.target/.project
new file mode 100644
index 0000000..a03b767
--- /dev/null
+++ b/org.eclipse.osbp.releng.maven.runtime.target/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.osbp.releng.maven.runtime.target</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.osbp.releng.maven.runtime.target/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.releng.maven.runtime.target/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.releng.maven.runtime.target/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.releng.maven.runtime.target/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.releng.maven.runtime.target/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.releng.maven.runtime.target/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.releng.maven.runtime.target/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.releng.maven.runtime.target/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..5da8aa3
--- /dev/null
+++ b/org.eclipse.osbp.releng.maven.runtime.target/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,10 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.releng.maven.runtime.target/org.eclipse.osbp.releng.maven.runtime.target.target b/org.eclipse.osbp.releng.maven.runtime.target/org.eclipse.osbp.releng.maven.runtime.target.target
new file mode 100644
index 0000000..24594fb
--- /dev/null
+++ b/org.eclipse.osbp.releng.maven.runtime.target/org.eclipse.osbp.releng.maven.runtime.target.target
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="org.eclipse.osbp.releng.maven.runtime.target" sequenceNumber="4">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.300.v20161122-1740"/>
+<repository location="http://download.osbee.org/downloads/p2/org.eclipse.platform-4.6.3"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="4.6.3.M20170301-0400"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.6"/>
+</location>
+</locations>
+</target>
diff --git a/org.eclipse.osbp.releng.maven.runtime.target/pom.xml b/org.eclipse.osbp.releng.maven.runtime.target/pom.xml
new file mode 100644
index 0000000..1208cde
--- /dev/null
+++ b/org.eclipse.osbp.releng.maven.runtime.target/pom.xml
@@ -0,0 +1,13 @@
+<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>org.eclipse.osbp.releng.maven</groupId>
+    <artifactId>org.eclipse.osbp.releng.maven.parent.tycho</artifactId>
+    <version>0.9.0-SNAPSHOT</version>
+    <relativePath>../org.eclipse.osbp.releng.maven.parent.tycho</relativePath>
+  </parent>
+  <artifactId>org.eclipse.osbp.releng.maven.runtime.target</artifactId>
+  <packaging>eclipse-target-definition</packaging>
+  <name>org.eclipse.osbp.releng.maven.runtime.target</name>
+  <description>Target definition for the all OS.bee applications</description>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 00b75b4..d7930f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--#======================================================================= -->
-<!--# Copyright (c) 2012, 2014 - C4biz Softwares ME, Loetz GmbH&Co.KG (69115 Heidelberg, Germany) -->
+<!--# Copyright (c) 2012, 2014 - C4biz Softwares ME, Loetz GmbH&Co.KG (69115 
+	Heidelberg, Germany) -->
 <!--# All rights reserved. This program and the accompanying materials -->
 <!--# are made available under the terms of the Eclipse Public License v1.0 -->
 <!--# which accompanies this distribution, and is available at -->
@@ -9,45 +10,44 @@
 <!--# Contributors: -->
 <!--# Cristiano Gavião (C4biz)- initial API and implementation -->
 <!--#======================================================================= -->
-<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>
-    <groupId>org.eclipse.osbp.releng.maven</groupId>
-    <artifactId>org.eclipse.osbp.releng.maven</artifactId>
+<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>
+	<groupId>org.eclipse.osbp.releng.maven</groupId>
+	<artifactId>org.eclipse.osbp.releng.maven</artifactId>
 	<name>OS.bee Release Engineering Maven - Master Parent POM</name>
 	<description>A parent POM aimed to set up the build of general Maven based projects.</description>
-    <packaging>pom</packaging>
-    <version>0.9.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<version>0.9.0-SNAPSHOT</version>
 
-    <modules>
-        <module>org.eclipse.osbp.releng.maven.parent.mbp</module>
-        <module>org.eclipse.osbp.releng.maven.parent.mbp2</module>
-        <module>org.eclipse.osbp.releng.maven.parent.tycho</module>
-        <module>org.eclipse.osbp.releng.maven.licenses</module>
-        <!-- <module>org.eclipse.osbp.releng.maven.fpom.equinox.luna</module>  -->
-        <!-- 		<module>org.eclipse.osbp.releng.maven.fpom.felix</module> -->
-        <!-- 		<module>org.eclipse.osbp.releng.maven.fpom.node</module> -->
-        <!-- 		<module>org.eclipse.osbp.releng.maven.fpom.itests</module> -->
-    
-    </modules>
+	<modules>
+		<module>org.eclipse.osbp.releng.maven.parent.mbp</module>
+		<module>org.eclipse.osbp.releng.maven.parent.mbp2</module>
+		<module>org.eclipse.osbp.releng.maven.parent.tycho</module>
+		<module>org.eclipse.osbp.releng.maven.licenses</module>
+		<module>org.eclipse.osbp.releng.maven.runtime.target</module>
+		<module>org.eclipse.osbp.license.feature</module>
 
-    <inceptionYear>2012</inceptionYear>
+	</modules>
 
-    <prerequisites>
-        <maven>3.2.3</maven>
-    </prerequisites>
+	<inceptionYear>2012</inceptionYear>
+
+	<prerequisites>
+		<maven>3.2.3</maven>
+	</prerequisites>
 
     <organization>
         <name>ECLIPSE OSBP project</name>
         <url>http://www.eclipse.org/osbp</url>
     </organization>
 
-    <properties>
-        <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
-        <osgi-version-qualifier>${maven.build.timestamp}</osgi-version-qualifier>
-    
-        <osbp.site.skip>false</osbp.site.skip>
-        <osbp.deploy.skip>false</osbp.deploy.skip>
-    	<osbp.skip.tests>false</osbp.skip.tests>
+	<properties>
+		<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
+		<osgi-version-qualifier>${maven.build.timestamp}</osgi-version-qualifier>
+
+		<osbp.site.skip>false</osbp.site.skip>
+		<osbp.deploy.skip>false</osbp.deploy.skip>
+		<osbp.skip.tests>false</osbp.skip.tests>
 
         <!-- the name of the git repository that the aggregator represents -->
         <osbp.gitrepo.name>${project.groupId}.git</osbp.gitrepo.name>
@@ -93,195 +93,183 @@
         <!-- where to deploy the snapshot artifacts -->
         <distribution.repository.snapshot.url>https://repo.eclipse.org/content/repositories/${osbp.scm.user}-snapshots/</distribution.repository.snapshot.url>
     
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    
-        <!-- these properties must be set in settings.xml or using -Dosbp.developer.home 
-			in command line. it defaults to the current user home -->
-        <osbp.developer.home>${user.dir}${file.separator}</osbp.developer.home>
-    
-        <!-- indicates where to stage built repositories in local machine -->
-        <osbp.developer.home.repositories>${osbp.developer.home}${file.separator}p2${file.separator}</osbp.developer.home.repositories>
 
-        <!-- indicates where to stage built repositories in local machine -->
-        <osbp.developer.home.site>${osbp.developer.home}STAGE-SITE${file.separator}</osbp.developer.home.site>
-    
-        <!-- this properties must be unique for the entire system -->
-        <osbp.federated.repository.label>osbp</osbp.federated.repository.label>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+		<!-- these properties must be set in settings.xml or using -Dosbp.developer.home 
+			in command line. it defaults to the current user home -->
+		<osbp.developer.home>${user.dir}${file.separator}</osbp.developer.home>
+
+		<!-- indicates where to stage built repositories in local machine -->
+		<osbp.developer.home.repositories>${osbp.developer.home}${file.separator}p2${file.separator}</osbp.developer.home.repositories>
+
+		<!-- indicates where to stage built repositories in local machine -->
+		<osbp.developer.home.site>${osbp.developer.home}STAGE-SITE${file.separator}</osbp.developer.home.site>
+
+		<!-- this properties must be unique for the entire system -->
+		<osbp.federated.repository.label>osbp</osbp.federated.repository.label>
 		<osbp.dependencies.repository.label>${osbp.federated.repository.label}${file.separator}dependencies</osbp.dependencies.repository.label>
 
-        <!-- indicates where to stage javadoc for built results on local machine -->
+		<!-- indicates where to stage javadoc for built results on local machine -->
 		<osbp.javadoc.home.directory>${osbp.developer.home}javadoc${file.separator}${osbp.federated.repository.label}${file.separator}${osbp.build.branch}</osbp.javadoc.home.directory>
-    
-        <!-- the branch used in the build of the project. this determines the behavior 
+
+		<!-- the branch used in the build of the project. this determines the behavior 
 			of some steps and its properties. (branch latest head, milestone, release) -->
-        <osbp.build.branch>head</osbp.build.branch>
-    
-        <!-- this indicates whether an old p2 published should be kept or not. 
+		<osbp.build.branch>head</osbp.build.branch>
+
+		<!-- this indicates whether an old p2 published should be kept or not. 
 			this should be determined by the builder.brach being used. -->
 		<osbp.stage.p2.keep.old>false</osbp.stage.p2.keep.old>
 
-        <!-- Dependencies Version -->
-        <vaadin.version>7.5.7</vaadin.version> 
-		<vaadin.mobile.version>4.0.0.beta2</vaadin.mobile.version> 
-        <vaadin.plugin.version>7.5.7</vaadin.plugin.version> 
-    
-        <paxexam.version>4.1.0</paxexam.version>
-        <paxurl.version>2.1.0</paxurl.version>
-        <bundlerepository.version>2.0.3-SNAPSHOT</bundlerepository.version>
-        <junit.version>4.11</junit.version>
-        <mockito.version>1.9.5</mockito.version>
-        <osgi.testing.assertions.version>1.3.0</osgi.testing.assertions.version> 
-        <osgi.testing.utils.version>1.2.2</osgi.testing.utils.version>
-        <guava.version>18.0</guava.version>
-        <osgi.version>5.0.0</osgi.version>
-        <slf4j.version>1.7.9</slf4j.version>
-        <logback.version>1.0.13</logback.version>
-        <shiro.version>1.2.3</shiro.version>
-        <stanbol.version>0.11.0</stanbol.version>
-        <ecf.version>3.9.0</ecf.version>
-        <maven.version>3.2.3</maven.version>
-        <powermock.version>1.5.5</powermock.version>
-        <hamcrest.version>1.3</hamcrest.version>
-        <groovy-all.version>2.4.9</groovy-all.version> <!-- 1.5.7 is not approved by Eclipse, we have to use at least 2.4.4 to have the ASL2 -->
-        <ant-version>1.8.4</ant-version>	<!-- the ant version from Orbit --> 
-        <tycho-version>0.21.0</tycho-version>
-        <tychoExtrasVersion>0.21.0</tychoExtrasVersion>
-		
-        <xtext.version>2.7.3</xtext.version>
-    
+		<!-- Dependencies Version -->
+		<vaadin.version>7.7.6</vaadin.version>
+		<vaadin.mobile.version>4.1.0</vaadin.mobile.version>
+		<vaadin.plugin.version>7.7.6</vaadin.plugin.version>
+
+		<paxexam.version>4.1.0</paxexam.version>
+		<paxurl.version>2.1.0</paxurl.version>
+		<bundlerepository.version>2.0.3-SNAPSHOT</bundlerepository.version>
+		<junit.version>4.11</junit.version>
+		<mockito.version>1.9.5</mockito.version>
+		<osgi.testing.assertions.version>1.3.0</osgi.testing.assertions.version>
+		<osgi.testing.utils.version>1.2.2</osgi.testing.utils.version>
+		<guava.version>18.0</guava.version>
+		<osgi.version>5.0.0</osgi.version>
+		<slf4j.version>1.7.9</slf4j.version>
+		<logback.version>1.0.13</logback.version>
+		<shiro.version>1.2.3</shiro.version>
+		<stanbol.version>0.11.0</stanbol.version>
+		<ecf.version>3.9.0</ecf.version>
+		<maven.version>3.2.3</maven.version>
+		<powermock.version>1.5.5</powermock.version>
+		<hamcrest.version>1.3</hamcrest.version>
+		<groovy-all.version>2.4.9</groovy-all.version> <!-- 1.5.7 is not approved by Eclipse, we have to use at least 2.4.4 to have 
+			the ASL2 -->
+		<ant-version>1.8.4</ant-version>	<!-- the ant version from Orbit -->
+
+		<tycho-version>0.26.0</tycho-version>
+		<tychoExtrasVersion>0.26.0</tychoExtrasVersion>
+
+		<xtext.version>2.11.0</xtext.version>
+
 		<osbp.skip.javadoc>false</osbp.skip.javadoc>
 		<osbp.javadoc.linksource>false</osbp.javadoc.linksource>
-        <osbp.javadoc.failOnError>true</osbp.javadoc.failOnError>
-        <osbp.javadoc.additionalparam>-Xdoclint:accessibility,html,missing,reference</osbp.javadoc.additionalparam>
-        
-        <report.javadoc.version>2.9.1</report.javadoc.version>
-        <report.license.version>1.8</report.license.version>
-        <report.version.version>2.1</report.version.version>
-        <report.surefire.version>${surefire.version}</report.surefire.version>
-        <report.jxr.version>2.4</report.jxr.version>
-        <report.sonar.version>0.1</report.sonar.version>
-        <report.project-info.version>2.7</report.project-info.version>
-    
-        <!-- license configuration -->
-        <!-- default license to use for children -->
-        <license.licenseName>epl_v1</license.licenseName>
-        <license.failIfWarning>false</license.failIfWarning>
-        <license.dryRun>false</license.dryRun>
-        <license.copyrightOwners>Loetz GmbH&amp;Co.KG</license.copyrightOwners>
-        <license.skip.header>false</license.skip.header>
-        <license.roots>src</license.roots>
-        <license.canUpdateCopyright>true</license.canUpdateCopyright>
-        <license.canUpdateDescription>true</license.canUpdateDescription>
-        <license.skipUpdateProjectLicense>true</license.skipUpdateProjectLicense>
-        <osbp.build.ignore.license>true</osbp.build.ignore.license>
-        <osbp.build.verbose.license>false</osbp.build.verbose.license>
-    
-        <!-- maven plugins -->
-        <surefire.version>2.17</surefire.version>
-        <maven.site.version>3.4</maven.site.version>
-        <jarsigner.tsa>https://timestamp.geotrust.com/tsa</jarsigner.tsa>
-        <maven.source.version>2.3</maven.source.version>
-        <sonar.maven.version>2.4</sonar.maven.version>
-    
-        <osbp.report.short>false</osbp.report.short>
-    
-        <!-- ************************ -->
-        <!-- JACOCO and Sonar/Reporting settings -->
-        <!-- ************************ -->
-        <jacoco.version>0.7.2.201409121644</jacoco.version>
-    
-        <!-- The Sonar Jacoco Listener for JUnit to extract coverage details per 
+		<osbp.javadoc.failOnError>true</osbp.javadoc.failOnError>
+		<osbp.javadoc.additionalparam>-Xdoclint:accessibility,html,missing,reference</osbp.javadoc.additionalparam>
+
+		<report.javadoc.version>2.9.1</report.javadoc.version>
+		<report.license.version>1.8</report.license.version>
+		<report.version.version>2.1</report.version.version>
+		<report.surefire.version>${surefire.version}</report.surefire.version>
+		<report.jxr.version>2.4</report.jxr.version>
+		<report.sonar.version>0.1</report.sonar.version>
+		<report.project-info.version>2.7</report.project-info.version>
+
+		<!-- license configuration -->
+		<!-- default license to use for children -->
+		<license.licenseName>epl_v1</license.licenseName>
+		<license.failIfWarning>false</license.failIfWarning>
+		<license.dryRun>false</license.dryRun>
+		<license.copyrightOwners>Loetz GmbH&amp;Co.KG</license.copyrightOwners>
+		<license.skip.header>false</license.skip.header>
+		<license.roots>src</license.roots>
+		<license.canUpdateCopyright>true</license.canUpdateCopyright>
+		<license.canUpdateDescription>true</license.canUpdateDescription>
+		<license.skipUpdateProjectLicense>true</license.skipUpdateProjectLicense>
+		<osbp.build.ignore.license>true</osbp.build.ignore.license>
+		<osbp.build.verbose.license>false</osbp.build.verbose.license>
+
+		<!-- maven plugins -->
+		<surefire.version>2.17</surefire.version>
+		<maven.site.version>3.4</maven.site.version>
+		<maven.source.version>2.3</maven.source.version>
+		<sonar.maven.version>3.2</sonar.maven.version>
+        <maven-jarsigner-plugin.tsa>http://timestamp.entrust.net/TSS/JavaHttpTS</maven-jarsigner-plugin.tsa>
+
+		<osbp.report.short>false</osbp.report.short>
+
+		<!-- ************************ -->
+		<!-- JACOCO and Sonar/Reporting settings -->
+		<!-- ************************ -->
+		<jacoco.version>0.7.2.201409121644</jacoco.version>
+
+		<!-- The Sonar Jacoco Listener for JUnit to extract coverage details per 
 			test -->
-        <sonar-jacoco-listeners.version>2.4</sonar-jacoco-listeners.version>
-        <osbp.jacoco.include>*/**</osbp.jacoco.include>
-    
-        <!-- Sonar/Jacoco integration. Note that you need to call this profile 
+		<sonar-jacoco-listeners.version>2.4</sonar-jacoco-listeners.version>
+		<osbp.jacoco.include>*/**</osbp.jacoco.include>
+
+		<!-- Sonar/Jacoco integration. Note that you need to call this profile 
 			when to execute mvn sonar:sonar -->
-        <sonar.host.url>http://localhost:9000/</sonar.host.url>
-        <osbp.skip.sonar>false</osbp.skip.sonar>
-    
-        <!-- Tells Sonar to use jacoco for coverage results -->
-        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-    
-        <!-- Don't let Sonar execute tests. We will ask it to Maven -->
-        <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-        <!-- The system property jacoco.outputDir needs to be override on the command 
+		<sonar.host.url>http://localhost:9000/</sonar.host.url>
+		<osbp.skip.sonar>false</osbp.skip.sonar>
+
+		<!-- Tells Sonar to use jacoco for coverage results -->
+		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+
+		<!-- Don't let Sonar execute tests. We will ask it to Maven -->
+		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
+		<!-- The system property jacoco.outputDir needs to be override on the command 
 			line with an absolute path if you want to merge results from all modules. 
 			Example in a Jenkins build where ${WORKSPACE} is defined and your project 
 			is in the root directory of the workspace : mvn clean install -Prun-its,coverage 
 			-Djacoco.outputDir=${WORKSPACE}/target. Note that unfortunately using the 
 			following does not work because of http://jira.codehaus.org/browse/SONAR-3427: 
 			<jacoco.outputDir>${session.executionRootDirectory}/target/</jacoco.outputDir> -->
-        <jacoco.outputDir>${project.basedir}/../target/</jacoco.outputDir>
-    
-        <!-- Jacoco output file for UTs -->
-        <jacoco.out.ut.file>jacoco-ut.exec</jacoco.out.ut.file>
-    
-        <!-- Tells Sonar where the Jacoco coverage result file is located for Unit 
-			Tests -->
-        <sonar.jacoco.reportPath>${jacoco.outputDir}${jacoco.out.ut.file}</sonar.jacoco.reportPath>
-    
-        <!-- Jacoco output file for ITs -->
-        <jacoco.out.it.file>jacoco-it.exec</jacoco.out.it.file>
-    
-        <!-- Tells Sonar where the Jacoco coverage result file is located for Integration 
-			Tests -->
-        <sonar.jacoco.itReportPath>${jacoco.outputDir}${jacoco.out.it.file}</sonar.jacoco.itReportPath>
-    
-        <sonar.language>java</sonar.language>
-    
-        <!-- BINDEX -->
-        <pojosr.version>0.4.0-SNAPSHOT</pojosr.version>
-    
-    </properties>
+		<jacoco.outputDir>${project.basedir}/../target/</jacoco.outputDir>
 
-    <issueManagement>
-        <system>Jira</system>
-        <!-- convention is to create jira's components using the same name as the 
+		<!-- Jacoco output file for UTs -->
+		<jacoco.out.ut.file>jacoco-ut.exec</jacoco.out.ut.file>
+
+		<!-- Tells Sonar where the Jacoco coverage result file is located for Unit 
+			Tests -->
+		<sonar.jacoco.reportPath>${jacoco.outputDir}${jacoco.out.ut.file}</sonar.jacoco.reportPath>
+
+		<!-- Jacoco output file for ITs -->
+		<jacoco.out.it.file>jacoco-it.exec</jacoco.out.it.file>
+
+		<!-- Tells Sonar where the Jacoco coverage result file is located for Integration 
+			Tests -->
+		<sonar.jacoco.itReportPath>${jacoco.outputDir}${jacoco.out.it.file}</sonar.jacoco.itReportPath>
+
+		<sonar.language>java</sonar.language>
+
+		<!-- BINDEX -->
+		<pojosr.version>0.4.0-SNAPSHOT</pojosr.version>
+
+	</properties>
+
+	<issueManagement>
+		<system>Jira</system>
+		<!-- convention is to create jira's components using the same name as the 
 			aggregator projects -->
-        <url>https://osbp.atlassian.net/browse/LS?pid=10400</url>
-    </issueManagement>
+		<url>https://osbp.atlassian.net/browse/LS?pid=10400</url>
+	</issueManagement>
 
-    <!-- ciManagement, distributionManagement(Site) and scm should be duplicated 
+	<!-- ciManagement, distributionManagement(Site) and scm should be duplicated 
 		for every git repository (parent pom) and in most cases for each aggregator 
 		due the fact that its modules uses different parents. -->
 
-    <ciManagement>
-        <system>Jenkins</system>
-        <url>${osbp.ci.server.url}${osbp.ci.server.jobprefix}${osbp.gitrepo.name}</url>
-    </ciManagement>
+	<ciManagement>
+		<system>Jenkins</system>
+		<url>${osbp.ci.server.url}${osbp.ci.server.jobprefix}${osbp.gitrepo.name}</url>
+	</ciManagement>
 
-    <url>${osbp.site.repository.url}</url>
-    <distributionManagement>
-        <repository>
-            <id>osbp-nexus-release</id>
-            <name>Nexus Release Repository</name>
-            <url>${distribution.repository.release.url}</url>
-        </repository>
-        <snapshotRepository>
-            <id>osbp-nexus-snapshots</id>
-            <name>Sonatype Nexus Snapshots</name>
-            <url>${distribution.repository.snapshot.url}</url>
-        </snapshotRepository>
-        <site>
-            <id>osbp-source-pages</id>
-            <name>OSBP Source Pages</name>
-            <url>${distribution.site.url}</url>
-        </site>
-    </distributionManagement>
-    <scm>
-        <!-- connection and developerConnection must be added in children in order 
+	<url>${osbp.site.repository.url}</url>
+
+	<scm>
+		<!-- connection and developerConnection must be added in children in order 
 			to use with git -->
-        <connection>${osbp.scm.connection}</connection>
-        <developerConnection>${osbp.scm.connection.dev}</developerConnection>
-        <url>${osbp.scm.url}</url>
-        <tag>HEAD</tag>
-    </scm>
-    <!-- End -->
+		<connection>${osbp.scm.connection}</connection>
+		<developerConnection>${osbp.scm.connection.dev}</developerConnection>
+		<url>${osbp.scm.url}</url>
+		<tag>HEAD</tag>
+	</scm>
+	<!-- End -->
 
-	
-	<!-- set the default maven repositories, this entry must be here. Do not remove it. -->
+
+	<!-- set the default maven repositories, this entry must be here. Do not 
+		remove it. -->
 	<repositories>
 		<repository>
 			<id>central</id>
@@ -307,94 +295,145 @@
 				<updatePolicy>never</updatePolicy>
 			</releases>
 		</pluginRepository>
-	</pluginRepositories> 
-	
-	
-	
-    <profiles>
-        <profile>
-            <id>whenIsAggregatorProject</id>
-            <activation>
-                <file>
-                    <exists>.osbp.releng.aggregator</exists>
-                </file>
-            </activation>
-            <properties>
-                <osbp.scm.url>${osbp.scm.url.host}${osbp.scm.user}/${osbp.gitrepo.name}/tree/${osbp.scm.branch}/${project.artifactId}/</osbp.scm.url>
-            </properties>
-        </profile>
-    
-        <profile>
-            <id>whenIsRootProject</id>
-            <activation>
-                <file>
-                    <exists>.osbp.releng.root</exists>
-                </file>
-            </activation>
-            <properties>
-                <osbp.scm.url>${osbp.scm.url.host}${osbp.scm.user}/${osbp.gitrepo.name}</osbp.scm.url>
-            </properties>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-site-plugin</artifactId>
-                            <inherited>true</inherited>
-                            <configuration>
-                                <stagingDirectory>${osbp.developer.home.site}</stagingDirectory>
-                                <siteDirectory>${basedir}${file.separator}src${file.separator}site</siteDirectory>
-                                <topSiteURL>${osbp.site.root.url}</topSiteURL>
-                            </configuration>
-                            <executions>
-                                <execution>
-                                    <id>attach-file</id>
-                                    <goals>
-                                        <goal>attach-descriptor</goal>
-                                    </goals>
-                                </execution>
-                            </executions>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-            <reporting>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.sonar-plugins</groupId>
-                        <artifactId>maven-report</artifactId>
-                        <version>${report.sonar.version}</version>
-                        <configuration>
-                            <sonarHostURL>${sonar.host.url}</sonarHostURL>
+	</pluginRepositories>
+
+
+
+	<profiles>
+		<profile>
+			<id>isEclipseBuild</id>
+			<activation>
+				<property>
+					<name>!isNotEclipseBuild</name>
+				</property>
+			</activation>
+
+			<distributionManagement>
+				<repository>
+					<id>repo.eclipse.org</id>
+					<name>Project Repository - Releases</name>
+					<url>https://repo.eclipse.org/content/repositories/osbp-releases/</url>
+				</repository>
+				<snapshotRepository>
+					<id>repo.eclipse.org</id>
+					<name>Project Repository - Snapshots</name>
+					<url>https://repo.eclipse.org/content/repositories/osbp-snapshots/</url>
+				</snapshotRepository>
+			</distributionManagement>
+
+		</profile>
+		<profile>
+			<id>isNotEclipseBuild</id>
+			<activation>
+				<property>
+					<name>isNotEclipseBuild</name>
+				</property>
+			</activation>
+
+			<distributionManagement>
+				<repository>
+					<id>osbp-nexus-release</id>
+					<name>Nexus Release Repository</name>
+					<url>${distribution.repository.release.url}</url>
+				</repository>
+				<snapshotRepository>
+					<id>osbp-nexus-snapshots</id>
+					<name>Sonatype Nexus Snapshots</name>
+					<url>${distribution.repository.snapshot.url}</url>
+				</snapshotRepository>
+				<site>
+					<id>osbp-source-pages</id>
+					<name>OSBP Source Pages</name>
+					<url>${distribution.site.url}</url>
+				</site>
+			</distributionManagement>
+
+		</profile>
+
+
+		<profile>
+			<id>whenIsAggregatorProject</id>
+			<activation>
+				<file>
+					<exists>.osbp.releng.aggregator</exists>
+				</file>
+			</activation>
+			<properties>
+				<osbp.scm.url>${osbp.scm.url.host}${osbp.scm.user}/${osbp.gitrepo.name}/tree/${osbp.scm.branch}/${project.artifactId}/</osbp.scm.url>
+			</properties>
+		</profile>
+
+		<profile>
+			<id>whenIsRootProject</id>
+			<activation>
+				<file>
+					<exists>.osbp.releng.root</exists>
+				</file>
+			</activation>
+			<properties>
+				<osbp.scm.url>${osbp.scm.url.host}${osbp.scm.user}/${osbp.gitrepo.name}</osbp.scm.url>
+			</properties>
+			<build>
+				<pluginManagement>
+					<plugins>
+						<plugin>
+							<groupId>org.apache.maven.plugins</groupId>
+							<artifactId>maven-site-plugin</artifactId>
+							<inherited>true</inherited>
+							<configuration>
+								<stagingDirectory>${osbp.developer.home.site}</stagingDirectory>
+								<siteDirectory>${basedir}${file.separator}src${file.separator}site</siteDirectory>
+								<topSiteURL>${osbp.site.root.url}</topSiteURL>
+							</configuration>
+							<executions>
+								<execution>
+									<id>attach-file</id>
+									<goals>
+										<goal>attach-descriptor</goal>
+									</goals>
+								</execution>
+							</executions>
+						</plugin>
+					</plugins>
+				</pluginManagement>
+			</build>
+			<reporting>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.sonar-plugins</groupId>
+						<artifactId>maven-report</artifactId>
+						<version>${report.sonar.version}</version>
+						<configuration>
+							<sonarHostURL>${sonar.host.url}</sonarHostURL>
 							<skip>${osbp.skip.sonar}</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-project-info-reports-plugin</artifactId>
-                        <version>${report.project-info.version}</version>
-                        <reportSets>
-                            <reportSet>
-                                <reports>
-                                    <!-- distribution-management, index, dependencies, help, issue-tracking, 
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-project-info-reports-plugin</artifactId>
+						<version>${report.project-info.version}</version>
+						<reportSets>
+							<reportSet>
+								<reports>
+									<!-- distribution-management, index, dependencies, help, issue-tracking, 
 										plugins, cim, license, dependency-management, mailing-list, project-team, 
 										dependency-convergence, scm, plugin-management, modules, summary -->
-                                    <report>index</report>
-                                    <report>modules</report>
-                                    <report>project-team</report>
-                                </reports>
-                            </reportSet>
-                        </reportSets>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <configuration>
+									<report>index</report>
+									<report>modules</report>
+									<report>project-team</report>
+								</reports>
+							</reportSet>
+						</reportSets>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<configuration>
 							<skip>${osbp.skip.javadoc}</skip>
-                        	<failOnError>${osbp.javadoc.failOnError}</failOnError>
-                        	<additionalparam>${osbp.javadoc.additionalparam}</additionalparam>
-                        	<!-- -Xdoclint:syntax leads to problems with generated code	 -->
-                            <tags>
+							<failOnError>${osbp.javadoc.failOnError}</failOnError>
+							<additionalparam>${osbp.javadoc.additionalparam}</additionalparam>
+							<!-- -Xdoclint:syntax leads to problems with generated code -->
+							<tags>
 								<tag>
 									<name>generated</name>
 									<placement>a</placement>
@@ -421,460 +460,460 @@
 									<name>Immutable</name>
 									<placement>a</placement>
 								</tag>
-	                           	<tag>
-	                           		<name>noimplement</name>
-	                           		<placement>a</placement>
+								<tag>
+									<name>noimplement</name>
+									<placement>a</placement>
 									<head>This interface should not be implemented.</head>
-	                           	</tag>
-	                           	<tag>
-	                           		<name>noextend</name>
-	                           		<placement>a</placement>
-	                           	</tag>
-	                           	<tag>
-	                           		<name>noinstantiate</name>
-	                           		<placement>a</placement>
-	                           	</tag>
-	                           	<tag>
-	                           		<name>nooverride</name>
-	                           		<placement>a</placement>
-	                           	</tag>
-	                           	<tag>
-	                           		<name>noreference</name>
-	                           		<placement>a</placement>
-	                           	</tag>
-	                           	<tag>
-	                           		<name>NoImplementByClients</name>
-	                           		<placement>a</placement>
+								</tag>
+								<tag>
+									<name>noextend</name>
+									<placement>a</placement>
+								</tag>
+								<tag>
+									<name>noinstantiate</name>
+									<placement>a</placement>
+								</tag>
+								<tag>
+									<name>nooverride</name>
+									<placement>a</placement>
+								</tag>
+								<tag>
+									<name>noreference</name>
+									<placement>a</placement>
+								</tag>
+								<tag>
+									<name>NoImplementByClients</name>
+									<placement>a</placement>
 									<head>This interface should not be implemented by clients.</head>
-	                           	</tag>
-	                           	<tag>
-	                           		<name>Scope</name>
-	                           		<placement>a</placement>
-	                           	</tag>
-                            </tags>
-                            <additionalDependencies>
-                                <additionalDependency>
-                                    <groupId>org.osgi</groupId>
-                                    <artifactId>org.osgi.core</artifactId>
-                                    <version>0.9.0-SNAPSHOT</version>
-                                </additionalDependency>
-                            </additionalDependencies>
-                        </configuration>
-                        <reportSets>
-                            <reportSet>
-                                <id>javadoc-aggregate</id>
-                                <configuration>
-                                    <!-- Specific configuration for the aggregate report -->
-                                </configuration>
-                                <reports>
-                                    <report>aggregate</report>
-                                </reports>
-                            </reportSet>
-                        </reportSets>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jxr-plugin</artifactId>
-                        <version>${report.jxr.version}</version>
-                        <configuration>
-                            <aggregate>true</aggregate>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-report-plugin</artifactId>
-                        <version>${report.surefire.version}</version>
-                        <configuration>
-                            <aggregate>true</aggregate>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </reporting>
-        </profile>
-    
-        <profile>
-            <id>full-project-info-report</id>
-            <activation>
-                <file>
-                    <missing>.osbp.releng.root</missing>
-                </file>
-                <property>
-                    <name>osbp.build.release</name>
-                </property>
-            </activation>
-            <properties>
-                <javadocJreApiVersion>7</javadocJreApiVersion>
-            </properties>
-            <reporting>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jxr-plugin</artifactId>
-                        <version>${report.jxr.version}</version>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-changes-plugin</artifactId>
-                        <version>2.10</version>
-                        <reportSets>
-                            <reportSet>
-                                <reports>
-                                    <report>jira-report</report>
-                                </reports>
-                            </reportSet>
-                        </reportSets>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>versions-maven-plugin</artifactId>
-                        <version>${report.version.version}</version>
-                        <reportSets>
-                            <reportSet>
-                                <reports>
-                                    <report>dependency-updates-report</report>
-                                    <report>plugin-updates-report</report>
-                                    <report>property-updates-report</report>
-                                </reports>
-                            </reportSet>
-                        </reportSets>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>taglist-maven-plugin</artifactId>
-                        <version>2.4</version>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>license-maven-plugin</artifactId>
-                        <version>${report.license.version}</version>
-                        <reportSets>
-                            <reportSet>
-                                <id>licenses-report</id>
-                                <reports>
-                                    <report>third-party-report</report>
-                                </reports>
-                            </reportSet>
-                        </reportSets>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-project-info-reports-plugin</artifactId>
-                        <version>${report.project-info.version}</version>
-                        <reportSets>
-                            <reportSet>
-                                <reports>
-                                    <!-- distribution-management, index, dependencies, help, issue-tracking, 
+								</tag>
+								<tag>
+									<name>Scope</name>
+									<placement>a</placement>
+								</tag>
+							</tags>
+							<additionalDependencies>
+								<additionalDependency>
+									<groupId>org.osgi</groupId>
+									<artifactId>org.osgi.core</artifactId>
+									<version>0.9.0-SNAPSHOT</version>
+								</additionalDependency>
+							</additionalDependencies>
+						</configuration>
+						<reportSets>
+							<reportSet>
+								<id>javadoc-aggregate</id>
+								<configuration>
+									<!-- Specific configuration for the aggregate report -->
+								</configuration>
+								<reports>
+									<report>aggregate</report>
+								</reports>
+							</reportSet>
+						</reportSets>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-jxr-plugin</artifactId>
+						<version>${report.jxr.version}</version>
+						<configuration>
+							<aggregate>true</aggregate>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-report-plugin</artifactId>
+						<version>${report.surefire.version}</version>
+						<configuration>
+							<aggregate>true</aggregate>
+						</configuration>
+					</plugin>
+				</plugins>
+			</reporting>
+		</profile>
+
+		<profile>
+			<id>full-project-info-report</id>
+			<activation>
+				<file>
+					<missing>.osbp.releng.root</missing>
+				</file>
+				<property>
+					<name>osbp.build.release</name>
+				</property>
+			</activation>
+			<properties>
+				<javadocJreApiVersion>7</javadocJreApiVersion>
+			</properties>
+			<reporting>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-jxr-plugin</artifactId>
+						<version>${report.jxr.version}</version>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-changes-plugin</artifactId>
+						<version>2.10</version>
+						<reportSets>
+							<reportSet>
+								<reports>
+									<report>jira-report</report>
+								</reports>
+							</reportSet>
+						</reportSets>
+					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>versions-maven-plugin</artifactId>
+						<version>${report.version.version}</version>
+						<reportSets>
+							<reportSet>
+								<reports>
+									<report>dependency-updates-report</report>
+									<report>plugin-updates-report</report>
+									<report>property-updates-report</report>
+								</reports>
+							</reportSet>
+						</reportSets>
+					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>taglist-maven-plugin</artifactId>
+						<version>2.4</version>
+					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>license-maven-plugin</artifactId>
+						<version>${report.license.version}</version>
+						<reportSets>
+							<reportSet>
+								<id>licenses-report</id>
+								<reports>
+									<report>third-party-report</report>
+								</reports>
+							</reportSet>
+						</reportSets>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-project-info-reports-plugin</artifactId>
+						<version>${report.project-info.version}</version>
+						<reportSets>
+							<reportSet>
+								<reports>
+									<!-- distribution-management, index, dependencies, help, issue-tracking, 
 										plugins, cim, license, dependency-management, mailing-list, project-team, 
 										dependency-convergence, scm, plugin-management, modules, summary -->
-                                    <report>index</report>
-                                    <report>distribution-management</report>
-                                    <report>issue-tracking</report>
-                                    <report>plugins</report>
-                                    <report>cim</report>
-                                    <report>dependency-management</report>
-                                    <report>license</report>
-                                    <report>dependencies</report>
-                                    <report>plugin-management</report>
-                                    <report>dependency-convergence</report>
-                                    <report>summary</report>
-                                </reports>
-                            </reportSet>
-                        </reportSets>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>versions-maven-plugin</artifactId>
-                        <version>2.1</version>
-                        <reportSets>
-                            <reportSet>
-                                <reports>
-                                    <report>dependency-updates-report</report>
-                                    <report>plugin-updates-report</report>
-                                    <report>property-updates-report</report>
-                                </reports>
-                            </reportSet>
-                        </reportSets>
-                    </plugin>
-                </plugins>
-            </reporting>
-        </profile>
-    
-        <profile>
-            <id>check-license</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-                <!-- 				<file> -->
-                <!-- 					<exists>.run.never</exists>  -->
-                <!-- 				</file> -->
-                <!-- 				</property> -->
-                <!-- 					<name>!m2e.version</name> -->
-                <!-- 				</property> -->
-            </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.codehaus.mojo</groupId>
-                            <artifactId>license-maven-plugin</artifactId>
-                            <version>${report.license.version}</version>
-                            <inherited>true</inherited>
-                            <configuration>
-                                <skipAddThirdParty>false</skipAddThirdParty>
-                                <skipCheckLicense>${osbp.build.ignore.license}</skipCheckLicense>
-                                <verbose>${osbp.build.verbose.license}</verbose>
-                                <generateBundle>true</generateBundle>
-                                <deployMissingFile>false</deployMissingFile>
-                                <useRepositoryMissingFiles>true</useRepositoryMissingFiles>
-                                <quiet>false</quiet>
-                                <useMissingFile>true</useMissingFile>
-                                <failIfWarning>${license.failIfWarning}</failIfWarning>
-                                <encoding>UTF-8</encoding>
-                                <!-- 								<useAsMissingFileRepository>org.eclipse.osbp.releng.maven:osbp-releng-maven-licenses:0.12.3-SNAPSHOT</useAsMissingFileRepository> -->
-                                <licenseMerges>
-                                    <licenseMerge>
-                                        The Apache Software License, Version 2.0|Apache
-                                        License, Version
-                                        2.0|Apache License V2.0|Apache 2|ASF
-                                        2.0|apache-2.0|Apache
-                                        Public License 2.0
-                                    </licenseMerge>
-                                    <licenseMerge>BSD License|BSD license|BSD</licenseMerge>
-                                    <licenseMerge>MIT License|MIT license|MIT</licenseMerge>
-                                    <licenseMerge>
-                                        COMMON DEVELOPMENT AND DISTRIBUTION LICENSE
-                                        (CDDL)
-                                        Version
-                                        1.0|Common Development and Distribution License
-                                        (CDDL)
-                                        v1.0
-                                    </licenseMerge>
-                                    <licenseMerge>Indiana University Extreme! Lab Software
-                                        License,
-                                        vesion 1.1.1|Indiana University Extreme! Lab
-                                        Software License
-                                    </licenseMerge>
-                                </licenseMerges>
-                            </configuration>
-                            <executions>
-                                <execution>
-                                    <id>update-license-files</id>
-                                    <goals>
-                                        <goal>update-project-license</goal>
-                                        <goal>add-third-party</goal>
-                                    </goals>
-                                </execution>
-                                <execution>
-                                    <id>update-file-header</id>
-                                    <goals>
-                                        <goal>update-file-header</goal>
-                                    </goals>
-                                    <phase>process-sources</phase>
-                                    <configuration>
-                                        <excludes>
-                                            <exclude>**/THIRD-PARTY.properties</exclude>
-                                        </excludes>
-                                        <canUpdateCopyright>${license.canUpdateCopyright}</canUpdateCopyright>
-                                        <canUpdateDescription>${license.canUpdateDescription}</canUpdateDescription>
-                                        <acceptPomPackaging>false</acceptPomPackaging>
-                                        <verbose>false</verbose>
-                                        <copyrightOwners>${license.copyrightOwners}</copyrightOwners>
-                                        <dryRun>${license.dryRun}</dryRun>
-                                        <failOnMissingHeader>${license.failIfWarning}</failOnMissingHeader>
-                                        <deployMissingFile>true</deployMissingFile>
-                                        <useMissingFile>true</useMissingFile>
-                                        <useRepositoryMissingFiles>false</useRepositoryMissingFiles>
-                                    </configuration>
-                                </execution>
-                            </executions>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>license-maven-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.nuiton.processor</groupId>
-                    <artifactId>processor-maven-plugin</artifactId>
-                    <version>1.3</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.nuiton.processor</groupId>
-                    <artifactId>nuiton-processor</artifactId>
-                    <version>1.3</version>
-                </dependency>
-            </dependencies>
-        </profile>
-    
-        <profile>
-            <!-- Just in case the developer have forgotten to set it in settings.xml -->
-            <id>set.workspace.location</id>
-            <activation>
-                <property>
-                    <name>!osbp.developer.home</name>
-                </property>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <properties>
-                <osbp.developer.home>${env.HOME}${file.separator}osbp-dev${file.separator}</osbp.developer.home>
-                <osbp.stage.site.dir>${osbp.developer.home}site${file.separator}</osbp.stage.site.dir>
-            </properties>
-        </profile>
-    
-        <profile>
-            <id>remove.old.build</id>
-            <activation>
-                <property>
-                    <name>osbp.build.release</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>remove-old-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>remove-project-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <removeAll>false</removeAll><!-- When true, remove all built artifacts 
+									<report>index</report>
+									<report>distribution-management</report>
+									<report>issue-tracking</report>
+									<report>plugins</report>
+									<report>cim</report>
+									<report>dependency-management</report>
+									<report>license</report>
+									<report>dependencies</report>
+									<report>plugin-management</report>
+									<report>dependency-convergence</report>
+									<report>summary</report>
+								</reports>
+							</reportSet>
+						</reportSets>
+					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>versions-maven-plugin</artifactId>
+						<version>2.1</version>
+						<reportSets>
+							<reportSet>
+								<reports>
+									<report>dependency-updates-report</report>
+									<report>plugin-updates-report</report>
+									<report>property-updates-report</report>
+								</reports>
+							</reportSet>
+						</reportSets>
+					</plugin>
+				</plugins>
+			</reporting>
+		</profile>
+
+		<profile>
+			<id>check-license</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+				<!-- <file> -->
+				<!-- <exists>.run.never</exists> -->
+				<!-- </file> -->
+				<!-- </property> -->
+				<!-- <name>!m2e.version</name> -->
+				<!-- </property> -->
+			</activation>
+			<build>
+				<pluginManagement>
+					<plugins>
+						<plugin>
+							<groupId>org.codehaus.mojo</groupId>
+							<artifactId>license-maven-plugin</artifactId>
+							<version>${report.license.version}</version>
+							<inherited>true</inherited>
+							<configuration>
+								<skipAddThirdParty>false</skipAddThirdParty>
+								<skipCheckLicense>${osbp.build.ignore.license}</skipCheckLicense>
+								<verbose>${osbp.build.verbose.license}</verbose>
+								<generateBundle>true</generateBundle>
+								<deployMissingFile>false</deployMissingFile>
+								<useRepositoryMissingFiles>true</useRepositoryMissingFiles>
+								<quiet>false</quiet>
+								<useMissingFile>true</useMissingFile>
+								<failIfWarning>${license.failIfWarning}</failIfWarning>
+								<encoding>UTF-8</encoding>
+								<!-- <useAsMissingFileRepository>org.eclipse.osbp.releng.maven:osbp-releng-maven-licenses:0.12.3-SNAPSHOT</useAsMissingFileRepository> -->
+								<licenseMerges>
+									<licenseMerge>
+										The Apache Software License, Version 2.0|Apache
+										License, Version
+										2.0|Apache License V2.0|Apache 2|ASF
+										2.0|apache-2.0|Apache
+										Public License 2.0
+									</licenseMerge>
+									<licenseMerge>BSD License|BSD license|BSD</licenseMerge>
+									<licenseMerge>MIT License|MIT license|MIT</licenseMerge>
+									<licenseMerge>
+										COMMON DEVELOPMENT AND DISTRIBUTION LICENSE
+										(CDDL)
+										Version
+										1.0|Common Development and Distribution License
+										(CDDL)
+										v1.0
+									</licenseMerge>
+									<licenseMerge>Indiana University Extreme! Lab Software
+										License,
+										vesion 1.1.1|Indiana University Extreme! Lab
+										Software License
+									</licenseMerge>
+								</licenseMerges>
+							</configuration>
+							<executions>
+								<execution>
+									<id>update-license-files</id>
+									<goals>
+										<goal>update-project-license</goal>
+										<goal>add-third-party</goal>
+									</goals>
+								</execution>
+								<execution>
+									<id>update-file-header</id>
+									<goals>
+										<goal>update-file-header</goal>
+									</goals>
+									<phase>process-sources</phase>
+									<configuration>
+										<excludes>
+											<exclude>**/THIRD-PARTY.properties</exclude>
+										</excludes>
+										<canUpdateCopyright>${license.canUpdateCopyright}</canUpdateCopyright>
+										<canUpdateDescription>${license.canUpdateDescription}</canUpdateDescription>
+										<acceptPomPackaging>false</acceptPomPackaging>
+										<verbose>false</verbose>
+										<copyrightOwners>${license.copyrightOwners}</copyrightOwners>
+										<dryRun>${license.dryRun}</dryRun>
+										<failOnMissingHeader>${license.failIfWarning}</failOnMissingHeader>
+										<deployMissingFile>true</deployMissingFile>
+										<useMissingFile>true</useMissingFile>
+										<useRepositoryMissingFiles>false</useRepositoryMissingFiles>
+									</configuration>
+								</execution>
+							</executions>
+						</plugin>
+					</plugins>
+				</pluginManagement>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>license-maven-plugin</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<dependency>
+					<groupId>org.nuiton.processor</groupId>
+					<artifactId>processor-maven-plugin</artifactId>
+					<version>1.3</version>
+				</dependency>
+				<dependency>
+					<groupId>org.nuiton.processor</groupId>
+					<artifactId>nuiton-processor</artifactId>
+					<version>1.3</version>
+				</dependency>
+			</dependencies>
+		</profile>
+
+		<profile>
+			<!-- Just in case the developer have forgotten to set it in settings.xml -->
+			<id>set.workspace.location</id>
+			<activation>
+				<property>
+					<name>!osbp.developer.home</name>
+				</property>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<properties>
+				<osbp.developer.home>${env.HOME}${file.separator}osbp-dev${file.separator}</osbp.developer.home>
+				<osbp.stage.site.dir>${osbp.developer.home}site${file.separator}</osbp.stage.site.dir>
+			</properties>
+		</profile>
+
+		<profile>
+			<id>remove.old.build</id>
+			<activation>
+				<property>
+					<name>osbp.build.release</name>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>build-helper-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>remove-old-artifacts</id>
+								<phase>package</phase>
+								<goals>
+									<goal>remove-project-artifact</goal>
+								</goals>
+								<configuration>
+									<removeAll>false</removeAll><!-- When true, remove all built artifacts 
 										including all versions. When false, remove all built artifacts of this project 
 										version -->
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    
-        <!-- This profile is used to gather code coverage for Sonar -->
-        <profile>
-            <id>codeCoverage</id>
-            <activation>
-                <file>
-                    <missing>.osbp.releng.root</missing>
-                </file>
-            </activation>
-            <properties>
-            </properties>
-            <reporting>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.sonar-plugins</groupId>
-                        <artifactId>maven-report</artifactId>
-                        <version>${report.sonar.version}</version>
-                        <configuration>
-                            <sonarHostURL>${sonar.host.url}</sonarHostURL>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-report-plugin</artifactId>
-                        <version>${report.surefire.version}</version>
-                        <reportSets>
-                            <reportSet>
-                                <id>integration-tests</id>
-                                <reports>
-                                    <report>report-only</report>
-                                    <report>failsafe-report-only</report>
-                                </reports>
-                            </reportSet>
-                        </reportSets>
-                    </plugin>
-                </plugins>
-            </reporting>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <!-- Setup jacoco -->
-                        <plugin>
-                            <groupId>org.jacoco</groupId>
-                            <artifactId>jacoco-maven-plugin</artifactId>
-                            <executions>
-                                <!-- Prepares a variable, jacoco.agent.ut.arg, that contains the 
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<!-- This profile is used to gather code coverage for Sonar -->
+		<profile>
+			<id>codeCoverage</id>
+			<activation>
+				<file>
+					<missing>.osbp.releng.root</missing>
+				</file>
+			</activation>
+			<properties>
+			</properties>
+			<reporting>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.sonar-plugins</groupId>
+						<artifactId>maven-report</artifactId>
+						<version>${report.sonar.version}</version>
+						<configuration>
+							<sonarHostURL>${sonar.host.url}</sonarHostURL>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-report-plugin</artifactId>
+						<version>${report.surefire.version}</version>
+						<reportSets>
+							<reportSet>
+								<id>integration-tests</id>
+								<reports>
+									<report>report-only</report>
+									<report>failsafe-report-only</report>
+								</reports>
+							</reportSet>
+						</reportSets>
+					</plugin>
+				</plugins>
+			</reporting>
+			<build>
+				<pluginManagement>
+					<plugins>
+						<!-- Setup jacoco -->
+						<plugin>
+							<groupId>org.jacoco</groupId>
+							<artifactId>jacoco-maven-plugin</artifactId>
+							<executions>
+								<!-- Prepares a variable, jacoco.agent.ut.arg, that contains the 
 									info to be passed to the JVM hosting the code being tested. -->
-                                <execution>
-                                    <id>prepare-ut-agent</id>
-                                    <phase>process-test-classes</phase>
-                                    <goals>
-                                        <goal>prepare-agent</goal>
-                                    </goals>
-                                    <configuration>
-                                        <destFile>${sonar.jacoco.reportPath}</destFile>
-                                        <propertyName>jacoco.agent.ut.arg</propertyName>
-                                        <append>true</append>
-                                        <includes>
-                                            <include>${osbp.jacoco.include}</include>
-                                        </includes>
-                                    </configuration>
-                                </execution>
-                                <!-- Prepares a variable, jacoco.agent.it.arg, that contains the 
+								<execution>
+									<id>prepare-ut-agent</id>
+									<phase>process-test-classes</phase>
+									<goals>
+										<goal>prepare-agent</goal>
+									</goals>
+									<configuration>
+										<destFile>${sonar.jacoco.reportPath}</destFile>
+										<propertyName>jacoco.agent.ut.arg</propertyName>
+										<append>true</append>
+										<includes>
+											<include>${osbp.jacoco.include}</include>
+										</includes>
+									</configuration>
+								</execution>
+								<!-- Prepares a variable, jacoco.agent.it.arg, that contains the 
 									info to be passed to the JVM hosting the code being tested. -->
-                                <execution>
-                                    <id>prepare-it-agent</id>
-                                    <phase>pre-integration-test</phase>
-                                    <goals>
-                                        <goal>prepare-agent-integration</goal>
-                                    </goals>
-                                    <configuration>
-                                        <destFile>${sonar.jacoco.itReportPath}</destFile>
-                                        <propertyName>jacoco.agent.it.arg</propertyName>
-                                        <append>true</append>
-                                    </configuration>
-                                </execution>
-                                <execution>
-                                    <id>post-test</id>
-                                    <goals>
-                                        <goal>report</goal>
-                                    </goals>
-                                    <configuration>
-                                        <dataFile>${sonar.jacoco.reportPath}</dataFile>
-                                    </configuration>
-                                </execution>
-                                <execution>
-                                    <id>post-itest</id>
-                                    <goals>
-                                        <goal>report-integration</goal>
-                                    </goals>
-                                    <configuration>
-                                        <dataFile>${sonar.jacoco.itReportPath}</dataFile>
-                                    </configuration>
-                                </execution>
-                            </executions>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>sonar-maven-plugin</artifactId>
-                    </plugin>
-                
-                    <!-- Enabling use of jacoco -->
-                    <plugin>
-                        <groupId>org.jacoco</groupId>
-                        <artifactId>jacoco-maven-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.codehaus.sonar-plugins.java</groupId>
-                    <artifactId>sonar-jacoco-listeners</artifactId>
-                    <version>${sonar-jacoco-listeners.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
+								<execution>
+									<id>prepare-it-agent</id>
+									<phase>pre-integration-test</phase>
+									<goals>
+										<goal>prepare-agent-integration</goal>
+									</goals>
+									<configuration>
+										<destFile>${sonar.jacoco.itReportPath}</destFile>
+										<propertyName>jacoco.agent.it.arg</propertyName>
+										<append>true</append>
+									</configuration>
+								</execution>
+								<execution>
+									<id>post-test</id>
+									<goals>
+										<goal>report</goal>
+									</goals>
+									<configuration>
+										<dataFile>${sonar.jacoco.reportPath}</dataFile>
+									</configuration>
+								</execution>
+								<execution>
+									<id>post-itest</id>
+									<goals>
+										<goal>report-integration</goal>
+									</goals>
+									<configuration>
+										<dataFile>${sonar.jacoco.itReportPath}</dataFile>
+									</configuration>
+								</execution>
+							</executions>
+						</plugin>
+					</plugins>
+				</pluginManagement>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>sonar-maven-plugin</artifactId>
+					</plugin>
+
+					<!-- Enabling use of jacoco -->
+					<plugin>
+						<groupId>org.jacoco</groupId>
+						<artifactId>jacoco-maven-plugin</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<dependency>
+					<groupId>org.codehaus.sonar-plugins.java</groupId>
+					<artifactId>sonar-jacoco-listeners</artifactId>
+					<version>${sonar-jacoco-listeners.version}</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+		</profile>
 
 		<profile>
 			<!-- enables javadoc creation on bundle level -->
@@ -898,140 +937,153 @@
 								<phase>package</phase>
 							</execution>
 						</executions>
-	                    <configuration>
+						<configuration>
 							<skip>${osbp.skip.javadoc}</skip>
-                        	<additionalparam>${osbp.javadoc.additionalparam}</additionalparam>
+							<additionalparam>${osbp.javadoc.additionalparam}</additionalparam>
 						</configuration>
 					</plugin>
 				</plugins>
 			</build>
 		</profile>
-    
-        <profile>
-            <id>lifecycle-mapping-in-eclipse</id>
-            <!-- activated only when running in m2e (eclipse) -->
-            <activation>
-                <property>
-                    <name>m2e.version</name>
-                </property>
-            </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.eclipse.m2e</groupId>
-                            <artifactId>lifecycle-mapping</artifactId>
-                            <version>1.0.0</version>
-                            <configuration>
-                                <lifecycleMappingMetadata>
-                                    <pluginExecutions>
-                                        <pluginExecution>
-                                            <pluginExecutionFilter>
-                                                <groupId>org.apache.maven.plugins</groupId>
-                                                <artifactId>maven-dependency-plugin</artifactId>
-                                                <versionRange>[2.0,)</versionRange>
-                                                <goals>
-                                                    <goal>copy-dependencies</goal>
-                                                    <goal>unpack</goal>
-                                                </goals>
-                                            </pluginExecutionFilter>
-                                            <action>
-                                                <ignore/>
-                                            </action>
-                                        </pluginExecution>
-                                        <pluginExecution>
-                                            <pluginExecutionFilter>
-                                                <groupId>org.apache.maven.plugins</groupId>
-                                                <artifactId>maven-plugin-plugin</artifactId>
-                                                <versionRange>[3.0,)</versionRange>
-                                                <goals>
-                                                    <goal>descriptor</goal>
-                                                    <goal>helpmojo</goal>
-                                                </goals>
-                                            </pluginExecutionFilter>
-                                            <action>
-                                                <execute>
-                                                    <runOnIncremental>false</runOnIncremental>
-                                                    <runOnConfiguration>true</runOnConfiguration>
-                                                </execute>
-                                            </action>
-                                        </pluginExecution>
-                                        <pluginExecution>
-                                            <pluginExecutionFilter>
-                                                <groupId>org.apache.maven.plugins</groupId>
-                                                <artifactId>maven-antrun-plugin</artifactId>
-                                                <versionRange>[1.0,)</versionRange>
-                                                <goals>
-                                                    <goal>run</goal>
-                                                </goals>
-                                            </pluginExecutionFilter>
-                                            <action>
-                                                <execute>
-                                                    <runOnIncremental>false</runOnIncremental>
-                                                    <runOnConfiguration>true</runOnConfiguration>
-                                                </execute>
-                                            </action>
-                                        </pluginExecution>
-                                        <pluginExecution>
-                                            <pluginExecutionFilter>
-                                                <groupId>org.jacoco</groupId>
-                                                <artifactId>jacoco-maven-plugin</artifactId>
-                                                <versionRange>[0.6,)
-                                                </versionRange>
-                                                <goals>
-                                                    <goal>prepare-agent</goal>
-                                                </goals>
-                                            </pluginExecutionFilter>
-                                            <action>
-                                                <!-- m2e doesn't know what to do with jacoco, let's ignore it 
+
+		<profile>
+			<id>lifecycle-mapping-in-eclipse</id>
+			<!-- activated only when running in m2e (eclipse) -->
+			<activation>
+				<property>
+					<name>m2e.version</name>
+				</property>
+			</activation>
+			<build>
+				<pluginManagement>
+					<plugins>
+						<plugin>
+							<groupId>org.eclipse.m2e</groupId>
+							<artifactId>lifecycle-mapping</artifactId>
+							<version>1.0.0</version>
+							<configuration>
+								<lifecycleMappingMetadata>
+									<pluginExecutions>
+										<pluginExecution>
+											<pluginExecutionFilter>
+												<groupId>org.apache.maven.plugins</groupId>
+												<artifactId>maven-clean-plugin</artifactId>
+												<versionRange>[2.5,)</versionRange>
+												<goals>
+													<goal>clean</goal>
+												</goals>
+											</pluginExecutionFilter>
+											<action>
+												<ignore />
+											</action>
+										</pluginExecution>
+										<pluginExecution>
+											<pluginExecutionFilter>
+												<groupId>org.apache.maven.plugins</groupId>
+												<artifactId>maven-dependency-plugin</artifactId>
+												<versionRange>[2.0,)</versionRange>
+												<goals>
+													<goal>copy-dependencies</goal>
+													<goal>unpack</goal>
+												</goals>
+											</pluginExecutionFilter>
+											<action>
+												<ignore />
+											</action>
+										</pluginExecution>
+										<pluginExecution>
+											<pluginExecutionFilter>
+												<groupId>org.apache.maven.plugins</groupId>
+												<artifactId>maven-plugin-plugin</artifactId>
+												<versionRange>[3.0,)</versionRange>
+												<goals>
+													<goal>descriptor</goal>
+													<goal>helpmojo</goal>
+												</goals>
+											</pluginExecutionFilter>
+											<action>
+												<execute>
+													<runOnIncremental>false</runOnIncremental>
+													<runOnConfiguration>true</runOnConfiguration>
+												</execute>
+											</action>
+										</pluginExecution>
+										<pluginExecution>
+											<pluginExecutionFilter>
+												<groupId>org.apache.maven.plugins</groupId>
+												<artifactId>maven-antrun-plugin</artifactId>
+												<versionRange>[1.0,)</versionRange>
+												<goals>
+													<goal>run</goal>
+												</goals>
+											</pluginExecutionFilter>
+											<action>
+												<execute>
+													<runOnIncremental>false</runOnIncremental>
+													<runOnConfiguration>true</runOnConfiguration>
+												</execute>
+											</action>
+										</pluginExecution>
+										<pluginExecution>
+											<pluginExecutionFilter>
+												<groupId>org.jacoco</groupId>
+												<artifactId>jacoco-maven-plugin</artifactId>
+												<versionRange>[0.6,)
+												</versionRange>
+												<goals>
+													<goal>prepare-agent</goal>
+												</goals>
+											</pluginExecutionFilter>
+											<action>
+												<!-- m2e doesn't know what to do with jacoco, let's ignore it 
 													or annoying error markers appear see http://wiki.eclipse.org/M2E_plugin_execution_not_covered -->
-                                                <ignore/>
-                                            </action>
-                                        </pluginExecution>
-                                        <pluginExecution>
-                                            <pluginExecutionFilter>
-                                                <groupId>org.codehaus.mojo</groupId>
-                                                <artifactId>license-maven-plugin</artifactId>
-                                                <!-- 												<version>${report.license.version}</version> -->
-                                                <versionRange>[${report.license.version},)</versionRange> 
-                                                <goals>
-                                                    <goal>add-third-party</goal>
-                                                    <goal>update-project-license</goal>
-                                                    <goal>update-file-header</goal>
-                                                </goals>
-                                            </pluginExecutionFilter>
-                                            <action>
-                                                <execute>
-                                                    <ignore/>
-                                                </execute>
-                                            </action>
-                                        </pluginExecution>
-                                        <pluginExecution>
-                                            <pluginExecutionFilter>
-                                                <groupId>org.ops4j.pax.exam</groupId>
-                                                <artifactId>maven-paxexam-plugin</artifactId>
-                                                <versionRange>[1.2.4,)</versionRange>
-                                                <goals>
-                                                    <goal>
-                                                        generate-depends-file
-                                                    </goal>
-                                                </goals>
-                                            </pluginExecutionFilter>
-                                            <action>
-                                                <execute>
-                                                    <runOnIncremental>false</runOnIncremental>
-                                                    <runOnConfiguration>true</runOnConfiguration>
-                                                </execute>
-                                            </action>
-                                        </pluginExecution>
-                                    </pluginExecutions>
-                                </lifecycleMappingMetadata>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
+												<ignore />
+											</action>
+										</pluginExecution>
+										<pluginExecution>
+											<pluginExecutionFilter>
+												<groupId>org.codehaus.mojo</groupId>
+												<artifactId>license-maven-plugin</artifactId>
+												<!-- <version>${report.license.version}</version> -->
+												<versionRange>[${report.license.version},)</versionRange>
+												<goals>
+													<goal>add-third-party</goal>
+													<goal>update-project-license</goal>
+													<goal>update-file-header</goal>
+												</goals>
+											</pluginExecutionFilter>
+											<action>
+												<execute>
+													<ignore />
+												</execute>
+											</action>
+										</pluginExecution>
+										<pluginExecution>
+											<pluginExecutionFilter>
+												<groupId>org.ops4j.pax.exam</groupId>
+												<artifactId>maven-paxexam-plugin</artifactId>
+												<versionRange>[1.2.4,)</versionRange>
+												<goals>
+													<goal>
+														generate-depends-file
+													</goal>
+												</goals>
+											</pluginExecutionFilter>
+											<action>
+												<execute>
+													<runOnIncremental>false</runOnIncremental>
+													<runOnConfiguration>true</runOnConfiguration>
+												</execute>
+											</action>
+										</pluginExecution>
+									</pluginExecutions>
+								</lifecycleMappingMetadata>
+							</configuration>
+						</plugin>
+					</plugins>
+				</pluginManagement>
+			</build>
+		</profile>
 		<profile>
 			<!-- enables javadoc creation on bundle level -->
 			<id>javadoc-build-it-aggregated</id>
@@ -1079,23 +1131,26 @@
 									<goal>jar</goal>
 								</goals>
 								<configuration>
-									<!--<destDir>apidocs</destDir>-->
+									<!--<destDir>apidocs</destDir> -->
 									<overview>${basedir}/src/overview.html</overview>
 									<skip>${osbp.skip.javadoc}</skip>
 									<linksource>${osbp.javadoc.linksource}</linksource>
 									<header>Eclipse OSBP Api Documentation ${project.version}</header>
-									<footer>Loetz GmbH&amp;Co.KG - Heidelberg - Germany</footer>
+									<footer>Eclipse OSBP Project</footer>
 									<bottom><![CDATA[Copyright &#169; 2011,{currentYear} Loetz GmbH&amp;Co.KG (69115 Heidelberg, Germany), <a href="http://www.eclipse.org/osbp">Eclipse OSBP Project<a>]]></bottom>
-											<!--  Copyright &#169; {inceptionYear}&#x2013;{currentYear} {organizationName}. All rights reserved. -->
+									<!-- Copyright &#169; {inceptionYear}&#x2013;{currentYear} {organizationName}. 
+										All rights reserved. -->
 									<subpackages>org:net</subpackages>
 									<sourcetab>4</sourcetab>
 									<charset>UTF-8</charset>
 									<groups>
-										<group><title>OSBP</title><packages>org.eclipse.osbp.*</packages></group>
-										<group><title>OS.bee</title><packages>org.osbee.*:net.osbee.*</packages></group>
+										<group>
+											<title>OSBP</title>
+											<packages>org.eclipse.osbp.*</packages>
+										</group>
 									</groups>
-		                        	<additionalparam>${osbp.javadoc.additionalparam}</additionalparam>
-		                        	<!-- -Xdoclint:syntax leads to problems with generated code	 -->
+									<additionalparam>${osbp.javadoc.additionalparam}</additionalparam>
+									<!-- -Xdoclint:syntax leads to problems with generated code -->
 									<!-- switch on dependency-driven aggregation -->
 									<includeDependencySources>true</includeDependencySources>
 									<dependencySourceIncludes>
@@ -1135,10 +1190,10 @@
 											<directory>target/apidocs</directory>
 											<filtering>true</filtering>
 											<excludes>
-          										<exclude>README.txt</exclude>
-          										<exclude>javadoc.sh</exclude>
-          										<exclude>options</exclude>
-          									</excludes>
+												<exclude>README.txt</exclude>
+												<exclude>javadoc.sh</exclude>
+												<exclude>options</exclude>
+											</excludes>
 										</resource>
 									</resources>
 								</configuration>
@@ -1148,134 +1203,64 @@
 				</plugins>
 			</build>
 		</profile>
-    </profiles>
+	</profiles>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <stagingDirectory>${osbp.developer.home.site}</stagingDirectory>
-                    <siteDirectory>${project.basedir}/src/site</siteDirectory>
-                    <topSiteURL>${osbp.site.root.url}</topSiteURL>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-file</id>
-                        <goals>
-                            <goal>attach-descriptor</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>parse-version</id>
-                        <goals>
-                            <goal>parse-version</goal>
-                        </goals>
-                        <phase>validate</phase>
-                    </execution>
-                </executions>
-            </plugin>
-        
-            <!-- Version restrictions for bundles -->
-            <!-- These are applied by the Tycho P2 resolver -->
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>target-platform-configuration</artifactId>
-                <version>${tycho-version}</version>
-                <configuration>
-                    <filters>
-                        <filter>
-                            <type>eclipse-plugin</type>
-                            <id>org.eclipse.e4.core.services</id>
-                            <restrictTo>
-                                <versionRange>[1.2.0,2.0.0)</versionRange>
-                            </restrictTo>
-                        </filter>
-                        <filter>
-                            <type>eclipse-plugin</type>
-                            <id>org.eclipse.xtend.lib</id>
-                            <restrictTo>
-                                <versionRange>[2.7.3,2.8.0)</versionRange>
-                            </restrictTo>
-                        </filter>
-                        <filter>
-                            <type>eclipse-plugin</type>
-                            <id>org.eclipse.xtend.lib.macro</id>
-                            <restrictTo>
-                                <versionRange>[2.7.3,2.8.0)</versionRange>
-                            </restrictTo>
-                        </filter>
-                        <filter>
-                            <type>eclipse-plugin</type>
-                            <id>org.eclipse.xtext</id>
-                            <restrictTo>
-                                <versionRange>[2.7.3,2.8.0)</versionRange>
-                            </restrictTo>
-                        </filter>
-                        <filter>
-                            <type>eclipse-plugin</type>
-                            <id>org.eclipse.xtext.ecore</id>
-                            <restrictTo>
-                                <versionRange>[2.7.3,2.8.0)</versionRange>
-                            </restrictTo>
-                        </filter>
-                        <filter>
-                            <type>eclipse-plugin</type>
-                            <id>org.eclipse.xtext.generator</id>
-                            <restrictTo>
-                                <versionRange>[2.7.3,2.8.0)</versionRange>
-                            </restrictTo>
-                        </filter>
-                        <filter>
-                            <type>eclipse-plugin</type>
-                            <id>org.eclipse.xtext.util</id>
-                            <restrictTo>
-                                <versionRange>[2.7.3,2.8.0)</versionRange>
-                            </restrictTo>
-                        </filter>
-                        <filter>
-                            <type>eclipse-plugin</type>
-                            <id>org.eclipse.xtext.xtext.generator</id>
-                            <restrictTo>
-                                <versionRange>[2.7.3,2.8.0)</versionRange>
-                            </restrictTo>
-                        </filter>
-                        <filter>
-                            <type>eclipse-plugin</type>
-                            <id>org.eclipse.xtext.smap</id>
-                            <restrictTo>
-                                <versionRange>[2.7.3,2.8.0)</versionRange>
-                            </restrictTo>
-                        </filter>
-                        <filter>
-                            <type>eclipse-plugin</type>
-                            <id>org.eclipse.xtext.xbase.lib</id>
-                            <restrictTo>
-                                <versionRange>[2.7.3,2.8.0)</versionRange>
-                            </restrictTo>
-                        </filter>
-                    </filters>
-                </configuration>
-            </plugin>
-        
-            <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>revision</goal>
-                        </goals>
-                   </execution>
-               </executions>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<inherited>false</inherited>
+				<configuration>
+					<stagingDirectory>${osbp.developer.home.site}</stagingDirectory>
+					<siteDirectory>${project.basedir}/src/site</siteDirectory>
+					<topSiteURL>${osbp.site.root.url}</topSiteURL>
+				</configuration>
+				<executions>
+					<execution>
+						<id>attach-file</id>
+						<goals>
+							<goal>attach-descriptor</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>parse-version</id>
+						<goals>
+							<goal>parse-version</goal>
+						</goals>
+						<phase>validate</phase>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- Version restrictions for bundles -->
+			<!-- These are applied by the Tycho P2 resolver -->
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<filters>
+					</filters>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>pl.project13.maven</groupId>
+				<artifactId>git-commit-id-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>revision</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 		<pluginManagement>
@@ -1324,7 +1309,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.8</version>
+					<version>1.8</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -1347,7 +1332,7 @@
 					<configuration>
 						<skip>${osbp.skip.javadoc}</skip>
 						<failOnError>${osbp.javadoc.failOnError}</failOnError>
-                       	<additionalparam>${osbp.javadoc.additionalparam}</additionalparam>
+						<additionalparam>${osbp.javadoc.additionalparam}</additionalparam>
 						<tags>
 							<tag>
 								<name>generated</name>
@@ -1375,36 +1360,36 @@
 								<name>Immutable</name>
 								<placement>a</placement>
 							</tag>
-                           	<tag>
-                           		<name>noimplement</name>
-                           		<placement>a</placement>
+							<tag>
+								<name>noimplement</name>
+								<placement>a</placement>
 								<head>This interface should not be implemented.</head>
-                           	</tag>
-                           	<tag>
-                           		<name>noextend</name>
-                           		<placement>a</placement>
-                           	</tag>
-                           	<tag>
-                           		<name>noinstantiate</name>
-                           		<placement>a</placement>
-                           	</tag>
-                           	<tag>
-                           		<name>nooverride</name>
-                           		<placement>a</placement>
-                           	</tag>
-                           	<tag>
-                           		<name>noreference</name>
-                           		<placement>a</placement>
-                           	</tag>
-                           	<tag>
-                           		<name>NoImplementByClients</name>
-                           		<placement>a</placement>
+							</tag>
+							<tag>
+								<name>noextend</name>
+								<placement>a</placement>
+							</tag>
+							<tag>
+								<name>noinstantiate</name>
+								<placement>a</placement>
+							</tag>
+							<tag>
+								<name>nooverride</name>
+								<placement>a</placement>
+							</tag>
+							<tag>
+								<name>noreference</name>
+								<placement>a</placement>
+							</tag>
+							<tag>
+								<name>NoImplementByClients</name>
+								<placement>a</placement>
 								<head>This interface should not be implemented by clients.</head>
-                           	</tag>
-                           	<tag>
-                           		<name>Scope</name>
-                           		<placement>a</placement>
-                           	</tag>
+							</tag>
+							<tag>
+								<name>Scope</name>
+								<placement>a</placement>
+							</tag>
 						</tags>
 					</configuration>
 				</plugin>
@@ -1501,7 +1486,8 @@
 						<goals>deploy site-deploy</goals>
 						<preparationGoals>clean install</preparationGoals>
 						<arguments>
-							-Dosbp.build.release -Dosbp.build.full -Dosbp.build.itests.run
+							-Dosbp.build.release -Dosbp.build.full
+							-Dosbp.build.itests.run
 						</arguments>
 						<localCheckout>true</localCheckout>
 						<tagNameFormat>v@{project.version}</tagNameFormat>
@@ -1547,54 +1533,53 @@
 					<version>1.9</version>
 				</plugin>
 				<plugin>
-	                <groupId>pl.project13.maven</groupId>
-	                <artifactId>git-commit-id-plugin</artifactId>
-	                <version>2.2.0</version>
-	                <executions>
-	                    <execution>
-	                        <goals>
-	                            <goal>revision</goal>
-	                         </goals>
-	                    </execution>
-	                </executions>
-		                <configuration>
-		                    <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
-		                    <prefix>git</prefix>
-		                    <dateFormat>dd.MM.yyyy '@' HH:mm:ss z</dateFormat>
-		                    <dateFormatTimeZone>${user.timezone}</dateFormatTimeZone>
-		                    <verbose>false</verbose>
-		                    <generateGitPropertiesFile>true</generateGitPropertiesFile>
-<!-- 	                    <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>  -->
-		                    <generateGitPropertiesFilename>${project.basedir}/META-INF/git.properties</generateGitPropertiesFilename>
-		                    <format>properties</format>
-		                    <skipPoms>true</skipPoms>
-		                    <injectAllReactorProjects>false</injectAllReactorProjects>
-		                    <failOnNoGitDirectory>true</failOnNoGitDirectory>
-		                    <failOnUnableToExtractRepoInfo>true</failOnUnableToExtractRepoInfo>
-		                    <skip>false</skip>
-		                    <runOnlyOnce>false</runOnlyOnce>
-		                    <excludeProperties>
-		                      <excludeProperty>git.build.*</excludeProperty>
-		                      <excludeProperty>git.commit.user.*</excludeProperty>
-		                      <!-- excludeProperty>git.remote.*</excludeProperty -->
-		                      <excludeProperty>git.dirty</excludeProperty>
-		                    </excludeProperties>
-		                    <includeOnlyProperties>
-		                      <!-- <includeOnlyProperty>^git.commit.id.full$</includeOnlyProperty> -->
-		                    </includeOnlyProperties>
-		                    <useNativeGit>false</useNativeGit>
-		                    <abbrevLength>7</abbrevLength>
-		                    <commitIdGenerationMode>flat</commitIdGenerationMode>
-		                    <gitDescribe>
-		                        <skip>false</skip>
-		                        <always>false</always>
-		                        <abbrev>7</abbrev>
-		                        <!-- dirty>-dirty</dirty -->
-		                        <dirty/>
-		                        <match>*</match>
-		                        <forceLongFormat>false</forceLongFormat>
-		                    </gitDescribe>
-		                </configuration>
+					<groupId>pl.project13.maven</groupId>
+					<artifactId>git-commit-id-plugin</artifactId>
+					<version>2.2.0</version>
+					<executions>
+						<execution>
+							<goals>
+								<goal>revision</goal>
+							</goals>
+						</execution>
+					</executions>
+					<configuration>
+						<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+						<prefix>git</prefix>
+						<dateFormat>dd.MM.yyyy '@' HH:mm:ss z</dateFormat>
+						<dateFormatTimeZone>${user.timezone}</dateFormatTimeZone>
+						<verbose>false</verbose>
+						<generateGitPropertiesFile>true</generateGitPropertiesFile>
+						<!-- <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename> -->
+						<generateGitPropertiesFilename>${project.basedir}/META-INF/git.properties</generateGitPropertiesFilename>
+						<format>properties</format>
+						<skipPoms>true</skipPoms>
+						<injectAllReactorProjects>false</injectAllReactorProjects>
+						<failOnNoGitDirectory>true</failOnNoGitDirectory>
+						<failOnUnableToExtractRepoInfo>true</failOnUnableToExtractRepoInfo>
+						<skip>false</skip>
+						<runOnlyOnce>false</runOnlyOnce>
+						<excludeProperties>
+							<excludeProperty>git.build.*</excludeProperty>
+							<excludeProperty>git.commit.user.*</excludeProperty>
+							<!-- excludeProperty>git.remote.*</excludeProperty -->
+							<excludeProperty>git.dirty</excludeProperty>
+						</excludeProperties>
+						<includeOnlyProperties>
+						</includeOnlyProperties>
+						<useNativeGit>false</useNativeGit>
+						<abbrevLength>7</abbrevLength>
+						<commitIdGenerationMode>flat</commitIdGenerationMode>
+						<gitDescribe>
+							<skip>false</skip>
+							<always>false</always>
+							<abbrev>7</abbrev>
+							<!-- dirty>-dirty</dirty -->
+							<dirty />
+							<match>*</match>
+							<forceLongFormat>false</forceLongFormat>
+						</gitDescribe>
+					</configuration>
 				</plugin>
 			</plugins>
 		</pluginManagement>