add javax.annotation 1.2
diff --git a/org.eclipse.osbp.dependencies.feature.javax.annotation/.project b/org.eclipse.osbp.dependencies.feature.javax.annotation/.project
new file mode 100644
index 0000000..cbc94f9
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.javax.annotation/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.osbp.dependencies.feature.javax.annotation</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.sonarlint.eclipse.core.sonarlintBuilder</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>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.osbp.dependencies.feature.javax.annotation/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.dependencies.feature.javax.annotation/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.javax.annotation/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.dependencies.feature.javax.annotation/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.dependencies.feature.javax.annotation/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.javax.annotation/.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.dependencies.feature.javax.annotation/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.dependencies.feature.javax.annotation/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.javax.annotation/.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.dependencies.feature.javax.annotation/LICENSE-CDDL.html b/org.eclipse.osbp.dependencies.feature.javax.annotation/LICENSE-CDDL.html
new file mode 100644
index 0000000..7120ec0
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.javax.annotation/LICENSE-CDDL.html
@@ -0,0 +1,98 @@
+<!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>Untitled Document</title>
+</head>
+
+<body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<!--  		@page { margin: 0.79in }  		P { margin-bottom: 0.08in }  		H1 { margin-top: 0in; margin-bottom: 0.17in; widows: 0; orphans: 0 }  		H1.western { font-family: "Times New Roman", serif; font-size: 12pt; font-weight: normal }  		H1.cjk { font-family: "Andale Sans UI"; font-size: 12pt; font-weight: normal }  		H1.ctl { font-family: "Tahoma"; font-size: 12pt; font-weight: normal }  	-->
+<BODY DIR="LTR">
+<p><strong>COMMON  DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1</strong></p>
+<p>1.  Definitions.</p>
+<blockquote>1.1.  &ldquo;Contributor&rdquo; means each individual or entity that creates or  contributes to the creation of Modifications.</blockquote>
+<blockquote>1.2.  &ldquo;Contributor Version&rdquo; means the combination of the Original  Software, prior Modifications used by a Contributor (if any), and the  Modifications made by that particular Contributor.</blockquote>
+<blockquote>1.3.  &ldquo;Covered Software&rdquo; means (a) the Original Software, or (b)  Modifications, or (c) the combination of files containing Original  Software with files containing Modifications, in each case including  portions thereof.</blockquote>
+<blockquote>1.4.  &ldquo;Executable&rdquo; means the Covered Software in any form other than  Source Code.</blockquote>
+<blockquote>1.5.  &ldquo;Initial Developer&rdquo; means the individual or entity that first  makes Original Software available under this License.</blockquote>
+<blockquote>1.6.  &ldquo;Larger Work&rdquo; means a work which combines Covered Software or  portions thereof with code not governed by the terms of this License.</blockquote>
+<blockquote>1.7.  &ldquo;License&rdquo; means this document.</blockquote>
+<blockquote>1.8.  &ldquo;Licensable&rdquo; means having the right to grant, to the maximum  extent possible, whether at the time of the initial grant or  subsequently acquired, any and all of the rights conveyed herein.</blockquote>
+<blockquote>1.9.  &ldquo;Modifications&rdquo; means the Source Code and Executable form of any  of the following:</blockquote>
+<blockquote>A.  Any file that results from an addition to, deletion from or  modification of the contents of a file containing Original Software  or previous Modifications;</blockquote>
+<blockquote>B.  Any new file that contains any part of the Original Software or  previous Modification; or</blockquote>
+<blockquote>C.  Any new file that is contributed or otherwise made available under  the terms of this License.</blockquote>
+<blockquote>1.10.  &ldquo;Original Software&rdquo; means the Source Code and Executable form of  computer software code that is originally released under this  License.</blockquote>
+<blockquote>1.11.  &ldquo;Patent Claims&rdquo; means any patent claim(s), now owned or hereafter  acquired, including without limitation, method, process, and  apparatus claims, in any patent Licensable by grantor.</blockquote>
+<blockquote>1.12.  &ldquo;Source Code&rdquo; means (a) the common form of computer software code  in which modifications are made and (b) associated documentation  included in or with such code.</blockquote>
+<blockquote>1.13.  &ldquo;You&rdquo; (or &ldquo;Your&rdquo;) means an individual or a legal entity  exercising rights under, and complying with all of the terms of, this  License. For legal entities, &ldquo;You&rdquo; includes any entity which  controls, is controlled by, or is under common control with You. For  purposes of this definition, &ldquo;control&rdquo; means (a) the power,  direct or indirect, to cause the direction or management of such  entity, whether by contract or otherwise, or (b) ownership of more  than fifty percent (50%) of the outstanding shares or beneficial  ownership of such entity.</blockquote>
+<p>2.  License Grants.</p>
+<blockquote>2.1.  The Initial Developer Grant.</blockquote>
+<blockquote>Conditioned  upon Your compliance with Section 3.1 below and subject to third  party intellectual property claims, the Initial Developer hereby  grants You a world-wide, royalty-free, non-exclusive license:</blockquote>
+<blockquote>(a)  under intellectual property rights (other than patent or trademark)  Licensable by Initial Developer, to use, reproduce, modify, display,  perform, sublicense and distribute the Original Software (or portions  thereof), with or without Modifications, and/or as part of a Larger  Work; and</blockquote>
+<blockquote>(b)  under Patent Claims infringed by the making, using or selling of  Original Software, to make, have made, use, practice, sell, and offer  for sale, and/or otherwise dispose of the Original Software (or  portions thereof).</blockquote>
+<blockquote>(c)  The licenses granted in Sections 2.1(a) and (b) are effective on the  date Initial Developer first distributes or otherwise makes the  Original Software available to a third party under the terms of this  License.</blockquote>
+<blockquote>(d)  Notwithstanding Section 2.1(b) above, no patent license is granted:  (1) for code that You delete from the Original Software, or (2) for  infringements caused by: (i) the modification of the Original  Software, or (ii) the combination of the Original Software with other  software or devices.</blockquote>
+<blockquote>2.2.  Contributor Grant.</blockquote>
+<blockquote>Conditioned  upon Your compliance with Section 3.1 below and subject to third  party intellectual property claims, each Contributor hereby grants  You a world-wide, royalty-free, non-exclusive license:</blockquote>
+<blockquote>(a)  under intellectual property rights (other than patent or trademark)  Licensable by Contributor to use, reproduce, modify, display,  perform, sublicense and distribute the Modifications created by such  Contributor (or portions thereof), either on an unmodified basis,  with other Modifications, as Covered Software and/or as part of a  Larger Work; and</blockquote>
+<blockquote>(b)  under Patent Claims infringed by the making, using, or selling of  Modifications made by that Contributor either alone and/or in  combination with its Contributor Version (or portions of such  combination), to make, use, sell, offer for sale, have made, and/or  otherwise dispose of: (1) Modifications made by that Contributor (or  portions thereof); and (2) the combination of Modifications made by  that Contributor with its Contributor Version (or portions of such  combination).</blockquote>
+<blockquote>(c)  The licenses granted in Sections 2.2(a) and 2.2(b) are effective on  the date Contributor first distributes or otherwise makes the  Modifications available to a third party.</blockquote>
+<blockquote>(d)  Notwithstanding Section 2.2(b) above, no patent license is granted:  (1) for any code that Contributor has deleted from the Contributor  Version; (2) for infringements caused by: (i) third party  modifications of Contributor Version, or (ii) the combination of  Modifications made by that Contributor with other software (except as  part of the Contributor Version) or other devices; or (3) under  Patent Claims infringed by Covered Software in the absence of  Modifications made by that Contributor.</blockquote>
+<p>3.  Distribution Obligations.</p>
+<blockquote>3.1.  Availability of Source Code.</blockquote>
+<blockquote>Any  Covered Software that You distribute or otherwise make available in  Executable form must also be made available in Source Code form and  that Source Code form must be distributed only under the terms of  this License. You must include a copy of this License with every copy  of the Source Code form of the Covered Software You distribute or  otherwise make available. You must inform recipients of any such  Covered Software in Executable form as to how they can obtain such  Covered Software in Source Code form in a reasonable manner on or  through a medium customarily used for software exchange.</blockquote>
+<blockquote>3.2.  Modifications.</blockquote>
+<blockquote>The  Modifications that You create or to which You contribute are governed  by the terms of this License. You represent that You believe Your  Modifications are Your original creation(s) and/or You have  sufficient rights to grant the rights conveyed by this License.</blockquote>
+<blockquote>3.3.  Required Notices.</blockquote>
+<blockquote>You  must include a notice in each of Your Modifications that identifies  You as the Contributor of the Modification. You may not remove or  alter any copyright, patent or trademark notices contained within the  Covered Software, or any notices of licensing or any descriptive text  giving attribution to any Contributor or the Initial Developer.</blockquote>
+<blockquote>3.4.  Application of Additional Terms.</blockquote>
+<blockquote>You  may not offer or impose any terms on any Covered Software in Source  Code form that alters or restricts the applicable version of this  License or the recipients' rights hereunder. You may choose to offer,  and to charge a fee for, warranty, support, indemnity or liability  obligations to one or more recipients of Covered Software. However,  you may do so only on Your own behalf, and not on behalf of the  Initial Developer or any Contributor. You must make it absolutely  clear that any such warranty, support, indemnity or liability  obligation is offered by You alone, and You hereby agree to indemnify  the Initial Developer and every Contributor for any liability  incurred by the Initial Developer or such Contributor as a result of  warranty, support, indemnity or liability terms You offer.</blockquote>
+<blockquote>3.5.  Distribution of Executable Versions.</blockquote>
+<blockquote>You  may distribute the Executable form of the Covered Software under the  terms of this License or under the terms of a license of Your choice,  which may contain terms different from this License, provided that  You are in compliance with the terms of this License and that the  license for the Executable form does not attempt to limit or alter  the recipient's rights in the Source Code form from the rights set  forth in this License. If You distribute the Covered Software in  Executable form under a different license, You must make it  absolutely clear that any terms which differ from this License are  offered by You alone, not by the Initial Developer or Contributor.  You hereby agree to indemnify the Initial Developer and every  Contributor for any liability incurred by the Initial Developer or  such Contributor as a result of any such terms You offer.</blockquote>
+<blockquote>3.6.  Larger Works.</blockquote>
+<blockquote>You  may create a Larger Work by combining Covered Software with other  code not governed by the terms of this License and distribute the  Larger Work as a single product. In such a case, You must make sure  the requirements of this License are fulfilled for the Covered  Software.</blockquote>
+<p>4.  Versions of the License.</p>
+<blockquote>4.1.  New Versions.</blockquote>
+<blockquote>Oracle  is the initial license steward and may publish revised and/or new versions of  this License from time to time. Each version will be given a  distinguishing version number. Except as provided in Section 4.3, no  one other than the license steward has the right to modify this  License.</blockquote>
+<blockquote>4.2.  Effect of New Versions.</blockquote>
+<blockquote>You  may always continue to use, distribute or otherwise make the Covered  Software available under the terms of the version of the License  under which You originally received the Covered Software. If the  Initial Developer includes a notice in the Original Software  prohibiting it from being distributed or otherwise made available  under any subsequent version of the License, You must distribute and  make the Covered Software available under the terms of the version of  the License under which You originally received the Covered Software.  Otherwise, You may also choose to use, distribute or otherwise make  the Covered Software available under the terms of any subsequent  version of the License published by the license steward.</blockquote>
+<blockquote>4.3.  Modified Versions.</blockquote>
+<blockquote>When  You are an Initial Developer and You want to create a new license for  Your Original Software, You may create and use a modified version of  this License if You: (a) rename the license and remove any references  to the name of the license steward (except to note that the license  differs from this License); and (b) otherwise make it clear that the  license contains terms which differ from this License.</blockquote>
+<p>5.  DISCLAIMER OF WARRANTY.</p>
+<blockquote>
+  <p>COVERED  SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN &ldquo;AS IS&rdquo; BASIS,  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,  WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF  DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR  NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF  THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE  DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER  CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR  CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART  OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED  HEREUNDER EXCEPT UNDER THIS DISCLAIMER.</p>
+</blockquote>
+<p>6.  TERMINATION.</p>
+<blockquote>6.1.  This License and the rights granted hereunder will terminate  automatically if You fail to comply with terms herein and fail to  cure such breach within 30 days of becoming aware of the breach.  Provisions which, by their nature, must remain in effect beyond the  termination of this License shall survive.</blockquote>
+<blockquote>6.2.  If You assert a patent infringement claim (excluding declaratory  judgment actions) against Initial Developer or a Contributor (the  Initial Developer or Contributor against whom You assert such claim  is referred to as &ldquo;Participant&rdquo;) alleging that the Participant  Software (meaning the Contributor Version where the Participant is a  Contributor or the Original Software where the Participant is the  Initial Developer) directly or indirectly infringes any patent, then  any and all rights granted directly or indirectly to You by such  Participant, the Initial Developer (if the Initial Developer is not  the Participant) and all Contributors under Sections 2.1 and/or 2.2  of this License shall, upon 60 days notice from Participant terminate  prospectively and automatically at the expiration of such 60 day  notice period, unless if within such 60 day period You withdraw Your  claim with respect to the Participant Software against such  Participant either unilaterally or pursuant to a written agreement  with Participant.</blockquote>
+<blockquote>6.3.  If You assert a patent infringement claim against Participant  alleging that the Participant Software directly or indirectly  infringes any patent where such claim is resolved (such as by license  or settlement) prior to the initiation of patent infringement  litigation, then the reasonable value of the licenses granted by such  Participant under Sections 2.1 or 2.2 shall be taken into account in  determining the amount or value of any payment or license.</blockquote>
+<blockquote>6.4.  In the event of termination under Sections 6.1 or 6.2 above, all end  user licenses that have been validly granted by You or any  distributor hereunder prior to termination (excluding licenses  granted to You by any distributor) shall survive termination.</blockquote>
+<p>7.  LIMITATION OF LIABILITY.</p>
+<blockquote>
+  <p>UNDER  NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING  NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL  DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED  SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY  PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL  DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR  LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR  ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY  SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS  LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR  PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT  APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT  ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL  DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.</p>
+</blockquote>
+<p>8.  U.S. GOVERNMENT END USERS.</p>
+<blockquote>
+  <p>The  Covered Software is a &ldquo;commercial item,&rdquo; as that term is defined  in 48 C.F.R. 2.101 (Oct. 1995), consisting of &ldquo;commercial computer  software&rdquo; (as that term is defined at 48 C.F.R. &sect;  252.227-7014(a)(1)) and &ldquo;commercial computer software  documentation&rdquo; as such terms are used in 48 C.F.R. 12.212 (Sept.  1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1  through 227.7202-4 (June 1995), all U.S. Government End Users acquire  Covered Software with only those rights set forth herein. This U.S.  Government Rights clause is in lieu of, and supersedes, any other  FAR, DFAR, or other clause or provision that addresses Government  rights in computer software under this License.</p>
+</blockquote>
+<p>9.  MISCELLANEOUS.</p>
+<blockquote>
+  <p>This  License represents the complete agreement concerning subject matter  hereof. If any provision of this License is held to be unenforceable,  such provision shall be reformed only to the extent necessary to make  it enforceable. This License shall be governed by the law of the  jurisdiction specified in a notice contained within the Original  Software (except to the extent applicable law, if any, provides  otherwise), excluding such jurisdiction's conflict-of-law provisions.  Any litigation relating to this License shall be subject to the  jurisdiction of the courts located in the jurisdiction and venue  specified in a notice contained within the Original Software, with  the losing party responsible for costs, including, without  limitation, court costs and reasonable attorneys' fees and expenses.  The application of the United Nations Convention on Contracts for the  International Sale of Goods is expressly excluded. Any law or  regulation which provides that the language of a contract shall be  construed against the drafter shall not apply to this License. You  agree that You alone are responsible for compliance with the United  States export administration regulations (and the export control laws  and regulation of any other countries) when You use, distribute or  otherwise make available any Covered Software.</p>
+</blockquote>
+<p>10.  RESPONSIBILITY FOR CLAIMS.</p>
+<blockquote>
+  <p>As  between Initial Developer and the Contributors, each party is  responsible for claims and damages arising, directly or indirectly,  out of its utilization of rights under this License and You agree to  work with Initial Developer and Contributors to distribute such  responsibility on an equitable basis. Nothing herein is intended or  shall be deemed to constitute any admission of liability.</p>
+</blockquote>
+<hr />
+<p>NOTICE  PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION  LICENSE (CDDL)</p>
+<p>The  code released under the CDDL shall be governed by the laws of the  State of California (excluding conflict-of-law provisions). Any  litigation relating to this License shall be subject to the  jurisdiction of the Federal Courts of the Northern District of  California and the state courts of the State of California, with  venue lying in Santa Clara County, California. </p>
+<p><br />
+    <br />
+</p>
+</p><br />
+</p>
+</body>
+</html>
diff --git a/org.eclipse.osbp.dependencies.feature.javax.annotation/LICENSE.txt b/org.eclipse.osbp.dependencies.feature.javax.annotation/LICENSE.txt
new file mode 100644
index 0000000..ff42ad4
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.javax.annotation/LICENSE.txt
@@ -0,0 +1,161 @@
+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.dependencies.feature.javax.annotation/build.properties b/org.eclipse.osbp.dependencies.feature.javax.annotation/build.properties
new file mode 100644
index 0000000..a5fdc64
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.javax.annotation/build.properties
@@ -0,0 +1,6 @@
+bin.includes = license.html,\
+				epl-v10.html,\
+				feature.xml,\
+				LICENSE-CDDL.html,\
+				LICENSE.txt,\
+                feature.properties
diff --git a/org.eclipse.osbp.dependencies.feature.javax.annotation/epl-v10.html b/org.eclipse.osbp.dependencies.feature.javax.annotation/epl-v10.html
new file mode 100644
index 0000000..b398acc
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.javax.annotation/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.dependencies.feature.javax.annotation/feature.properties b/org.eclipse.osbp.dependencies.feature.javax.annotation/feature.properties
new file mode 100644
index 0000000..5cf5f0c
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.javax.annotation/feature.properties
@@ -0,0 +1,172 @@
+###############################################################################
+# Copyright (c) 2011, 2016 - 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:
+#     Christophe Loetz (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
+featureName =OSBP dependencies: Feature for Javax Annotation 
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse OSBP
+
+# "description" property - description of the feature
+description=This feature provides the javax.annotation bundles.
+
+# "updateSiteName" property - label for the update site
+updateSiteName=
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) \n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+This feature contains software under the following licenses:\n\
+   * CDDL - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1\n\
+\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\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+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\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following 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 the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at 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\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information 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 Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
diff --git a/org.eclipse.osbp.dependencies.feature.javax.annotation/feature.xml b/org.eclipse.osbp.dependencies.feature.javax.annotation/feature.xml
new file mode 100644
index 0000000..db7370f
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.javax.annotation/feature.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--#======================================================================= -->
+<!--# Copyright (c) 2011, 2016 - 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: -->
+<!--#     Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation -->
+<!--#======================================================================= -->
+
+<feature
+      id="org.eclipse.osbp.dependencies.feature.javax.annotation"
+      label="%featureName"
+      version="1.2.0.qualifier"
+      provider-name="%providerName">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="javax.annotation"
+         download-size="0"
+         install-size="0"
+         version="1.2.0.v201602091430"/>
+
+</feature>
diff --git a/org.eclipse.osbp.dependencies.feature.javax.annotation/license.html b/org.eclipse.osbp.dependencies.feature.javax.annotation/license.html
new file mode 100644
index 0000000..6e579a5
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.javax.annotation/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.dependencies.feature.javax.annotation/pom.xml b/org.eclipse.osbp.dependencies.feature.javax.annotation/pom.xml
new file mode 100644
index 0000000..9f5f979
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.javax.annotation/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--#======================================================================= -->
+<!--# Copyright (c) 2011, 2016 - 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: -->
+<!--# Christophe Loetz (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.dependencies</groupId>
+        <artifactId>org.eclipse.osbp.dependencies</artifactId>
+        <version>0.9.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <artifactId>org.eclipse.osbp.dependencies.feature.javax.annotation</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+    <packaging>eclipse-feature</packaging>
+
+    <repositories>
+    </repositories>
+
+    <dependencies>
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16127 -->
+		<!-- artifactId: javax.annotation -->
+		<!-- version: 1.2.0.v201602091430 -->
+    </dependencies>
+
+    <build>
+        <plugins>
+            <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>
+        </plugins>
+    </build>
+
+</project>
diff --git a/org.eclipse.osbp.dependencies.feature.jetty/feature.xml b/org.eclipse.osbp.dependencies.feature.jetty/feature.xml
index cc49022..15e8eaf 100644
--- a/org.eclipse.osbp.dependencies.feature.jetty/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.jetty/feature.xml
@@ -19,6 +19,10 @@
       %license
    </license>
 
+   <includes
+         id="org.eclipse.osbp.dependencies.feature.javax.annotation"
+         version="0.0.0"/>
+
    <plugin
          id="org.eclipse.jetty.continuation"
          download-size="0"
diff --git a/org.eclipse.osbp.dependencies.feature.jetty/pom.xml b/org.eclipse.osbp.dependencies.feature.jetty/pom.xml
index 82517c1..902a2e8 100644
--- a/org.eclipse.osbp.dependencies.feature.jetty/pom.xml
+++ b/org.eclipse.osbp.dependencies.feature.jetty/pom.xml
@@ -25,6 +25,14 @@
 
 	<dependencies>
 		<!-- CQ: not needed. All bundles are Eclipse bundles -->
+		<dependency>
+			<groupId>org.eclipse.osbp.dependencies</groupId>
+			<artifactId>
+				org.eclipse.osbp.dependencies.feature.javax.annotation
+			</artifactId>
+			<version>1.2.0-SNAPSHOT</version>
+			<type>eclipse-feature</type>
+		</dependency>
 	</dependencies>
 
 	<repositories>
@@ -53,6 +61,7 @@
 				<configuration>
 					<labelSuffix> (source)</labelSuffix>
 					<excludes>
+						<feature id="org.eclipse.osbp.dependencies.feature.javax.annotation" />
 						<plugin id="org.eclipse.jetty.continuation.source" />
 						<plugin id="org.eclipse.jetty.http.source" />
 						<plugin id="org.eclipse.jetty.io.source" />
diff --git a/pom.xml b/pom.xml
index 66aa19e..6ec2234 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,7 @@
 		<module>org.eclipse.osbp.dependencies.feature.equinox</module>
 		<module>org.eclipse.osbp.dependencies.feature.gemini.naming</module>
 		<module>org.eclipse.osbp.dependencies.feature.h2</module>
+		<module>org.eclipse.osbp.dependencies.feature.javax.annotation</module>
 		<module>org.eclipse.osbp.dependencies.feature.javax.transaction</module>
 		<module>org.eclipse.osbp.dependencies.feature.jetty</module>
 		<module>org.eclipse.osbp.dependencies.feature.joda</module>