CONTRIBUTING

-Contributing to Equinox
-=======================
+# Contributing to Eclipse Equinox
 
 Thanks for your interest in this project.
 
-Project description:
---------------------
+## Project description
 
-Equinox is an implementation of the OSGi R5 core framework specification, a set of bundles that implement various optional OSGi services and other infrastructure for running OSGi-based systems.
+Eclipse Equinox is an implementation of the OSGi R6 core framework
+specification, a set of bundles that implement various optional OSGi services
+and other infrastructure for running OSGi-based systems.
 
-- https://projects.eclipse.org/projects/rt.equinox
+* https://projects.eclipse.org/projects/eclipse.equinox
 
-Developer resources:
---------------------
+## Developer resources
 
-Information regarding source code management, builds, coding standards, and more.
+Information regarding source code management, builds, coding standards, and
+more.
 
-- https://projects.eclipse.org/projects/rt.equinox/developer
+* https://projects.eclipse.org/projects/eclipse.equinox/developer
 
-Contributor License Agreement:
-------------------------------
+The project maintains the following source code repositories
 
-Before your contribution can be accepted by the project, you need to create and electronically sign the Eclipse Foundation Contributor License Agreement (ECA).
+* http://git.eclipse.org/c/equinox/rt.equinox.binaries.git
+* http://git.eclipse.org/c/equinox/rt.equinox.bundles.git
+* http://git.eclipse.org/c/equinox/rt.equinox.framework.git
+* http://git.eclipse.org/c/equinox/rt.equinox.p2.git
 
-- http://www.eclipse.org/legal/ECA.php
+This project uses Bugzilla to track ongoing development and issues.
 
-Contact:
---------
+* Search for issues: https://eclipse.org/bugs/buglist.cgi?product=Equinox
+* Create a new report: https://eclipse.org/bugs/enter_bug.cgi?product=Equinox
 
-Contact the project developers via the project's "dev" list.
+Be sure to search for existing bugs before you create another one. Remember that
+contributions are always welcome!
 
-- https://dev.eclipse.org/mailman/listinfo/equinox-dev
+## Eclipse Contributor Agreement
 
-Search for bugs:
-----------------
+Before your contribution can be accepted by the project team contributors must
+electronically sign the Eclipse Contributor Agreement (ECA).
 
-This project uses Bugzilla to track ongoing development and issues.
+* http://www.eclipse.org/legal/ECA.php
 
-- https://bugs.eclipse.org/bugs/buglist.cgi?product=Equinox
+Commits that are provided by non-committers must have a Signed-off-by field in
+the footer indicating that the author is aware of the terms by which the
+contribution has been provided to the project. The non-committer must
+additionally have an Eclipse Foundation account and must have a signed Eclipse
+Contributor Agreement (ECA) on file.
 
-Create a new bug:
------------------
+For more information, please see the Eclipse Committer Handbook:
+https://www.eclipse.org/projects/handbook/#resources-commit
 
-Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome!
+## Contact
+
+Contact the project developers via the project's "dev" list.
 
-- https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Equinox
+* https://dev.eclipse.org/mailman/listinfo/equinox-dev
\ No newline at end of file

LICENSE

+Eclipse Public License - v 2.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 content
+     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 changes or additions to the Program that
+  are not Modified Works.
+
+"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
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
+
+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.
+
+  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 or other 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.
+
+  e) Notwithstanding the terms of any Secondary License, no
+  Contributor makes additional grants to any Recipient (other than
+  those set forth in this Agreement) as a result of such Recipient's
+  receipt of the Program under the terms of a Secondary License
+  (if permitted under the terms of Section 3).
+
+3. REQUIREMENTS
+
+3.1 If a Contributor Distributes the Program in any form, then:
+
+  a) the Program must also be made available as Source Code, in
+  accordance with section 3.2, and the Contributor must accompany
+  the Program with a statement that the Source Code for the Program
+  is available under this Agreement, and informs Recipients how to
+  obtain it in a reasonable manner on or through a medium customarily
+  used for software exchange; and
+
+  b) the Contributor may Distribute the Program under a license
+  different than this Agreement, provided that such license:
+     i) effectively disclaims on behalf of all other 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 other Contributors all
+     liability for damages, including direct, indirect, special,
+     incidental and consequential damages, such as lost profits;
+
+     iii) does not attempt to limit or alter the recipients' rights
+     in the Source Code under section 3.2; and
+
+     iv) requires any subsequent distribution of the Program by any
+     party to be under a license that satisfies the requirements
+     of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+  a) it must be made available under this Agreement, or if the
+  Program (i) is combined with other material in a separate file or
+  files made available under a Secondary License, and (ii) the initial
+  Contributor attached to the Source Code the notice described in
+  Exhibit A of this Agreement, then the Program may be made available
+  under the terms of such Secondary Licenses, and
+
+  b) a copy of this Agreement must be included with each copy of
+  the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
+
+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, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, 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, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, 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. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+"This Source Code may also be made available under the following 
+Secondary Licenses when the conditions for such availability set forth 
+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+version(s), and exceptions or additional permissions here}."
+
+  Simply including a copy of this Agreement, including this Exhibit A
+  is not sufficient to license the Source Code under Secondary Licenses.
+
+  If it is not possible or desirable to put the notice in a particular
+  file, then You may include the notice in a location (such as a LICENSE
+  file in a relevant directory) where a recipient would be likely to
+  look for such a notice.
+
+  You may add additional accurate notices of copyright ownership.
\ No newline at end of file

NOTICE

+# Notices for Eclipse Equinox
+
+This content is produced and maintained by the Eclipse Equinox project.
+
+* Project home: https://projects.eclipse.org/projects/eclipse.equinox
+
+## Trademarks
+
+Eclipse Equinox, and Equinox are trademarks of the Eclipse Foundation.
+
+## Copyright
+
+All content is the property of the respective authors or their employers. For
+more information regarding authorship of content, please consult the listed
+source code repository logs.
+
+## Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Eclipse Public License v. 2.0 which is available at
+http://www.eclipse.org/legal/epl-2.0.
+
+SPDX-License-Identifier: EPL-2.0
+
+## Source Code
+
+The project maintains the following source code repositories:
+
+* http://git.eclipse.org/c/equinox/rt.equinox.binaries.git
+* http://git.eclipse.org/c/equinox/rt.equinox.bundles.git
+* http://git.eclipse.org/c/equinox/rt.equinox.framework.git
+* http://git.eclipse.org/c/equinox/rt.equinox.p2.git
\ No newline at end of file

bundles/archived/org.eclipse.equinox.console.ssh.tests/.settings/org.eclipse.jdt.core.prefs

-#Tue Oct 18 16:14:30 EEST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6

bundles/org.eclipse.equinox.app/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/OSGi%Minimum-1.2"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="osgi">
 		<attributes>

bundles/org.eclipse.equinox.app/.settings/org.eclipse.jdt.core.prefs

-#Tue Feb 24 16:30:45 CST 2009
 eclipse.preferences.version=1
 org.eclipse.jdt.core.builder.cleanOutputFolder=clean
 org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -7,17 +6,28 @@ org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
 org.eclipse.jdt.core.circularClasspath=error
 org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.3
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
 org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -26,7 +36,8 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
@@ -34,6 +45,7 @@ org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
@@ -41,7 +53,9 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
 org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
@@ -49,46 +63,71 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
 org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedImport=error
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
 org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.equinox.app; singleton:=true
-Bundle-Version: 1.3.600.qualifier
+Bundle-Version: 1.4.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.equinox.internal.app.Activator
 Bundle-Localization: plugin
@@ -30,7 +30,5 @@ DynamicImport-Package: org.osgi.service.event;version="1.0.0"
 Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.2,
- CDC-1.1/Foundation-1.1,
- J2SE-1.4
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Automatic-Module-Name: org.eclipse.equinox.app

bundles/org.eclipse.equinox.app/pom.xml

@@ -14,12 +14,12 @@
   <parent>
     <artifactId>rt.equinox.bundles</artifactId>
     <groupId>org.eclipse.equinox.bundles</groupId>
-    <version>4.9.0-SNAPSHOT</version>
+    <version>4.10.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.app</artifactId>
-  <version>1.3.600-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
@@ -29,7 +29,7 @@
         <version>${tycho.version}</version>
         <configuration>
           <compilerArgs>
-            <arg>-nowarn:[${project.basedir}/osgi]</arg>
+            <arg>-nowarn</arg>
           </compilerArgs>
         </configuration>
       </plugin>

bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/app/IApplication.java

 /*******************************************************************************
- * Copyright (c) 2005, 2011 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
  *
  *  This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License 2.0
@@ -30,12 +30,12 @@ public interface IApplication {
 	/**
 	 * Exit object indicating normal termination
 	 */
-	public static final Integer EXIT_OK = new Integer(0);
+	public static final Integer EXIT_OK = Integer.valueOf(0);
 
 	/**
 	 * Exit object requesting platform restart
 	 */
-	public static final Integer EXIT_RESTART = new Integer(23);
+	public static final Integer EXIT_RESTART = Integer.valueOf(23);
 
 	/**
 	 * Exit object requesting that the command passed back be executed.  Typically
@@ -43,7 +43,7 @@ public interface IApplication {
 	 * relaunched the command line will be retrieved from the 
 	 * {@link IApplicationContext#EXIT_DATA_PROPERTY eclipse.exitdata} system property.  
 	 */
-	public static final Integer EXIT_RELAUNCH = new Integer(24);
+	public static final Integer EXIT_RELAUNCH = Integer.valueOf(24);
 
 	/**
 	 * Starts this application with the given context and returns a result.  The content of 

bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/Activator.java

 /*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -42,6 +42,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 	private ServiceTracker registryTracker;
 	private IExtensionRegistry registry;
 
+	@Override
 	public void start(BundleContext bc) {
 		_context = bc;
 		// doing simple get service here because we expect the PackageAdmin service to always be available
@@ -65,6 +66,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 		}
 	}
 
+	@Override
 	public void stop(BundleContext bc) {
 		// stop the app commands for the console
 		try {
@@ -114,6 +116,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 			CommandLineArgs.processCommandLine(envInfo);
 	}
 
+	@Override
 	public Object addingService(ServiceReference reference) {
 		BundleContext context = _context;
 		if (context == null)
@@ -143,10 +146,12 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 		return null;
 	}
 
+	@Override
 	public void modifiedService(ServiceReference reference, Object service) {
 		// do nothing
 	}
 
+	@Override
 	public void removedService(ServiceReference reference, Object service) {
 		EclipseAppContainer currentContainer = null;
 		synchronized (this) {
@@ -169,6 +174,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 			tracker.open(allServices);
 		else
 			AccessController.doPrivileged(new PrivilegedAction() {
+				@Override
 				public Object run() {
 					tracker.open(allServices);
 					return null;
@@ -181,6 +187,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 		if (System.getSecurityManager() == null)
 			return tracker.getService();
 		return AccessController.doPrivileged(new PrivilegedAction() {
+			@Override
 			public Object run() {
 				return tracker.getService();
 			}
@@ -192,6 +199,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 		if (System.getSecurityManager() == null)
 			return bundle.getLocation();
 		return (String) AccessController.doPrivileged(new PrivilegedAction() {
+			@Override
 			public Object run() {
 				return bundle.getLocation();
 			}

bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AnyThreadAppLauncher.java

 /*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -23,6 +23,7 @@ public class AnyThreadAppLauncher implements Runnable{
 		this.appHandle = appHandle;
 	}
 
+	@Override
 	public void run() {
 		try {
 			// pasing null will cause EclipseAppHandle to get the correct arguments

bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AppCommands.java

 /*******************************************************************************
- * Copyright (c) 2005, 2011 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -89,6 +89,7 @@ public class AppCommands implements CommandProvider {
 			scheduledApplications.close();
 	}
 
+	@Override
 	public String getHelp() {
 		return getHelp(null);
 	}

bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AppPersistence.java

 /*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -187,9 +187,9 @@ public class AppPersistence implements ServiceTrackerCustomizer {
 		}
 		if (nextScheduledID == Integer.MAX_VALUE)
 			nextScheduledID = 0;
-		String result = new Integer(nextScheduledID++).toString();
+		String result = Integer.valueOf(nextScheduledID++).toString();
 		while (scheduledApps.get(result) != null && nextScheduledID < Integer.MAX_VALUE)
-			result = new Integer(nextScheduledID++).toString();
+			result = Integer.valueOf(nextScheduledID++).toString();
 		if (nextScheduledID == Integer.MAX_VALUE)
 			throw new ApplicationException(ApplicationException.APPLICATION_DUPLICATE_SCHEDULE_ID, "Maximum number of scheduled applications reached"); //$NON-NLS-1$
 		return result;
@@ -242,9 +242,8 @@ public class AppPersistence implements ServiceTrackerCustomizer {
 	}
 
 	private static void loadLocks(File locksData) throws IOException {
-		ObjectInputStream in = null;
-		try {
-			in = new ObjectInputStream(new FileInputStream(locksData));
+		try (ObjectInputStream in = new ObjectInputStream(new FileInputStream(locksData));) {
+
 			int dataVersion = in.readInt();
 			if (dataVersion != DATA_VERSION)
 				return;
@@ -253,16 +252,11 @@ public class AppPersistence implements ServiceTrackerCustomizer {
 				for (int i = 0; i < numLocks; i++)
 					locks.add(in.readUTF());
 			}
-		} finally {
-			if (in != null)
-				in.close();
 		}
 	}
 
 	private static void loadSchedules(File schedulesData) throws IOException {
-		ObjectInputStream in = null;
-		try {
-			in = new ObjectInputStream(new FileInputStream(schedulesData));
+		try (ObjectInputStream in = new ObjectInputStream(new FileInputStream(schedulesData))) {
 			int dataVersion = in.readInt();
 			if (dataVersion != DATA_VERSION)
 				return;
@@ -283,9 +277,6 @@ public class AppPersistence implements ServiceTrackerCustomizer {
 			throw new IOException(e.getMessage());
 		} catch (ClassNotFoundException e) {
 			throw new IOException(e.getMessage());
-		} finally {
-			if (in != null)
-				in.close();
 		}
 	}
 
@@ -307,24 +298,17 @@ public class AppPersistence implements ServiceTrackerCustomizer {
 
 	// must call this while holding the locks lock
 	private static void saveLocks(File locksData) throws IOException {
-		ObjectOutputStream out = null;
-		try {
-			out = new ObjectOutputStream(new FileOutputStream(locksData));
+		try (ObjectOutputStream out = new ObjectOutputStream(new FileOutputStream(locksData))) {
 			out.writeInt(DATA_VERSION);
 			out.writeInt(locks.size());
 			for (Iterator iterLocks = locks.iterator(); iterLocks.hasNext();)
 				out.writeUTF((String) iterLocks.next());
-		} finally {
-			if (out != null)
-				out.close();
 		}
 	}
 
 	// must call this while holding the scheduledApps lock
 	private static void saveSchedules(File schedulesData) throws IOException {
-		ObjectOutputStream out = null;
-		try {
-			out = new ObjectOutputStream(new FileOutputStream(schedulesData));
+		try (ObjectOutputStream out = new ObjectOutputStream(new FileOutputStream(schedulesData))) {
 			out.writeInt(DATA_VERSION);
 			out.writeInt(scheduledApps.size());
 			for (Iterator apps = scheduledApps.values().iterator(); apps.hasNext();) {
@@ -336,9 +320,6 @@ public class AppPersistence implements ServiceTrackerCustomizer {
 				out.writeBoolean(app.isRecurring());
 				out.writeObject(app.getArguments());
 			}
-		} finally {
-			if (out != null)
-				out.close();
 		}
 	}
 
@@ -354,6 +335,7 @@ public class AppPersistence implements ServiceTrackerCustomizer {
 	}
 
 	static class AppTimer implements Runnable {
+		@Override
 		public void run() {
 			int lastMin = -1;
 			while (!shutdown) {
@@ -365,12 +347,12 @@ public class AppPersistence implements ServiceTrackerCustomizer {
 						continue;
 					lastMin = minute;
 					Hashtable props = new Hashtable();
-					props.put(ScheduledApplication.YEAR, new Integer(cal.get(Calendar.YEAR)));
-					props.put(ScheduledApplication.MONTH, new Integer(cal.get(Calendar.MONTH)));
-					props.put(ScheduledApplication.DAY_OF_MONTH, new Integer(cal.get(Calendar.DAY_OF_MONTH)));
-					props.put(ScheduledApplication.DAY_OF_WEEK, new Integer(cal.get(Calendar.DAY_OF_WEEK)));
-					props.put(ScheduledApplication.HOUR_OF_DAY, new Integer(cal.get(Calendar.HOUR_OF_DAY)));
-					props.put(ScheduledApplication.MINUTE, new Integer(minute));
+					props.put(ScheduledApplication.YEAR, Integer.valueOf(cal.get(Calendar.YEAR)));
+					props.put(ScheduledApplication.MONTH, Integer.valueOf(cal.get(Calendar.MONTH)));
+					props.put(ScheduledApplication.DAY_OF_MONTH, Integer.valueOf(cal.get(Calendar.DAY_OF_MONTH)));
+					props.put(ScheduledApplication.DAY_OF_WEEK, Integer.valueOf(cal.get(Calendar.DAY_OF_WEEK)));
+					props.put(ScheduledApplication.HOUR_OF_DAY, Integer.valueOf(cal.get(Calendar.HOUR_OF_DAY)));
+					props.put(ScheduledApplication.MINUTE, Integer.valueOf(minute));
 					Event timerEvent = new Event(ScheduledApplication.TIMER_TOPIC, (Dictionary) props);
 					EclipseScheduledApplication[] apps = null;
 					// poor mans implementation of dispatching events; the spec will not allow us to use event admin to dispatch the virtual timer events; boo!!
@@ -413,6 +395,7 @@ public class AppPersistence implements ServiceTrackerCustomizer {
 		}
 	}
 
+	@Override
 	public Object addingService(ServiceReference reference) {
 		if (configLocation != null)
 			return null; // only care about one configuration
@@ -422,10 +405,12 @@ public class AppPersistence implements ServiceTrackerCustomizer {
 		return configLocation;
 	}
 
+	@Override
 	public void modifiedService(ServiceReference reference, Object service) {
 		// don't care
 	}
 
+	@Override
 	public void removedService(ServiceReference reference, Object service) {
 		if (service == configLocation)
 			configLocation = null;

bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/DefaultApplicationListener.java

 /*******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
+ * Copyright (c) 2007, 2018 IBM Corporation and others.
  *
  *  This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License 2.0
@@ -58,6 +58,7 @@ public class DefaultApplicationListener implements ApplicationRunnable, ServiceT
 		}
 	}
 
+	@Override
 	public Object run(Object context) {
 		if (handleTracker == null)
 			return getResult(); // app has ended, return the result
@@ -106,6 +107,7 @@ public class DefaultApplicationListener implements ApplicationRunnable, ServiceT
 		return running;
 	}
 
+	@Override
 	public void stop() {
 		if (handleTracker == null)
 			return;
@@ -121,14 +123,17 @@ public class DefaultApplicationListener implements ApplicationRunnable, ServiceT
 		}
 	}
 
+	@Override
 	public Object addingService(ServiceReference reference) {
 		return Activator.getContext().getService(reference);
 	}
 
+	@Override
 	public void modifiedService(ServiceReference reference, Object service) {
 		// do nothing
 	}
 
+	@Override
 	synchronized public void removedService(ServiceReference reference, Object service) {
 		running = false;
 		// only wait for 5 seconds; this may timeout if forcing an application to quit takes too long

bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppContainer.java

@@ -229,6 +229,7 @@ public class EclipseAppContainer implements IRegistryEventListener, SynchronousB
 			this.serviceProps = serviceProps;
 		}
 
+		@Override
 		public Object run() {
 			return context.registerService(serviceClasses, serviceObject, serviceProps);
 		}
@@ -367,6 +368,7 @@ public class EclipseAppContainer implements IRegistryEventListener, SynchronousB
 		}
 	}
 
+	@Override
 	public void bundleChanged(BundleEvent event) {
 		// if this is not the system bundle stopping then ignore the event
 		if ((BundleEvent.STOPPING & event.getType()) == 0 || event.getBundle().getBundleId() != 0)
@@ -597,6 +599,7 @@ public class EclipseAppContainer implements IRegistryEventListener, SynchronousB
 		}
 	}
 
+	@Override
 	public Object addingService(ServiceReference reference) {
 		ApplicationLauncher appLauncher;
 		ParameterizedRunnable appRunnable;
@@ -618,28 +621,34 @@ public class EclipseAppContainer implements IRegistryEventListener, SynchronousB
 		return appLauncher;
 	}
 
+	@Override
 	public void modifiedService(ServiceReference reference, Object service) {
 		// Do nothing
 	}
 
+	@Override
 	public void removedService(ServiceReference reference, Object service) {
 		// Do nothing
 	}
 
+	@Override
 	public void added(IExtension[] extensions) {
 		for (int i = 0; i < extensions.length; i++)
 			createAppDescriptor(extensions[i]);
 	}
 
+	@Override
 	public void added(IExtensionPoint[] extensionPoints) {
 		// nothing
 	}
 
+	@Override
 	public void removed(IExtension[] extensions) {
 		for (int i = 0; i < extensions.length; i++)
 			removeAppDescriptor(extensions[i].getUniqueIdentifier());
 	}
 
+	@Override
 	public void removed(IExtensionPoint[] extensionPoints) {
 		// nothing
 	}

bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppDescriptor.java

 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -80,11 +80,13 @@ public class EclipseAppDescriptor extends ApplicationDescriptor {
 		this.iconURL = iconResult;
 	}
 
+	@Override
 	protected Map getPropertiesSpecific(String locale) {
 		// just use the service properties; for now we do not localize any properties
 		return getServiceProperties();
 	}
 
+	@Override
 	protected ApplicationHandle launchSpecific(Map arguments) throws Exception {
 		// if this application is locked throw an exception.
 		if (getLocked().booleanValue())
@@ -108,12 +110,14 @@ public class EclipseAppDescriptor extends ApplicationDescriptor {
 		return appHandle;
 	}
 
+	@Override
 	protected synchronized void lockSpecific() {
 		locked = Boolean.TRUE;
 		// make sure the service properties are updated with the latest lock info
 		refreshProperties();
 	}
 
+	@Override
 	protected synchronized void unlockSpecific() {
 		locked = Boolean.FALSE;
 		// make sure the service properties are updated with the latest lock info
@@ -200,12 +204,14 @@ public class EclipseAppDescriptor extends ApplicationDescriptor {
 		return appContainer;
 	}
 
+	@Override
 	public boolean matchDNChain(String pattern) {
 		if (contributor == null)
 			return false;
 		return BundleSignerCondition.getCondition(contributor, new ConditionInfo(BundleSignerCondition.class.getName(), new String[] {pattern})).isSatisfied();
 	}
 
+	@Override
 	protected boolean isLaunchableSpecific() {
 		return true;
 	}

bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppHandle.java

 /*******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -65,6 +65,7 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 			this.arguments = new HashMap(arguments);
 	}
 
+	@Override
 	synchronized public String getState() {
 		switch (status) {
 			case FLAG_STARTING :
@@ -82,6 +83,7 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 		}
 	}
 
+	@Override
 	protected void destroySpecific() {
 		// when this method is called we must force the application to exit.
 		// first set the status to stopping
@@ -168,10 +170,12 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 		}
 	}
 
+	@Override
 	public Map getArguments() {
 		return arguments;
 	}
 
+	@Override
 	public Object run(Object context) throws Exception {
 		if (context != null) {
 			// always force the use of the context if it is not null
@@ -241,6 +245,7 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 		return result;
 	}
 
+	@Override
 	public void stop() {
 		try {
 			destroy();
@@ -251,6 +256,7 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 
 	}
 
+	@Override
 	public void applicationRunning() {
 		// first set the application handle status to running
 		setAppStatus(EclipseAppHandle.FLAG_ACTIVE);
@@ -259,11 +265,13 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 		if (monitors == null)
 			return;
 		SafeRunner.run(new ISafeRunnable() {
+			@Override
 			public void handleException(Throwable e) {
 				// just continue ... the exception has already been logged by
 				// handleException(ISafeRunnable)
 			}
 
+			@Override
 			public void run() throws Exception {
 				for (int i = 0; i < monitors.length; i++) {
 					StartupMonitor monitor = (StartupMonitor) Activator.getContext().getService(monitors[i]);
@@ -289,6 +297,7 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 			return null;
 		// Implement our own Comparator to sort services
 		Arrays.sort(refs, new Comparator() {
+			@Override
 			public int compare(Object o1, Object o2) {
 				// sort in descending order
 				// sort based on service ranking first; highest rank wins
@@ -331,34 +340,40 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 		return configs[0];
 	}
 
+	@Override
 	public String getBrandingApplication() {
 		IBranding branding = ((EclipseAppDescriptor) getApplicationDescriptor()).getContainerManager().getBranding();
 		return branding == null ? null : branding.getApplication();
 	}
 
+	@Override
 	public Bundle getBrandingBundle() {
 		IBranding branding = ((EclipseAppDescriptor) getApplicationDescriptor()).getContainerManager().getBranding();
 		return branding == null ? null : branding.getDefiningBundle();
 
 	}
 
+	@Override
 	public String getBrandingDescription() {
 		IBranding branding = ((EclipseAppDescriptor) getApplicationDescriptor()).getContainerManager().getBranding();
 		return branding == null ? null : branding.getDescription();
 
 	}
 
+	@Override
 	public String getBrandingId() {
 		IBranding branding = ((EclipseAppDescriptor) getApplicationDescriptor()).getContainerManager().getBranding();
 		return branding == null ? null : branding.getId();
 	}
 
+	@Override
 	public String getBrandingName() {
 		IBranding branding = ((EclipseAppDescriptor) getApplicationDescriptor()).getContainerManager().getBranding();
 		return branding == null ? null : branding.getName();
 
 	}
 
+	@Override
 	public String getBrandingProperty(String key) {
 		IBranding branding = ((EclipseAppDescriptor) getApplicationDescriptor()).getContainerManager().getBranding();
 		return branding == null ? null : branding.getProperty(key);
@@ -379,6 +394,7 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 		return null;
 	}
 
+	@Override
 	public synchronized Object getExitValue(long timeout) throws ApplicationException, InterruptedException {
 		if (handleRegistration == null && application == null)
 			return result;
@@ -396,6 +412,7 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 		return result;
 	}
 
+	@Override
 	public void setResult(Object result, IApplication application) {
 		setInternalResult(result == null ? NULL_RESULT : result, true, application);
 	}

bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseScheduledApplication.java

 /*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -51,6 +51,7 @@ public class EclipseScheduledApplication implements ScheduledApplication, EventH
 		Activator.openTracker(appTracker, false);
 	}
 
+	@Override
 	public String getScheduleId() {
 		return id;
 	}
@@ -59,30 +60,35 @@ public class EclipseScheduledApplication implements ScheduledApplication, EventH
 		return appPid;
 	}
 
+	@Override
 	public synchronized String getTopic() {
 		if (removed)
 			throw new IllegalStateException(Messages.scheduled_app_removed);
 		return topic;
 	}
 
+	@Override
 	public synchronized String getEventFilter() {
 		if (removed)
 			throw new IllegalStateException(Messages.scheduled_app_removed);
 		return eventFilter;
 	}
 
+	@Override
 	public synchronized boolean isRecurring() {
 		if (removed)
 			throw new IllegalStateException(Messages.scheduled_app_removed);
 		return recurring;
 	}
 
+	@Override
 	public synchronized ApplicationDescriptor getApplicationDescriptor() {
 		if (removed)
 			throw new IllegalStateException(Messages.scheduled_app_removed);
 		return (ApplicationDescriptor) Activator.getService(appTracker);
 	}
 
+	@Override
 	public synchronized Map getArguments() {
 		if (removed)
 			throw new IllegalStateException(Messages.scheduled_app_removed);
@@ -95,6 +101,7 @@ public class EclipseScheduledApplication implements ScheduledApplication, EventH
 		return result;
 	}
 
+	@Override
 	public synchronized void remove() {
 		if (removed)
 			return;
@@ -106,6 +113,7 @@ public class EclipseScheduledApplication implements ScheduledApplication, EventH
 		appTracker.close();
 	}
 
+	@Override
 	public synchronized void handleEvent(Event event) {
 		try {
 			if (removed)
@@ -145,6 +153,7 @@ public class EclipseScheduledApplication implements ScheduledApplication, EventH
 		/*
 		 * does the proper TopicPermission check for the event topic
 		 */
+		@Override
 		public void checkGuard(Object object) throws SecurityException {
 			SecurityManager sm = System.getSecurityManager();
 			if (sm != null)

bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/ErrorApplication.java

 /*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
  *
  *  This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License 2.0
@@ -24,6 +24,7 @@ import org.eclipse.equinox.app.IApplicationContext;
 public class ErrorApplication implements IApplication {
 	static final String ERROR_EXCEPTION = "error.exception"; //$NON-NLS-1$
 
+	@Override
 	public Object start(IApplicationContext context) throws Exception {
 		Exception error = (Exception) context.getArguments().get(ERROR_EXCEPTION);
 		if (error != null)
@@ -31,6 +32,7 @@ public class ErrorApplication implements IApplication {
 		throw new IllegalStateException();
 	}
 
+	@Override
 	public void stop() {
 		// do nothing
 	}

bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/MainApplicationLauncher.java

 /*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
+ * Copyright (c) 2008, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -28,6 +28,7 @@ public class MainApplicationLauncher implements ApplicationRunnable {
 		this.appContainer = appContainer;
 	}
 
+	@Override
 	public Object run(Object context) throws Exception {
 		appContainer.startDefaultApp(false);
 		ApplicationRunnable mainHandle = getMainHandle();
@@ -40,6 +41,7 @@ public class MainApplicationLauncher implements ApplicationRunnable {
 		return launchMainApp;
 	}
 
+	@Override
 	public void stop() {
 		// force the application to quit
 		ApplicationRunnable handle = getMainHandle();